yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,509 Commits 4 Branches 7 Tags
0d34468f20d7240bf5d498a5c0fa2b2d14b43f90
Commit Graph

32509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
0d34468f20 Merge pull request #7522 from umbraco/netcore/feature/AB4685-move-scheduling-from-web 
Netcore: Move scheduling to Abstractions and Infrastructure
 2020-01-29 11:51:07 +01:00
Bjarke Berg
03f1faf20d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Models/ChangingPasswordModel.cs
#	src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
 2020-01-29 09:22:45 +01:00
Aleksandr Šmailov
537674a0b3 Improve RTE performance when using base64 images (#7530) 2020-01-29 08:53:08 +01:00
Shannon
c4b9a62e3b Fixes netstandard references 2020-01-29 15:29:28 +11: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
Bjarke Berg
5ed900f276 Bugfix - Aparently the UmbracoApplicationBase constructor is called twice.. 2020-01-27 14:55:43 +01:00
Bjarke Berg
a1ed2eb135 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-27 14:22:04 +01:00
elitsa
770c4beb95 Moving Scheduling classes from Web to Abstractions and Infrastructure. 2020-01-27 12:56:00 +01:00
Bjarke Berg
3b7825b30d Netcore: Moves services and dependencies from Web to Abstractions (#7497) 
* Moves the services and dependencies from web,

* Fix bug with Empty collection not being a property (new one for each access)

* remvoed moved files from web csproj

* Fix spelling
 2020-01-27 09:31:24 +01:00
Bjarke Berg
09b9c01f94 Netcore: Make composition root available as current in abstrations (#7500) 
* Added all the essential parts of umbraco available on the Current from Abstractions.
These are created when Current is initialized.

* Moved some of the composers and components into Infrastructure - And removed unused Settings Files

* Init current with null logger

* Avoid multiple init of Current
 2020-01-27 09:12:52 +01: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
Bjarke Berg
a9e6919420 Merge pull request #7496 from benjaminc/netcore/feature/7369-remove-current-services 
Replace Current.Services references with DI where possible
 2020-01-23 13:39:59 +01:00
Bjarke Berg
fd2524bcc5 Need to make lazy injection of IEntityService to break cycle after merge :( 2020-01-23 13:33:10 +01: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
1bfb64bdd8 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-AppSettings.cs
#	src/Umbraco.Abstractions/ContentVariationExtensions.cs
#	src/Umbraco.Abstractions/IMainDom.cs
#	src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Abstractions/Runtime/IMainDom.cs
#	src/Umbraco.Abstractions/Runtime/MainDom.cs
#	src/Umbraco.Core/IMainDom.cs
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/MainDom.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2020-01-23 13:16:49 +01: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
Bjarke Berg
0d84bfb42e Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-01-23 10:34:06 +01:00
Shannon Deminick
3b63d9baa3 Merge pull request #7486 from umbraco/netcore/feature/AB4635-move-cache-refreshers 
NetCore:  Moved CacheRefreshers to abstractions
 2020-01-23 20:18:48 +11:00
Shannon
877e0cca93 removes unneeded ctor param 2020-01-23 20:06:02 +11:00
Shannon
c7b0bf20b0 Removes RefreshByJson and changes macro cache refreshing to use objects 2020-01-23 19:48:15 +11: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
a020c52ff6 Simplifies IdKeyMap interface, moves the weird add mapping logic in PublishedSnapshotService to a composer. 2020-01-23 18:10:21 +11:00
Benjamin Carleski
a379e01578 Replace Current.Services references with DI where possible 2020-01-22 21:43:25 -08: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
Bjarke Berg
47c211907a AB4635 - Fixed up some of the review comments - Removed static (de)serializers and get the CacheRefresher from the collection 2020-01-22 14:09:20 +01:00
Bjarke Berg
d8427779ea Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-01-22 11:58:20 +01:00
Bjarke Berg
3bdfe84717 Merge pull request #7490 from benjaminc/netcore/feature/7370-inject-config-interfaces 
Use dependency injection for config classes
 2020-01-22 11:52:50 +01:00
Bjarke Berg
3e7c6c12b0 Removed support for vbhtml views 2020-01-22 11:45:18 +01:00
Bjarke Berg
2e0299cf7b Removed used things 2020-01-22 11:44:56 +01:00