Shannon
1de79cf473
updated to use ASPNET Identity APIs for managing lockouts
2017-08-15 12:31:32 +10:00
Shannon
42d65a36bc
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-08-15 11:55:17 +10:00
Bjarne Fyrstenborg
c68d7a33ca
Fix maxchars javascript errors on macro parameter editors
2017-08-14 19:57:28 +02:00
Robert
2773102441
Fixed tag
2017-08-14 14:58:48 +02:00
Claus
ef0d6eff2c
Merge pull request #2124 from umbraco/mikecp-U4-8967
...
U4-8967 Linkpicker localization issue
2017-08-14 14:58:31 +02:00
Robert
1efad78214
Package-actions link updated
2017-08-14 14:58:05 +02:00
Claus
46b2d8a4aa
implement equality comparison to prevent duplicates in when used in dictionaries.
2017-08-14 13:34:47 +02:00
Zsolt
69c242074a
In cms I changed the media picker to the new layout + deleting previously commented code
2017-08-14 13:08:01 +02:00
Claus
7a5cb7058b
U4-10289 IdkMap cache can cause the entity service to return invalid results
2017-08-14 11:38:13 +02:00
Mads Rasmussen
f426e3c500
U4-10280 Add markers to required fields in user section
2017-08-11 12:14:10 +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
Robert
c1c2339827
U4-8967 Linkpicker localization issue
...
Did a few modifications to the PR - reverted back the default translations for "content_nodeName" and "content_urls" as they are being used in other places.
To fix this, I have created two new keys that are used only in the linkpicker :)
2017-08-11 10:31:04 +02:00
Shannon
0e273d1a08
U4-7382 Text Properties Containing JSON Are Corrupted on Publish
2017-08-11 15:11:53 +10:00
Mads Rasmussen
b607c9cd87
add documentation to users.resource
2017-08-10 16:14:11 +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
Mads Rasmussen
125c378274
fixes: U4-4848 If "Save and Publish" is clicked before page finishes loading, data is lost from MNTP
2017-08-10 14:11:48 +02:00
mikkelhm
0db4993900
Bump version to beta003
2017-08-10 13:53:26 +02:00
Mads Rasmussen
979a0c9e25
remove capitalise from badges
2017-08-10 13:40:56 +02:00
Mads Rasmussen
3104e6d11c
fixes: U4-10243 Umbraco 7.7. Difference between "Enable/Disable" and "LockedOut"
2017-08-10 13:39:33 +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
mikkelhm
ca80a0cddc
Bump version to 7.6.6
2017-08-10 08:41:06 +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
21707f9e08
Updates the GetMemberGroupsForMember with a username to be a single query
2017-08-10 14:22:30 +10:00
Shannon
d8cfd8f12e
U4-10274 Umbraco.MemberHasAccess isn't cached
2017-08-10 13:46:18 +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
3263e496aa
U4-10201 Exception when deleting a user's start node - adds FKs, fixes delete scripts, adds migrations for FKs
2017-08-10 00:02:27 +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
