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

4451 Commits

Author SHA1 Message Date
Stephan
95ef6cd249 Merge branch 'temp8' into temp8-examine-updates-3920 2019-01-10 15:44:16 +01:00
Stephan
4700d8a69c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-10 15:33:22 +01:00
Bjarke Berg
10d0c79c1d #3642 - also save all languages with content on publish 2019-01-10 14:28:22 +01:00
Stephan
7db3644fcd Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901 2019-01-10 14:04:52 +01:00
Bjarke Berg
228fca04ec #3642 - moved functionality to frontend about saving all variants the first time. 2019-01-10 10:06:42 +01:00
Stephan
49668a48bc Upgrade ModelsBuilder (bugfix) 2019-01-09 15:09:16 +01:00
Stephan
39028cd240 Upgrade ModelsBuilder (bugfix) 2019-01-09 14:09:31 +01:00
Shannon
b3414166a6 webforms and legacy file cleanup 2019-01-09 20:43:46 +11:00
Shannon
801e9da028 Fixes issue with dynamically creating/storing field definitions, latest examine update 2019-01-08 16:37:16 +11:00
Shannon
4a1ae0573f Gets definitions dynamically applied for culture specific fields. 2019-01-08 13:25:07 +11:00
Stephan
a1400d33fd Fixes, version 8.0.0-alpha.58 2019-01-07 19:41:23 +01:00
Shannon
f7c70bde1e Fixing up the PublishedContentQuery.Search implementation 3920 2019-01-07 23:49:29 +11:00
Stephan
4fa43abe23 Fix nuspec 2019-01-07 09:46:11 +01:00
Shannon
0356e5a224 Updates to latest examine, fixes issue with rebuilding indexes in the back office seeming to timeout but was a problem with the callback registration in examine 2019-01-07 18:16:06 +11:00
Shannon
118ad5361a Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901 
# Conflicts:
#	src/Umbraco.Examine/UmbracoExamineIndex.cs
 2019-01-07 16:17:58 +11:00
Claus
2fad3c745a Merge branch 'temp8-3539-support-for-variants-in-redirects' into temp8 
# Conflicts:
#	src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
 2019-01-04 14:36:55 +01:00
Stephan
025cdede6c Merge branch origin/temp8 into temp8-di2690 2019-01-04 11:43:14 +01:00
Bjarke Berg
9bf66b0881 #3539 - Re-enabled url redirect tracking and implemented support for culture variants 2019-01-04 11:24:30 +01:00
Stephan
2705de5d60 Revert "Temporary downgrade of MB due to missing onlien pkg" 
This reverts commit b8191c3652.
 2019-01-04 11:13:41 +01:00
Lars-Erik Aabech
b8191c3652 Temporary downgrade of MB due to missing onlien pkg 2019-01-03 21:38:56 +01:00
Claus
f69cb89e30 Merge pull request #3810 from kjac/v8-fix-replace-snippet-jquery-dependencies 
V8: Replace jquery dependencies for partial snippets
 2019-01-03 13:44:57 +01:00
Sebastiaan Janssen
aceb5c7971 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Web.UI.Client/src/less/helveticons.less
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
 2019-01-03 10:32:34 +01:00
Stephan
a434ac8c74 Upgrade to ModelsBuilder -alpha.26 2019-01-03 09:11:11 +01:00
Stephan
ceab758100 Merge branch 'temp8' into temp8-di2690 2019-01-02 16:44:35 +01:00
Stephan
986a7f368f Merge branch 'temp8' into temp8-removes-config-based-indexes-3901 2019-01-02 15:37:20 +01:00
Claus
fb9d5a3c5d Merge branch 'v8-feature-angular-public-access' of https://github.com/kjac/Umbraco-CMS into kjac-v8-feature-angular-public-access 2019-01-02 11:58:24 +01:00
Stephan
b21d07a282 Merge branch origin/temp8 into temp8-di2690 2019-01-02 10:23:24 +01:00
Kenn Jacobsen
af2f531d31 Add missing localization of dialogs (#3844) 2018-12-31 13:37:58 +00:00
Anders Bjerner
91616a527d Should be "Add group" to keep the casing consistent 2018-12-31 12:44:25 +00:00
Stephan
a60fd1b7be Merge branch origin/temp8 into temp8-di2690 2018-12-21 15:47:08 +01:00
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