yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,567 Commits 4 Branches 7 Tags
2fcb30e54ef4313828cf6cabc4b3a46a58b6d7eb
Commit Graph

26567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
2fcb30e54e Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	.editorconfig
#	.gitignore
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-era-button.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/restore.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
#	src/Umbraco.Web/Controllers/UmbProfileController.cs
#	src/Umbraco.Web/Controllers/UmbRegisterController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
 2018-12-20 16:58:01 +11:00
Kenn Jacobsen
6ca2c27ed3 Remove member groups controller TODO's 2018-12-19 21:01:19 +01:00
Kenn Jacobsen
97f9151473 Add "Move" option for deleted items in the content tree (#3772) 2018-12-19 18:19:51 +01:00
Kenn Jacobsen
d01dfb4ba6 Add search to move media dialog 2018-12-19 18:10:50 +01:00
Kenn Jacobsen
49387aaa02 Fix errors creating content templates + support variants (#3831) 2018-12-19 18:08:14 +01:00
Kenn Jacobsen
7e144eeacf V8: Fix listviews in pickers (#3894) 2018-12-19 18:01:36 +01:00
Kenn Jacobsen
47ccc8f584 Group content and media types by folder when setting up compositions (#3900) 2018-12-19 17:59:31 +01:00
Kenn Jacobsen
b173b41ce0 V8: Fix and clean up the restore media dialog (#3781) 2018-12-19 17:42:42 +01:00
Kenn Jacobsen
d431e80df2 Fix more missing localization 2018-12-19 17:30:39 +01:00
Kenn Jacobsen
28ac63a22c Re-introduce accidentally removed localization 2018-12-19 17:30:39 +01:00
Kenn Jacobsen
5944cec8fc Fix and clean up the restore content dialog 2018-12-19 17:30:39 +01:00
Steve Temple
fcbfb1a56e Rename PluginManager to TypeLoader in tests 2018-12-19 16:44:35 +01:00
Dave Woestenborghs
8aa5fe8695 Setting hide-alias to false still hides the alias 
When using umb-editor-header setting hide-alias to false still hides the alias.

I would expect that it would be visible. The only thing that works to make it visible to is removing the hide-alias attribute.

This PR fixes this. So now you can hide the alias based on property of your scope.

Dave
 2018-12-19 16:28:03 +01:00
Kenn Jacobsen
506319695b Fix container creation for media types (#3839) 2018-12-19 16:24:56 +01:00
Kenn Jacobsen
12586df562 Use a member group picker for member group assignment (#3888) 2018-12-19 16:21:14 +01:00
Kenn Jacobsen
bb53c020e9 Fix the member group picker 2018-12-19 16:20:22 +01:00
Kenn Jacobsen
a165a2b719 Reload list views after deleting items (#3853) 2018-12-19 16:18:11 +01:00
Lukasz Wojciech Kaleta
9c101622d0 Delete user start node assignments before deleting the user 2018-12-19 16:16:58 +01:00
Tristan Thompson
2a61d0d988 Remove/Replace ping.aspx 
Remove ping.aspx
Add KeepAliveController to receive ping requests
Update KeepAlive.cs to call new MVC route rather than ping.aspx
 2018-12-19 16:13:23 +01:00
Thomas Morris
3b7e8e05f2 Fixes references to docs in sln 2018-12-19 16:11:14 +01:00
Stephan
720ad984dc Merge branch 'temp8-backoffice-search-with-variants' into temp8 2018-12-19 16:02:54 +01:00
Stephan
5593d49719 Minor fixes as per PR#3852 discussion 2018-12-19 16:00:29 +01:00
Karl Tynan
9f9b9d8ccc Update translation alias to use existing emptyRecycleBin naming instead of Trashcan 
Removed unused translation alias also
 2018-12-19 16:00:04 +01:00
Gregory Dove
6365f910bc Better Validation Options (#3882) 2018-12-19 15:58:06 +01:00
Tristan Thompson
65f7e44338 Remove/Replace endPreview.aspx with MVC endpoint 2018-12-19 15:47:31 +01:00
Thomas Morris
c79f557e94 Remove ClientRedirect.aspx 2018-12-19 15:43:57 +01:00
Kenn Jacobsen
9af6e3027f Don't show (blank) for non blueprint content types (#3887) 2018-12-19 15:41:24 +01:00
Paul Seal
e41db72ef7 - added class and style rule to make health check fix message look be… (#3747) 2018-12-19 15:38:08 +01:00
Kenn Jacobsen
b087b862e8 Make Nested Content support variant doctypes 2018-12-19 15:36:37 +01:00
Kenn Jacobsen
4d48254a93 Don't show "Create" and "Sort" for deleted items in the media tree 2018-12-19 15:33:53 +01:00
Kenn Jacobsen
f3e8b70b8c Show only the success message upon successful update of notifications 2018-12-19 15:32:31 +01:00
Thomas Morris
7b804e27ad Removes umbraco.aspx 2018-12-19 15:30:07 +01:00
Kenn Jacobsen
410ab3447c Fix "toggle all editors" for grid rows 2018-12-19 15:13:36 +01:00
Kenn Jacobsen
96f529c669 Fix "allow all row configurations" for grid layouts 2018-12-19 15:12:32 +01:00
Kenn Jacobsen
08dc5a4038 Fix the disappearing action button by using a promise 2018-12-19 15:03:00 +01:00
Kenn Jacobsen
b81f2512cb Fix the disappearing preview/save/publish buttons in listviews (#3906) 2018-12-19 15:01:18 +01:00
Marc Goodson
150ab13668 Honour 'Order Direction' passed into GetPagedResultsByQuery 
Wanting to update the MiniListView so that you can change the sort order of the results, so that the most recent items are first, eg sort by descending, however chasing this through to the Entity Repository GetPagedResultsByQuery although the sort direction is passed at each stage, inside this method it is ignored... is this the best way to add it back in?
 2018-12-19 14:06:11 +01:00
Mads Rasmussen
cf56dbd34e add more docs for infinite editing - how to create a custom infinite editor 2018-12-19 13:43:58 +01:00
Shannon
f724748225 No more IUserService.SavePassword - passwords are managed with Identity. 2018-12-19 23:27:47 +11:00
Shannon
0ad66c488b Long live Operathor 2018-12-19 22:06:04 +11:00
Shannon Deminick
4a83f1f37f Merge pull request #3897 from umbraco/temp8-3653-infinite-animations 
reenable infinite editing animations
 2018-12-19 17:30:10 +11:00
Shannon Deminick
6de9379b86 Merge pull request #3904 from umbraco/temp8-3650-infinite-keyboard-shortcuts 
Temp8 3650 infinite keyboard shortcuts
 2018-12-19 17:23:10 +11:00
Mads Rasmussen
abb4ab6b0a fix open template/open doctype buttons 2018-12-18 21:56:06 +01:00
Stephan
7cdbe39ce5 Merge branch 'temp8' into temp8-backoffice-search-with-variants 2018-12-18 17:05:17 +01:00
Mads Rasmussen
88d328a4e9 unbind all keyboard shortcuts from the underlaying editor so only keyboard shortcuts from the open editor works 2018-12-18 13:40:37 +01:00
Mads Rasmussen
9eecf9898e rebind keyboard shortcuts when infinite editors closes 2018-12-18 13:24:52 +01:00
Stephan
61fd924675 Merge branch 'temp8-3866' into temp8 2018-12-18 10:45:21 +01:00
Stephan
792bf40037 Rework for #3866 2018-12-18 10:44:59 +01:00
Stephan
00c6f77f7d Merge branch 'temp8' into temp8-3866 2018-12-18 10:39:48 +01:00
Stephan
53c67fad63 Rework for #3866 2018-12-18 10:39:39 +01:00