yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,683 Commits 4 Branches 7 Tags
2fa2e0109d72aadd1c8839a519d47bc8ff275acc
Commit Graph

4556 Commits

Author SHA1 Message Date
Sebastiaan Janssen
92c278c593 Adds missing translation, fixes #4054 2019-01-14 07:12:21 +01:00
Sebastiaan Janssen
b865c6b476 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	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/HtmlHelperRenderExtensions.cs
 2019-01-13 23:22:10 +01:00
Anders Bjerner
be44741bf9 Localized parts of the codefile and template resources (#3495) 2019-01-13 15:58:31 +01:00
Kenn Jacobsen
74986d24f1 V8: Add "Move" option for deleted items in the content tree (#3931) 2019-01-13 15:49:37 +01:00
Warren Buckley
fded793f8e Removes the accidently Web.UI.csproj V7 port numbers for IISExpress when merging up from V7 to V8 2019-01-11 13:32:45 +00:00
Warren Buckley
ab565f1d27 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-11 12:18:29 +00:00
Sebastiaan Janssen
dcf2e4830f Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Core/Media/Exif/ImageFile.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
 2019-01-11 10:23:27 +01:00
Sebastiaan Janssen
9e33581391 Merge branch 'patch-7.13.1' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2019-01-11 09:53:50 +01:00
Shannon
687aa8cc99 Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-11 10:37:22 +11:00
Warren Buckley
2e8a6c88a6 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-10 19:18:28 +00:00
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
Shannon
b8d2309b9c Gets the IPackageBuilder working and tested, now the controller can create and update packages, validation is also working, need to do some more tests for adding other entities , removes more of the old packaging code. 2019-01-10 17:18:47 +11:00
Stephan
49668a48bc Upgrade ModelsBuilder (bugfix) 2019-01-09 15:09:16 +01:00
Sebastiaan Janssen
ff085c97ce Revert "Added eslintignore file" 
This reverts commit 673735c2fe.
 2019-01-09 14:57:17 +01:00
Stephan
39028cd240 Upgrade ModelsBuilder (bugfix) 2019-01-09 14:09:31 +01:00
Warren Buckley
6d808cb121 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-09 10:46:44 +00:00
Shannon
e27b873a5a Merge branch 'temp8-remove-package-ascx-3996' into temp8-packages-ui 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
 2019-01-09 20:57:02 +11:00
Shannon
b3414166a6 webforms and legacy file cleanup 2019-01-09 20:43:46 +11:00
Sebastiaan Janssen
0f61de8bcd Bumps version to 7.14.0 2019-01-08 21:49:17 +01:00
Sebastiaan Janssen
5b17072d55 Bump version to 7.13.1 2019-01-08 21:45:34 +01: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
Warren Buckley
9ce35d25d2 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
 2019-01-07 09:59:15 +00: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
Warren Buckley
baa37549fb Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-03 13:52:14 +00: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
Warren Buckley
4651325d77 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
 2019-01-01 19:08:59 +00: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