yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,838 Commits 4 Branches 7 Tags
72495b3eaf2a34cd87653a4b5ee79996f7e9beda
Commit Graph

16909 Commits

Author SHA1 Message Date
Shannon
72495b3eaf U4-10227 Users section should start in the user tree 2017-08-10 17:25:16 +10:00
Shannon
021010d7ea Merge branch 'dev-v7.7' into temp-U4-10272 
# Conflicts:
#	src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
 2017-08-10 14:27:37 +10:00
Shannon
4a21675a0a removes null check on email since this will cause the log to fill up, we already check for null below anyways. 2017-08-09 23:42:31 +10:00
Shannon
98a545bdc6 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-09 23:18:51 +10:00
Mads Rasmussen
08150c05e9 Merge pull request #1971 from Bitmapped/U4-9977 
Fix U4-9977
 2017-08-09 13:28:04 +02:00
Mads Rasmussen
688f8c4170 Merge pull request #2053 from bjarnef/dev-v7-U4-10161 
U4-10161 - Update localization of email
 2017-08-09 11:51:05 +02:00
Mads Rasmussen
31cbb79ede Translate zip-code 2017-08-09 11:48:15 +02:00
Shannon Deminick
305ce84ef5 Merge pull request #2111 from umbraco/temp-U4-10266 
U4-10266 Package installer need to handle files before handling entities
 2017-08-09 19:47:45 +10:00
Shannon
c6d7056a64 Updated to return nulls as opposed to the ex being caught with a meaningful message 2017-08-09 19:44:37 +10:00
Shannon Deminick
cbf5e25e1f Merge pull request #2112 from umbraco/temp-U4-10271 
U4-10271 Adds contextual err message for GetValue
 2017-08-09 19:40:35 +10:00
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
Mads Rasmussen
60ffd20e20 Merge branch 'dev-v7.7' into temp-U4-10059 2017-08-09 11:01:05 +02:00
Bitmapped
7db1055a0d Remove JSON files, which appear to be unnecessary. 2017-08-08 13:54:36 -04:00
Jeavon
fb4af74916 Fix so that health check notifications without config don't cause all notification methods to fail 2017-08-08 16:50:17 +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
Claus
d625388786 U4-10266 Package installer need to handle files before handling entities 2017-08-08 13:10:33 +02:00
Claus
fa1663ed51 Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools 2017-08-08 13:08:29 +02: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
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
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
3ba3d8977f don't show start node data in the content permission dialog 2017-08-04 11:23:36 +02:00
Mads Rasmussen
19af28dd93 localize content permissions dialog 2017-08-04 11:21:43 +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