Commit Graph

19867 Commits

Author SHA1 Message Date
Zsolt
bf2fdc409b created umb-box components and changed all html tags for it in the users section 2017-08-15 16:32:30 +02:00
Claus
028576d93c Merge pull request #2120 from umbraco/temp-U4-10227
U4-10227 Users section should start in the user tree
2017-08-11 10:31:20 +02:00
Claus
5cb766d387 Merge pull request #2115 from umbraco/temp-U4-10220
fixes: U4-10220 Missing the ability to create Content Templates (blue…
2017-08-10 15:57:46 +02:00
Claus
076ee7e3d8 Merge pull request #2110 from umbraco/temp-U4-10233
fixes: U4-10233 Umbraco 7.7 beta - format user last login date
2017-08-10 15:49:02 +02:00
Claus
d149438e56 Merge pull request #2088 from umbraco/temp-snippets-update
Updates partial view snippets to not re-iterate all of the time and t…
2017-08-10 15:26:29 +02:00
Claus
90213ec90d no need to check twice if we just dont send any hidden children to the render method. 2017-08-10 15:26:03 +02:00
mikkelhm
0db4993900 Bump version to beta003 2017-08-10 13:53:26 +02:00
Jeavon
850ec2d78f Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-10 11:41:42 +01:00
Jeavon
d1109fb9ad Fix CustomErrorsCheck so that success message can contain "On" as well as "RemoteOnly" as it's also a success value 2017-08-10 11:41:19 +01:00
mikkelhm
12eb496939 Adds the avatar column as a table to update in the 7.7.0 migration, and sets its length to 500 2017-08-10 12:37:11 +02:00
Claus
4578f097dc Merge branch 'dev-v7.7' of github.com:umbraco/Umbraco-CMS into dev-v7.7 2017-08-10 11:27:57 +02:00
Claus
5f0765a39a Merge branch 'temp-U4-10263' into dev-v7.7 2017-08-10 11:27:38 +02:00
Mikkel Holck Madsen
823e3d1b4e Merge pull request #2109 from umbraco/temp-U4-10244
U4-10244 Umbraco 7.7-beta - Migration fails when upgrading users
2017-08-10 10:43:36 +02:00
Shannon
97f2b40f4b fixes tests 2017-08-10 17:59:17 +10:00
Shannon
9be275cf40 Updates the routes to also redirect if there isn't any dashboard to view for the user 2017-08-10 17:49:21 +10:00
Shannon
72495b3eaf U4-10227 Users section should start in the user tree 2017-08-10 17:25:16 +10: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
Mads Rasmussen
2c2a9cc916 fixes: U4-10220 Missing the ability to create Content Templates (blueprints) from the blueprints tree directly when none exist 2017-08-09 10:47:41 +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
55a4214a5c fixes: U4-10233 Umbraco 7.7 beta - format user last login date 2017-08-08 13:05:46 +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