Commit Graph

31970 Commits

Author SHA1 Message Date
emma burstow
c7cceedbd6 Merge branch 'v8/contrib' into pr/5917 2020-01-30 10:50:47 +00:00
Kenn Jacobsen
b6a073a12e Add missing documentation for web.routing in umbracoSettings.config (#7468)
Cheers Kenn :)
2020-01-29 16:54:56 +00:00
Nathan Woulfe
a945b0c511 use default color when previous selection removed (#7448)
Thanks Nathan!
2020-01-29 16:52:20 +00:00
jmcaveney
42fe20a11e Uses AppSettings.Path constant for SystemDirectories.Umbraco (#7440) 2020-01-29 13:16:17 +01:00
Aleksandr Šmailov
537674a0b3 Improve RTE performance when using base64 images (#7530) 2020-01-29 08:53:08 +01:00
Shannon Deminick
4058ca6109 Merge pull request #7532 from lars-erik/v8/fix-tests-more
Don't downcast `IPublishedSnapshot` unnecessarily in `PublishedContent`
2020-01-29 09:48:55 +11:00
Lars-Erik Aabech
af7f03e1f7 Don't downcast IPublishedSnapshot unnecessarily in PublishedContent 2020-01-28 22:28:54 +01:00
Poornima Nayar
c077f56ced Merge pull request #6942 from kjac/v8/fix/locked-alias-cursor
V8: Use "not allowed" cursor for locked type aliases
2020-01-27 15:24:36 +00:00
Nathan Woulfe
902d4196cf add dialog for change password, shift form from user details view int… (#7450) 2020-01-27 06:29:04 +01:00
Poornima Nayar
ebed80791d Changed delete button style on media type folder delete to danger style (#7393) 2020-01-27 06:12:01 +01:00
Sebastiaan Janssen
41dc8d915b Merge branch 'v8/dev' into v8/contrib 2020-01-26 10:37:11 +01:00
Kenn Jacobsen
8e736f87d0 Hide the "blob:" URL for images uploaded via the RTE (#6926) 2020-01-24 11:38:21 +00:00
Warren Buckley
8bf457a88d Set v8/dev to 8.7.0 with powershell .\build setumbracoversion 8.7.0 2020-01-24 09:10:54 +00:00
Warren Buckley
f486db89d4 Merge pull request #7498 from umbraco/v8/feature/upgrade-npm-dependencies
upgrade npm dependencies
2020-01-24 08:52:36 +00:00
Bjarke Berg
257ea6c1c3 Merge remote-tracking branch 'origin/v8/8.5' into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
2020-01-24 09:32:34 +01:00
Bjarke Berg
4cf78d6ef0 Bump version to 8.5.3 2020-01-24 09:22:34 +01:00
Bjarke Berg
7bdf97c431 https://github.com/umbraco/Umbraco-CMS/issues/7469 Unsealed class to allow override 2020-01-24 09:20:16 +01:00
Bjarke Berg
05fe604e22 https://github.com/umbraco/Umbraco-CMS/issues/7469 Renamed extension method to avoid ambiguous signature 2020-01-24 09:19:29 +01:00
Sebastiaan Janssen
d45ef632f1 Merge branch 'v8/dev' into v8/contrib 2020-01-24 09:01:37 +01:00
Bjarke Berg
384ecbe22a Removed reference from Umbraco.Web.UI to Umbraco.TestData 2020-01-24 08:25:03 +01:00
Niels Lyngsø
7fc0f01887 fixed versions for angular + npm 2020-01-23 15:23:32 +01:00
Niels Lyngsø
aaf53921eb upgrade to Angular 1.7.9 + npm 6.13.6 2020-01-23 15:15:48 +01:00
Poornima Nayar
dd78fd832c Merge pull request #6933 from kjac/v8/fix/treepicker-retain-selected-state
V8: Display picked item state when navigating the treepicker
2020-01-23 13:03:09 +00:00
Poornima Nayar
18e0f8d092 Merge pull request #6790 from stevemegson/v8/pr/6230
V8: Update TinyMCE language files
2020-01-23 12:28:51 +00:00
Bjarke Berg
fd11ef6ed1 Merge pull request #7306 from umbraco/v8/bugfix/AB3323-SqlMainDom
Introduce a new IMainDomLock and both default and sql implementations
2020-01-23 12:44:11 +01:00
Poornima Nayar
df8f281141 Merge pull request #7045 from ronaldbarendse/v8/bugfix/nested-content-defaultpropertyvalueconverters
Add DefaultPropertyValueConverterAttribute to core Nested Content PropertyValueConverters
2020-01-23 11:26:13 +00:00
Sebastiaan Janssen
a9d45413c8 Merge branch 'v8/dev' into v8/contrib 2020-01-23 09:04:57 +01:00
Shannon
52b93bfc9c ensures only _sqlServerSyntax is used 2020-01-23 18:33:55 +11:00
Shannon
8d7ed7dd32 adds const fixing naming 2020-01-23 16:26:13 +11:00
Shannon
201927580c Fixing accidental api signature breaking change 2020-01-23 16:23:27 +11:00
Shannon Deminick
238db1c908 Merge pull request #7430 from ronaldbarendse/v8/bugfix/enum-extensions
Clean up EnumExtensions
2020-01-23 15:03:51 +11:00
Dave Woestenborghs
d61090a225 #7452 set save state correctly for variant when setting schedule publishing 2020-01-22 21:27:35 +01:00
Ronald Barendse
c4da5703fd Merge changes 2020-01-22 11:40:41 +01:00
Ronald Barendse
1cc6a8cb45 Rename SetVariesBy to SetFlag on the enum overload 2020-01-22 11:14:31 +01:00
Sebastiaan Janssen
ac675d14e9 Fixes build errors 2020-01-22 11:13:49 +01:00
Bjarke Berg
db27090ac0 Merge pull request #7233 from umbraco/v8/bugfix/6758-nucache-fix
When nucache updates are made the previous Gen root node is cleared
2020-01-22 11:13:43 +01:00
Ronald Barendse
6c2e1b29fd Use SetVariesBy extension methods instead of SetFlag/UnsetFlag 2020-01-22 11:10:56 +01:00
Ronald Barendse
10f15a7648 Remove duplicate VariesBySegment overload after merge 2020-01-22 11:10:28 +01:00
Ronald Barendse
b01f2ed35e Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions 2020-01-22 11:04:11 +01:00
Sebastiaan Janssen
a7b580b552 Merge branch 'v8/dev' into pr/7430 2020-01-22 10:56:21 +01:00
Bjarke Berg
1dfdfba236 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 2020-01-22 09:39:06 +01:00
Warren Buckley
81a0a52874 Merge branch 'v8/feature/media-tracking' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
2020-01-22 08:36:32 +00:00
Bjarke Berg
efd4512e64 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 2020-01-22 09:18:30 +01:00
Sebastiaan Janssen
794976dda7 Merge branch 'v8/dev' into v8/contrib 2020-01-22 08:55:42 +01:00
Niels Lyngsø
8030901184 Fix mistakes made in commit a4a6b77 2020-01-22 08:36:52 +01:00
Bjarke Berg
b84961bcbc Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
2020-01-22 07:06:43 +01:00
Shannon Deminick
3fa969eef2 Merge pull request #7400 from bielu/allow-override-internalsearch-constants
Add possibility to override internal hardcoded configs for backoffice search
2020-01-22 11:18:32 +11:00
Anders Bjerner
63bd28f8c1 Merge pull request #7477 from MarcStoecker/patch-4
Fix typo in DE "installFinish" caption
2020-01-21 23:01:58 +01:00
Anders Bjerner
fecd09cf9d Merge pull request #7488 from JeffDess/v8/contrib
Fix typo in contentTypeSavedHeader French label
2020-01-21 22:48:46 +01:00
Sebastiaan Janssen
163c1f7028 Fix automatic merge gone wrong 2020-01-21 19:16:07 +01:00