Shannon
9ce87ea4e8
doh, fixes merge issue
2017-08-18 15:26:15 +10:00
Shannon
4cebec0d39
U4-10279 User states filter in user overview is broken
2017-08-18 14:17:31 +10:00
Shannon
1fc49ccf59
Merge remote-tracking branch 'origin/temp-U4-10299' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Web/Trees/LegacyTreeParams.cs
2017-08-18 14:11:41 +10:00
Shannon
7184838546
U4-10278 Administrator user group is missing access to Forms section
2017-08-18 12:02:52 +10:00
Shannon
254d4e2067
updates to latest examine
2017-08-18 11:54:39 +10:00
Shannon
2817a77c5a
Null check fix - required for old trees, fixes backwards compat shim for AddApplication
2017-08-18 11:15:23 +10:00
Shannon
7b61070f8e
COU-610 addApplication method is no longer available - puts back some backward compat hacks
2017-08-18 10:13:23 +10:00
Stephan
a157e1d596
Revert PublishedContentWrapped.Content rename
2017-08-17 20:40:32 +02:00
Claus
f2ff1636ff
ensuring query string is cleaned when switching sections with no custom routePath.
2017-08-17 11:23:08 +02:00
Claus
9169e64e39
cleanup and annoying line endings.
2017-08-17 11:22:05 +02:00
Mads Rasmussen
f925309e1f
Merge branch 'dev-v7.7' into temp-U4-10256
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/users/user.html
2017-08-17 09:07:29 +02:00
Shannon
a50386aaf1
fixes test
2017-08-17 14:36:52 +10:00
Shannon
777d634fe2
Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7
2017-08-17 12:18:23 +10:00
Shannon
049435a5e6
Puts back some APIs on the IUser interface to try to avoid more breaking changes.
2017-08-17 12:18:08 +10:00
Mads Rasmussen
87f4cd24a0
fix link
2017-08-16 21:40:35 +02:00
Zsolt
9e0d0de846
created documentation for the newly added directives + testing
2017-08-16 15:45:57 +02:00
Mads Rasmussen
b5acd53889
Add a bit of text formatting to the content templates intro text + describe how to add content templates from the settings section
2017-08-16 13:59:35 +02:00
Claus
ff29493203
missing null check causing legacy trees to break if theres no querystring data.
2017-08-16 13:43:48 +02:00
Claus
5fff884798
making sure title is added to trees.config - not sure if its needed but lets just do it.
2017-08-16 13:43:21 +02:00
Claus
3885454b26
updating name of usersResource for v. 7.7
2017-08-16 13:42:19 +02:00
Mads Rasmussen
fec85491b6
Merge pull request #2129 from umbraco/temp-U4-10248
...
U4-10248 Change content and media start node pickers to use new picker layout
2017-08-16 09:27:20 +02:00
Mads Rasmussen
26e590a260
don't wait for node path to return before we show the picked node in the UI
2017-08-16 09:25:22 +02:00
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
Zsolt
bd0cceb517
Clean-up with Mads
2017-08-15 14:41:04 +02:00
Shannon Deminick
b02b130793
Merge pull request #2125 from umbraco/temp-U4-10280
...
U4-10280 Add markers to required fields in user section
2017-08-15 12:36:07 +10:00
Shannon Deminick
d3e73e9e30
Merge pull request #2122 from umbraco/temp-U4-10243
...
U4-10243 Umbraco 7.7. Difference between "Enable/Disable" and "LockedOut"
2017-08-15 12:31:50 +10:00
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
Claus
ef0d6eff2c
Merge pull request #2124 from umbraco/mikecp-U4-8967
...
U4-8967 Linkpicker localization issue
2017-08-14 14:58:31 +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
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
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
