swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,583 Commits 73 Branches 219 Tags
a4274ba76727273eb8d7cfb02b97fc5bdcd3e9cc
Commit Graph

5066 Commits

Author SHA1 Message Date
Stephan bb9846a6ca Merge branch origin/temp8 into temp8-di2690 2018-12-21 10:58:38 +01:00
Stephan d0623bc494 Merge branch 'temp8' into temp8-removes-config-based-indexes-3901 2018-12-21 09:25:37 +01:00
Stephan 7f6994514f Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-21 09:00:03 +01:00
Shannon 698b83c455 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-12-21 14:17:36 +11:00
Stephan 1ffd457985 Merge branch 'temp8' into temp8-3658-contextual-info-app 2018-12-20 13:42: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
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
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
Thomas Morris 7b804e27ad Removes umbraco.aspx 2018-12-19 15:30:07 +01:00
Stephan 115b0cd2aa Merge branch temp8 into temp8-di2690 2018-12-18 15:42:45 +01:00
Shannon 193bc74f26 removes configuration based indexes 2018-12-18 17:55:30 +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 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
Warren Buckley 3d391fdfb6 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2018-12-13 08:49:35 +00:00
Shannon 7159bca71f Update to latest examine api changes 2018-12-13 18:24:06 +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
Kenn Jacobsen 8ff4d821a8 Merge branch 'temp8' into v8-feature-angular-public-access 2018-12-12 15:42:31 +01:00
Mads Rasmussen defa231c4b add label for history 2018-12-12 14:29:20 +01:00
Kenn Jacobsen e4f9c2916d Use "groups", not "roles" + return richer group models from API 2018-12-12 14:27:20 +01:00
Mads Rasmussen 4f6f959d7f Add missing translations 2018-12-12 13:12:13 +01:00
Shannon 85b25485da removes trees from trees.Release.config 2018-12-12 13:34:54 +11:00
Warren Buckley b0157d7116 We do not need to ship with these Umbraco Forms trees in the config file 2018-12-11 14:08:44 +00:00
Warren Buckley acc238f6ef Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2018-12-11 11:23:18 +00:00
Warren Buckley 0ae9d30373 Revert recent change to Forms dashboard back into XML config - now that we have a way to modify from Umbraco Forms component 2018-12-11 09:43:47 +00:00
Warren Buckley c4cf843b82 Adds in the Umbraco Forms Promo dashboard in via package.manifest so that Forms install can override when installed 2018-12-10 14:59:17 +00:00
Warren Buckley 20a65166be Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2018-12-10 14:31:03 +00:00
Claus cfd6a08366 Merge branch '3436-relations-editor' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-3436-relations-editor 2018-12-10 13:27:34 +01:00
Jack Lawry a11b442cfd Update text 2018-12-10 08:31:07 +01:00
Kenn Jacobsen 3ab5e166d3 Update the select avatar step for invited users 2018-12-09 17:48:10 +01:00
Kenn Jacobsen c860a6b574 Pick members instead of entering username and password 2018-12-09 14:58:52 +01:00
Kenn Jacobsen 33613f3c31 Merge branch 'temp8' into v8-feature-angular-public-access 2018-12-07 15:10:53 +01:00
Kenn Jacobsen fb094f46be Fix edit content localization errors (#3840) 
* Fix wrongly formatted localizations

* Swap hardcoded time format for a localized one

* Split date and time in publish messages
 2018-12-07 14:17:34 +01:00
Warren Buckley f390e2979d Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/EnumerableExtensions.cs
 2018-12-07 12:06:23 +00:00
Kenn Jacobsen 7fc69e5eb0 Add instructions on how to apply a display name in notification emails 2018-12-07 12:37:59 +01:00
Stephan fb4717d31e Merge branch 'temp8-3527-indexes-via-code' into temp8 2018-12-07 09:27:38 +01:00
Shannon 62d74f07bf fixes boolean change mistake to make sure that the Internal/external index has the correct PublishedOnlyFlag, latest examine update, fixes issue with queuing deletions before updates 2018-12-07 15:06:07 +11:00