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

23193 Commits

Author SHA1 Message Date
Stephan
f21dbb3e77 Fix merge 2018-12-21 16:25:16 +01:00
Stephan
a60fd1b7be Merge branch origin/temp8 into temp8-di2690 2018-12-21 15:47:08 +01:00
Stephan
29540b1835 TypeLoader TLC, better perfs and logging 2018-12-21 15:11:23 +01:00
Stephan
a571af8be2 Make more types IDiscoverable 2018-12-21 13:42:24 +01:00
Stephan
90ab90d6b9 Fix ExamineComponent crashing on shutdown 2018-12-21 13:42:04 +01:00
Stephan
bb9846a6ca Merge branch origin/temp8 into temp8-di2690 2018-12-21 10:58:38 +01:00
Stephan
7f6994514f Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-21 09:00:03 +01:00
Stephan
9db0f540d0 Fix failing tests 2018-12-21 08:58:20 +01:00
Shannon
698b83c455 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-12-21 14:17:36 +11:00
Shannon
d1befc876f manual merges 2018-12-21 13:48:59 +11:00
Shannon
711304dffe manual merges 2018-12-21 13:44:18 +11:00
Shannon
7e20e81cc8 Fixes EntityRepository and EntityService to perform order by operations correctly 2018-12-21 13:15:46 +11:00
Stephan
b0eb0d1205 Fix tests 2018-12-20 15:36:12 +01:00
Stephan
e959605b39 Cleanup and deal with FIXMEs 2018-12-20 14:31:46 +01:00
Stephan
1ffd457985 Merge branch 'temp8' into temp8-3658-contextual-info-app 2018-12-20 13:42:19 +01:00
Stephan
4039127c3d Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-20 13:31:38 +01:00
Stephan
23eabee1a2 Misc fixes 2018-12-20 13:31:34 +01:00
Stephan
56c82d120b Bugfix keepalive route issue 2018-12-20 13:30:19 +01:00
Stephan
5286e02f11 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-20 10:19:02 +01:00
Stephan
8219e0ccdd Fix failing test 2018-12-20 08:25:58 +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
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
fd6a5f60d2 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-19 16:06:35 +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