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

7911 Commits

Author SHA1 Message Date
Shannon
899bb812aa Creates RuntimeStateOptions and pre-loads the error page on the installer 2019-01-17 01:42:56 +11:00
Shannon
94da9a6681 Gets package upgrading working along with package uninstallation with multiple versions 2019-01-16 17:25:46 +11:00
Shannon
90be93d948 Got upgrade status showing in the ui, started implementing merging the package definitions for upgrades but have decided to have an element for each install like we currenlty have in case there are problems installing. 2019-01-16 16:27:51 +11:00
Shannon
b34582b35c Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
 2019-01-16 02:00:44 +11:00
Shannon
b7c15dc393 gets readme and our package install working 2019-01-16 01:53:08 +11:00
Robert
561ce94398 Merge pull request #3933 from umbraco/temo8-3895-infinite-editor-shortcut 
Close an infinite editor through Escape key
 2019-01-15 15:43:43 +01:00
Robert
f9cd22d908 Added a comment explaining why we need the delay 2019-01-15 15:43:10 +01:00
Bjarke Berg
0b9705ca3f Revert "Revert "Support IContentType.IsElement"" 
This reverts commit a5efc25c
 2019-01-15 15:13:10 +01:00
Shannon
db2a003444 change how the install status works, fixes infinite loop 2019-01-16 00:54:25 +11:00
Shannon
f6fdc9ae2d Updates test, fixes some other issues during testing 2019-01-15 23:46:58 +11:00
Shannon
430c95dfad Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-15 22:59:49 +11:00
Shannon
a5ff29ccc7 Gets package uninstall working, fixes other UI issues with packages 2019-01-15 22:59:13 +11:00
Bjarke Berg
a5efc25c81 Revert "Support IContentType.IsElement" 
This reverts commit ba38b67b
 2019-01-15 12:23:14 +01:00
Bjarke Berg
5b1ca92184 Fixes for tag validation and build 2019-01-15 12:12:35 +01:00
Bjarke Berg
bdeee95300 Merge remote-tracking branch 'origin/temp8-40120tags-validation-bug' into temp8-40120tags-validation-bug 2019-01-15 12:09:41 +01:00
Shannon
44ab0991ce Package installing is working 2019-01-15 22:08:08 +11:00
Stephan
ba38b67b9d Support IContentType.IsElement 2019-01-15 11:30:30 +01:00
Robert
0092cac394 DRY 2019-01-15 10:31:12 +01:00
Robert
9bc047c03f Adding code to re-validate on value change 2019-01-15 10:17:26 +01:00
Shannon
18c90c5325 Package file installation logic all migrated and tests are running, now to do the package data installation 2019-01-14 14:28:00 +11: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
Kenn Jacobsen
941baf09ce Fix linkpicker overlay issues (#3718) 2019-01-13 16:17:44 +01:00
Anders Bjerner
be44741bf9 Localized parts of the codefile and template resources (#3495) 2019-01-13 15:58:31 +01:00
Kenn Jacobsen
3b8a570c3c V8: Safeguard against invalid culture in UMB_MCULTURE cookie (#4051) 2019-01-13 15:53:42 +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
Bjarne Fyrstenborg
1213551ca9 Only show extension if media item has a file 
(cherry picked from commit 168febae24)
 2019-01-13 14:55:44 +01:00
Bjarne Fyrstenborg
9968cd257d Rename wrapper class on umb-file-dropzone 2019-01-13 14:51:59 +01:00
Bjarne Fyrstenborg
168febae24 Only show extension if media item has a file 2019-01-13 14:51:59 +01:00
Bjarne Fyrstenborg
b354eda7ac Add styles for umb-property-file-upload and move styles for umb-upload-big-button 2019-01-13 14:51:59 +01:00
Steve
f620d0deca Fixes #4016 unpublished content styling in list view 2019-01-13 14:43:24 +01:00
Kenn Jacobsen
d350ab0789 Ensure some spacing between properties within Nested Content items 2019-01-13 14:42:58 +01:00
Kenn Jacobsen
0f7cb7c177 Use built-in localization for Nested Content + fix element picker title 2019-01-13 14:40:38 +01:00
Sebastiaan Janssen
c94a6b1777 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
 2019-01-13 14:22:00 +01:00
Kenn Jacobsen
d1cfe84723 Set the form dirty when changing focal point and editing crops 2019-01-13 14:01:11 +01:00
Kenn Jacobsen
cd6cdcfda4 Visualize image transparency in upload and image cropper thumbnails (#4050) 2019-01-13 13:54:30 +01:00
Sebastiaan Janssen
ef8ffc5149 Merge branch 'dev-v7' into temp8 2019-01-13 13:29:06 +01:00
Bjarne Fyrstenborg
2ebd7a077c Fix placeholder text when empty alias input after generating alias (#4032) 
(cherry picked from commit c619b79276)
 2019-01-13 13:16:00 +01:00
Kenn Jacobsen
291d58900f V8: Remember editor language between sessions (#4035) 2019-01-13 12:42:42 +01:00
Claus
5715b26bb7 Merge branch 'v8-fix-tags-remove-setdirty' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-tags-remove-setdirty 2019-01-13 01:02:05 +01:00
Kenn Jacobsen
e88c789b88 Add some defensive coding to avoid JS errors 2019-01-11 15:44:54 +01:00
Warren Buckley
8f1cd8110d Adds in the missing chart.js & wrapper lib (part of it was put in the solution it seems but not fully merged in correctly perhaps?!) 2019-01-11 13:27:39 +00:00
Warren Buckley
250c24de40 Adds in chart.js & the angular wrapper library 2019-01-11 12:54:50 +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
Shannon Deminick
7dbd8a3515 Merge pull request #4024 from umbraco/temp8-4005 
Temp8 4005
 2019-01-11 10:17:22 +11:00
Sebastian Hoffback
cc13b99787 Removed already deleted file canvasdesigner.panel.js from canvasdesigner.loader.js 2019-01-10 19:32:59 +01:00
Sebastiaan Janssen
d69f0fe9dd #3993 Move color picker fix to correct method and update backwards compatibility test 2019-01-10 15:35:48 +01:00
Bjarke Berg
10d0c79c1d #3642 - also save all languages with content on publish 2019-01-10 14:28:22 +01:00
Robert
b000ead96b CTRL+K+D 2019-01-10 12:09:44 +01:00