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

7925 Commits

Author SHA1 Message Date
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
Robert eafbf6dcae Update current urls on 'node.updateDate' 2019-01-10 12:07:53 +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
Kenn Jacobsen d2baf03119 Fix content picker dirty checking (#4003) 
(cherry picked from commit d41dbce601)
 2019-01-10 09:54:39 +01:00
Shannon 4bf3c1d05b Handles trying to create a package with a duplicate name 2019-01-10 19:27:25 +11:00
Shannon 568d5c2583 Fixes issue with redirect 2019-01-10 19:08:52 +11:00
Shannon 5cb99bfddc forgot to add the test class 2019-01-10 18:55:24 +11:00
Shannon 091c9471bb Gets macros in packages, gets the download button working to download a created package, more tests 2019-01-10 18:51:02 +11: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
Bjarke Berg 8594af3fe3 #3642 - Also do dirty checks if we have changed the culture. 2019-01-10 06:58:12 +01:00
Warren Buckley 36541fa77c Merge pull request #4017 from kjac/v8-feature-content-app-badge-without-text 
V8: Allow Content App badges without "count"
 2019-01-09 13:01:07 +00:00
Kenn Jacobsen cd1338db82 Make the count-less badge a little bit bigger 2019-01-09 13:20:16 +01:00
Kenn Jacobsen aea41937f7 Allow content app badges without "count" 2019-01-09 13:18:27 +01:00
Warren Buckley 898f1f2397 Merge pull request #3995 from umbraco/temp8-3656-3988-fixes-for-variants 
Temp8 3656 3988 fixes for variants
 2019-01-09 12:00:39 +00:00
Kenn Jacobsen 10cf10b33a Set form as dirty when removing a tag 2019-01-09 12:22:55 +01:00
elitsa fe689e6855 Added timeout to for rebinding editor shortcuts, and a shortcut for a media picker. 2019-01-09 12:08:46 +01:00
elitsa bea740c6e0 Merge remote-tracking branch 'origin/temp8' into temo8-3895-infinite-editor-shortcut 2019-01-09 11:39:02 +01:00
Robert a809e35e5d Fixes - temp8-40120 tags-validation-bug 2019-01-09 11:29:42 +01:00
Kenn Jacobsen d41dbce601 Fix content picker dirty checking (#4003) 2019-01-09 11:20:34 +01: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
Sebastiaan Janssen ec60ba142a Fixes #3993 Recent changes in color picker has caused incompatibility with existing picker 2019-01-09 10:50:27 +01:00
Warren Buckley 6e8b00d85c Merge pull request #3426 from kjac/v8-feature-content-app-badge 
V8: Add notification badge to content app
 2019-01-09 09:47:15 +00:00
Bjarke Berg 70aa29ec7a #3642 - removed new stuff with on change event and fixed the old and broken, thats shared in tinymce 2019-01-09 10:20:01 +01:00
Shannon 640de1c1a4 very small cleanup before some package code changes 2019-01-09 18:59:59 +11:00
Shannon e73884250a references the form directly 2019-01-09 18:41:52 +11:00
Warren Buckley 2422000b3e Updates RemoteDashboard so FINALLY the main image on the left loads in V8 backoffice 
* Adds a new filter that uses the Angular $sce.trustAsHtml() function
 2019-01-08 16:20:11 +00:00
Bjarke Berg f2dac9df3c #3988 - Save RTE value on model.value on each change event 2019-01-08 13:59:33 +01:00
Bjarke Berg 89b5984794 #3695 - force the form to be dirty if any variant is still dirty 2019-01-08 11:01:28 +01:00
Stephan 436fa261f5 Merge remote-tracking branch 'origin/temp8' into temp8 2019-01-07 19:42:33 +01:00
Sebastiaan Janssen 21612454d0 Update umbtoggle.directive.js 2019-01-07 13:45:43 +01:00
Sebastiaan Janssen d53d0b4271 Add disabled state to toggle (#3967) 
(cherry picked from commit d231db8ef2)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/languages/edit.html
 2019-01-07 12:53:31 +01:00
Bjarne Fyrstenborg d231db8ef2 Add disabled state to toggle (#3967) 2019-01-07 12:41:07 +01:00
Kenn Jacobsen 4564623899 Don't use a hardcoded folder type alias to determine folder types in the list view 2019-01-07 12:31:05 +01:00
Kenn Jacobsen ab11be50a3 Don't change content app when saving media items 2019-01-07 11:22:27 +01:00
Stephan 775dd67254 Version 8.0.0-alpha-57 2019-01-07 09:46:11 +01:00
Kenn Jacobsen b861b379db Make the on-click-outside directive work again 2019-01-07 08:45:37 +01: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