 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 |
|
|
christophnz
|
282ac2b9c5
|
Added 2 HtmlHelper extension methods for rendering RelatedLinks, including Unit tests
|
2019-01-13 15:17:13 +01:00 |
|
|
Jannik Anker
|
1224f68297
|
Issue 3018 - non-admin users cannot create groups (derpness cleanup)
|
2019-01-13 15:13:26 +01:00 |
|
|
Jannik Anker
|
8d1733fd12
|
Issue 3018 - non-admin users cannot create groups
|
2019-01-13 15:13:26 +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 |
|
|
Stephan
|
ca75b2f4d3
|
Fix recent Examine changes
|
2019-01-11 14:54:56 +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
|
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
|
d0153b1105
|
Merge branch 'temp8' into temp8-auto-install
|
2019-01-11 08:57:59 +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
|
c89b50f0b8
|
large refactor/cleanup of most of the old package installer logic dealing with persisting the installedPackages.config which is now in the services, creates new parsers and removes a ton of old code, changes fetching packages to be async, uses XElement instead of old XmlNode apis, next we need to do the actual package installer updates
|
2019-01-11 14:30:04 +11:00 |
|
|
Shannon
|
687aa8cc99
|
Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui
|
2019-01-11 10:37:22 +11:00 |
|
|
Shannon
|
74c01af369
|
Splits logic for IPackageBuilder into ICreatedPackagesRepository and IInstalledPackagesRepository since it's nearly the same for both
|
2019-01-11 10:35:37 +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
|
09d28f720a
|
Merge branch 'temp8' into temp8-fs
|
2019-01-10 16:45:50 +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
|
003907358d
|
Better runtime state detection, to support auto-install
|
2019-01-10 16:01:13 +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 |
|