Commit Graph

19815 Commits

Author SHA1 Message Date
Warren Buckley
b60c700e05 Updated to return nulls as opposed to the ex being caught with a meaningful message 2017-08-09 10:23:55 +01:00
Warren Buckley
8b962cff0c Catches a dictionary key not found exception & gives better error message with context 2017-08-08 16:07:16 +01:00
Mads Rasmussen
fc8c750fb0 fixes permissions click area - only show pointer cursor where you can click 2017-08-08 10:22:44 +02:00
Shannon Deminick
4d7fa64a6c Merge pull request #2108 from umbraco/temp-U4-10257
U4-10257 Add "invite user" success state
2017-08-08 13:20:42 +10:00
Shannon
bbe8271c35 Fixes invite user and setting the model correctly. Fixes server side validation to ensure any created user MUST have a group assigned. 2017-08-08 13:20:21 +10:00
Shannon
2d42a6ca16 Merge branch 'dev-v7.7' into temp-U4-10257
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
2017-08-08 13:02:57 +10:00
Shannon Deminick
4879215146 Merge pull request #2104 from umbraco/temp-U4-10236
fixes: U4-10236 Umbraco.7.7 beta - add larger click area of permissio…
2017-08-08 12:57:13 +10:00
Shannon Deminick
48a6929077 Merge pull request #2106 from umbraco/temp-U4-10235
fixes: U4-10235 Umbraco 7.7 beta - misleading placeholder text in pro…
2017-08-08 12:52:12 +10:00
Shannon Deminick
efc52e26e5 Merge pull request #2105 from umbraco/temp-U4-10230
fixes: U4-10230 Umbraco 7.7 beta - hover on table row affect datepicker
2017-08-08 12:49:35 +10:00
Shannon
1258148e37 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
2017-08-08 12:36:16 +10:00
Shannon
2c7f0c54bb Updates unit tests to show usages of UDIs for pickers instead of INT 2017-08-08 12:35:12 +10:00
mikkelhm
ca0de5acd3 Fix more xml format issues in pl.xml 2017-08-07 21:58:45 +02:00
Mads Rasmussen
405d8e8253 fix line indention 2017-08-07 21:32:19 +02:00
Mads Rasmussen
b335ca0a10 change input type to email 2017-08-07 21:19:30 +02:00
mikkelhm
27168722ab fix xml in pl.xml 2017-08-07 20:33:49 +02:00
Mads Rasmussen
6658ecf6e3 add success state for "invite user" 2017-08-07 15:24:19 +02:00
Mads Rasmussen
cfee55d0db fix line indention 2017-08-07 14:35:54 +02:00
Mads Rasmussen
80d49f9bc8 fix line indention 2017-08-07 14:33:55 +02:00
Mads Rasmussen
6efc6dfe6a fixes: U4-10235 Umbraco 7.7 beta - misleading placeholder text in profile email 2017-08-07 13:45:42 +02:00
Mads Rasmussen
51624cee57 Merge pull request #2096 from skttl/patch-8
U4-10231 Avatar is slightly off center
2017-08-07 13:38:02 +02:00
Mads Rasmussen
701082a909 fixes: U4-10230 Umbraco 7.7 beta - hover on table row affect datepicker 2017-08-07 13:20:01 +02:00
Mads Rasmussen
81b2e4e050 fixes: U4-10236 Umbraco.7.7 beta - add larger click area of permission items 2017-08-07 12:27:21 +02:00
Mads Rasmussen
be9fbf14f1 Merge pull request #2095 from skttl/patch-7
U4-10228: Overflowing text in group dropdown in permissions menu
2017-08-07 12:08:58 +02:00
Shannon
e31ec37c9e Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-07 17:17:38 +10:00
Sebastiaan Janssen
6dbeba0763 Merge pull request #2103 from ronaldbarendse/U4-10252
U4-10252: Slider property editor initial values not used when equal (range enabled)
2017-08-07 08:10:49 +02:00
Ronald Barendse
00e0f83c8e Fixed U4-10252
Umbraco.Slider property editor did not use the correct initial values
when range was enabled and both values were equal.
2017-08-06 22:41:20 +02:00
Mads Rasmussen
91cda667a2 U4-10221 When creating content that has Content Templates (blueprints) created for it, we should distinguish between "Blank' and Blueprints - swap class to one with no padding 2017-08-03 14:56:11 +02:00
mikkelhm
1c59c0b164 Dont output the Healthcheck.Release.config file when publishing the webapp, i.e. for nu nuget package 2017-08-02 23:57:37 +02:00
Søren Kottal
9fc87a3986 Changes styling for avatar
A div has been introduced, and is aligning the avatar to the left of the 40x40 block.

This moves the sizing and border-radius to the surrounding div, and adds a margin to center it.
2017-08-02 20:31:35 +02:00
Søren Kottal
3a44f70cee Removes inline width on dropdown for groups 2017-08-02 19:55:05 +02:00
Stephan
74b9a43685 Blueprint fixes 2017-08-02 17:43:39 +02:00
Shannon
23e16a9182 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-03 01:27:38 +10:00
Shannon
a3cf41284b fixes test 2017-08-03 01:27:13 +10:00
Stephan
2907b0dd1a Blueprint fixes 2017-08-02 17:14:45 +02:00
Sebastiaan Janssen
c89f44bb3d Let's aim for only 1 beta ;) 2017-08-02 16:52:08 +02:00
Jeavon
3a13cd82ed Fix customerrorscheck success message as it expect only 1 token not 2 2017-08-02 15:35:53 +01:00
Stephan
90e6815164 Blueprint fixes 2017-08-02 16:11:54 +02:00
Shannon Deminick
f59bd481f4 Merge pull request #1983 from umbraco/temp-U4-9984
U4-9984 - Adds option to run Health Checks on a schedule and provide options for notifications
2017-08-02 23:58:16 +10:00
Shannon
d459246519 oops 2017-08-02 23:41:31 +10:00
Shannon
efbfef74c2 localizes email, fixes issues with smtp and async 2017-08-02 23:39:31 +10:00
Stephan
1ee131db81 IContent.IsBlueprint required for blueprints 2017-08-02 15:02:34 +02:00
Shannon
cb9e631d7b changes get/set to private set, should not be mutable 2017-08-02 22:38:55 +10:00
Shannon
9ced53c9a9 Merge branch 'temp-U4-9984' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9984 2017-08-02 22:32:54 +10:00
Shannon
df287f291e Updates health check config to work the Umbraco/Testable way 2017-08-02 22:32:28 +10:00
Jeavon
fc861fecbc Make the setters in NotifcationMethodBase readonly and make AllChecksSuccessful public 2017-08-02 12:54:37 +01:00
Jeavon
6aeb1a8845 Adjust all HealthCheck constants to correct naming convention 2017-08-02 12:26:35 +01:00
Jeavon
8c493a1ff9 Adding interfaces for all HealthCheck configuration to allow for testing 2017-08-02 12:22:51 +01:00
Sebastiaan Janssen
9b7b0d8923 Merge pull request #2092 from umbraco/temp-machine-key-install
U4-10222 Install a custom machine key during umbraco installation
2017-08-02 12:32:12 +02:00
Jeavon
51f51c1762 Revert this csproj change, not sure when VS added it 2017-08-02 11:29:31 +01:00
Jeavon
b6e377a560 Removing further NuGet packages that were added by the Slack package 2017-08-02 11:25:28 +01:00