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

8676 Commits

Author SHA1 Message Date
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
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
97f9151473 Add "Move" option for deleted items in the content tree (#3772) 2018-12-19 18:19:51 +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
bb53c020e9 Fix the member group picker 2018-12-19 16:20:22 +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
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
Tristan Thompson
65f7e44338 Remove/Replace endPreview.aspx with MVC endpoint 2018-12-19 15:47:31 +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
Thomas Morris
7b804e27ad Removes umbraco.aspx 2018-12-19 15:30:07 +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
6a8c7d1a3b Writes some tests, fixes a bug, orders results, writes notes 2018-12-19 17:13:46 +11:00
Stephan
7cdbe39ce5 Merge branch 'temp8' into temp8-backoffice-search-with-variants 2018-12-18 17:05:17 +01:00
Stephan
115b0cd2aa Merge branch temp8 into temp8-di2690 2018-12-18 15:42:45 +01:00
Shannon
36fd32ee9a remove unused comparer 2018-12-19 00:04:35 +11:00
Shannon
7047a07660 Shows the culture for URLs if the node is invariant but it has cultural URLs (it exists underneath a variant) 2018-12-19 00:03:49 +11:00
Shannon
a19a58796f Changes IUrlProvider to return UrlInfo 2018-12-18 22:02:39 +11: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
Stephan
8152862ad2 Fix issue with figuring out whether a published content version is draft 2018-12-18 08:31:10 +01:00
Stephan
35ebced4ed True standalone test 2018-12-17 18:55:36 +01:00
Shannon Deminick
fde64f157c Merge pull request #3818 from umbraco/temp7-268-xss-xslt 
Fixing XSS issue with Xslt files.
 2018-12-17 15:20:36 +11:00
Shannon
07d2320898 fixes bool 2018-12-17 13:44:11 +11:00
Shannon
7484626893 Allows passing in a culture to the IPublishedContentQuery search methods 2018-12-17 13:11:51 +11:00
Shannon
4976782247 Updates search published content search extensions to correspond with new examine api changes, updates examine api changes 2018-12-17 12:17:03 +11:00
Shannon
4a23a6d3d0 Merge branch 'temp8-backoffice-search-with-variants' into temp8-examine-extensibility-3535 2018-12-14 13:17:51 +11: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
Shannon
d38e4e6e34 latest examine, fixes sortability 2018-12-14 11:32:20 +11:00
Shannon
162f8480d1 more tweaks to get config based indexes working, updates to IIndexPopulator to have strongly typed association 2018-12-13 23:17:58 +11:00
Shannon
c129375dd0 more bug fixes 2018-12-13 22:33:41 +11:00
Stephan
7cad591b86 Fixes 2018-12-13 11:12:48 +01:00
Shannon
2060f69ab0 Allow configuring a DirectoryFactory for all LuceneIndexes created with LuceneIndexCreator 2018-12-13 21:09:56 +11:00
Shannon
7159bca71f Update to latest examine api changes 2018-12-13 18:24:06 +11:00
Shannon
5e6320730d Updates nuspec to latest examine 2018-12-13 18:18:04 +11:00
Shannon
8be55f8f98 Merge branch 'temp8' into temp8-examine-extensibility-3535 2018-12-13 16:40:56 +11:00
Shannon
c8b3f11498 latest examine, tweaks to UmbracoFieldDefinitionCollection, adds some test code for testing 2018-12-13 15:04:18 +11:00
Stephan
adced099be Move UmbracoConfig singleton to Current 2018-12-12 23:31:16 +01:00
Kenn Jacobsen
082d65b78f Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into v8-feature-angular-public-access 2018-12-12 23:07:53 +01:00
Kenn Jacobsen
41624c8c16 Remove the old aspx page 2018-12-12 23:07:41 +01:00
Stephan
e40c9cb227 Fix missing dependencies errors, simplify 2018-12-12 16:07:21 +01:00