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

7741 Commits

Author SHA1 Message Date
Shannon
698b83c455 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-12-21 14:17:36 +11:00
Shannon
711304dffe manual merges 2018-12-21 13:44:18 +11:00
Stephan
1ffd457985 Merge branch 'temp8' into temp8-3658-contextual-info-app 2018-12-20 13:42:19 +01:00
Shannon
e7a06467f1 Fixes merge issues, manually merges other changes 2018-12-20 17:50:16 +11:00
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
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
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
Stephan
720ad984dc Merge branch 'temp8-backoffice-search-with-variants' into temp8 2018-12-19 16:02:54 +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
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
f3e8b70b8c Show only the success message upon successful update of notifications 2018-12-19 15:32:31 +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
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 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
Shannon
72d42e4228 updates the UI to show culture when the item is not variant and shows the unpublished status if the culture has no variants 2018-12-19 15:58:18 +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
Shannon
b9580b389e Merge remote-tracking branch 'origin/temp8' into temp8-3658-contextual-info-app 2018-12-18 18:04:38 +11:00
Shannon Deminick
2377d3ac11 Merge pull request #3891 from kjac/v8-fix-publish-on-preview 
V8: Don't publish on preview
 2018-12-18 17:24:14 +11:00
Mads Rasmussen
4068dca938 reenable infinite editing animations 2018-12-17 13:55:08 +01:00
Mads Rasmussen
ebc689032d fix dictionary pickers in code editors 2018-12-17 10:48:33 +01:00
Kenn Jacobsen
33b9870aec Only perform save when previewing - not a publish 2018-12-16 21:52:45 +01:00
Shannon
9cc729d90b Merge branch 'temp8' into temp8-backoffice-search-with-variants 
# Conflicts:
#	src/Umbraco.Examine/ExamineExtensions.cs
 2018-12-14 13:06:54 +11:00
Mads Rasmussen
defa231c4b add label for history 2018-12-12 14:29:20 +01:00
Mads Rasmussen
c8593c23e6 show correct createDate for variants, only show contextual variant status, only show context variant urls, add variant log colors 2018-12-12 11:59:08 +01:00
Stephan
fc620af9d0 Merge branch 'temp8' into temp8-3675-variant-tags 2018-12-12 08:58:25 +01:00
Shannon
2254c3d00c Merge branch 'temp8' into temp8-backoffice-search-with-variants 2018-12-12 12:06:21 +11:00
Mads Rasmussen
b19f9c8114 update styling on forms install dashboard 2018-12-11 13:39:12 +01:00
Mads Rasmussen
d06ccebf7c update docs for infinite editing 2018-12-11 13:03:18 +01:00