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

19847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus
5f0765a39a Merge branch 'temp-U4-10263' into dev-v7.7 2017-08-10 11:27:38 +02:00
Claus
d7d6b7f128 Merge pull request #2116 from umbraco/temp-deploy-350 
changes needed for blueprints to differentiate them from content items.
 2017-08-10 08:37:26 +02:00
Shannon
62e467d860 Merge branch 'temp-U4-10272' into dev-v7.7 2017-08-10 14:27:47 +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
d756f884a7 fixes test 2017-08-10 12:02:23 +10:00
Shannon
a97a5dc3fd Removes need for the IdkMap for content/media services since we have a wrapping repo now, adds tests to verify that caching is active for both INT and GUID 2017-08-10 10:52:31 +10:00
Shannon
bdf621049f adds GetByIds for UDIs 2017-08-10 01:11:59 +10:00
Shannon
2c219576f6 update test 2017-08-10 01:08:29 +10:00
Shannon
8f121c4d93 update test 2017-08-10 01:01:34 +10:00
Shannon
558a284750 U4-10263 Missing UDI + GUID friendly MediaService.GetByIds, ContentService.GetByIds 2017-08-10 01:01:07 +10:00
Shannon
0bb27b8ebd U4-10263 Missing UDI + GUID friendly MediaService.GetByIds, ContentService.GetByIds 2017-08-10 00:22:15 +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
Claus
73bc5c6ec9 changes needed for blueprints to differentiate them from content items. 2017-08-09 15:29:12 +02: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
c27e9e9c77 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-09 19:45:58 +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
Shannon Deminick
41e555881f Merge pull request #2100 from umbraco/temp-U4-10059 
U4-10059 Localize users and user groups
 2017-08-09 19:35:40 +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 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