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

23398 Commits

Author SHA1 Message Date
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
Stephan
798c01c514 Merge pull request #4034 from aaronpowell/temp8-4033 
Fixing default ProfilingLogger
 2019-01-11 08:49:43 +01:00
Stephan
ba282ab81a Comments 2019-01-11 08:26:53 +01:00
Stephan
19233c2e5f Merge branch temp8 into temp8-examine-updates-3920 2019-01-11 08:24:36 +01:00
Stephan
677311aa49 reduce allocs 2019-01-11 08:06:12 +01:00
Aaron Powell
a5630a3448 Fixing 4033 by using the right Logger instance 2019-01-11 14:35:24 +11:00
Shannon Deminick
7dbd8a3515 Merge pull request #4024 from umbraco/temp8-4005 
Temp8 4005
 2019-01-11 10:17:22 +11:00
Quan Tran
59349dd355 Fix - refine code 2019-01-10 19:35:51 +01:00
Quan Tran
4170faf76e add null checking 2019-01-10 19:35:51 +01:00
Sebastian Hoffback
cc13b99787 Removed already deleted file canvasdesigner.panel.js from canvasdesigner.loader.js 2019-01-10 19:32:59 +01:00
Stephan
2baf3b5b41 Fixes 2019-01-10 18:37:48 +01:00
Stephan
ed7c8da81f Merge branch 'temp8' of https://github.com/StefanoChiodino/Umbraco-CMS into temp8-pr3583 2019-01-10 16:29:36 +01:00
Stephan
95ef6cd249 Merge branch 'temp8' into temp8-examine-updates-3920 2019-01-10 15:44:16 +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
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
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
Bjarke Berg
d672531b0b #3642 - reuse method for determine if the content is new 2019-01-10 07:58:45 +01:00
Bjarke Berg
b0b0477dab #3642 -bugfix for nonvariant 2019-01-10 07:34:28 +01:00
Bjarke Berg
7421378330 #3642 - use nameof instead of magic strings that has to be equal to variable name 2019-01-10 07:03:08 +01:00
Bjarke Berg
8594af3fe3 #3642 - Also do dirty checks if we have changed the culture. 2019-01-10 06:58:12 +01:00
Bjarke Berg
28d93175d5 #3642 - When saving content the first time, we need to save all variants (even when save is not true), otherwise we loose the information when the url are updated. 2019-01-10 06:56:56 +01:00
Bjarke Berg
50b98a65d3 Merge remote-tracking branch 'origin/temp8' into temp8-3642-content-templates-fixes 2019-01-10 06:26:06 +01: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
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
d41dbce601 Fix content picker dirty checking (#4003) 2019-01-09 11:20:34 +01: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
Shannon
fa82e1660b Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-09 20:44:17 +11:00
Shannon
b3414166a6 webforms and legacy file cleanup 2019-01-09 20:43:46 +11: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
Stephan
9ef8e9afc1 Cleanup task runner 2019-01-09 10:05:10 +01:00
Shannon
4b58e34220 Align namespaces with _Legacy folder 
# Conflicts:
#	src/Umbraco.Web/_Legacy/Packager/PackageInstance/InstalledPackage.cs
 2019-01-09 19:08:09 +11:00
Shannon
e73884250a references the form directly 2019-01-09 18:41:52 +11:00
Shannon
c7598bf647 changes the invariant check back since this is how it was done before in code above, plus means a later refactor of property/propertytype will be easier 2019-01-09 17:03:34 +11:00
Shannon
a1ad04e04e Refactors a bit of the BuildDtos method and adds a unit test 2019-01-09 16:57:40 +11:00
Shannon
0267378bf9 Merge remote-tracking branch 'origin/temp8' into temp8-3708 2019-01-09 13:19:40 +11:00
Bjarke Berg
9bbe743686 syntax 2019-01-08 22:30:12 +01:00