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

32895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
53953338d8 Merged Umbraco.Abstractions into Umbraco.Core 2020-03-03 13:42:07 +01:00
cyberdot
efd8e37f34 Merge branch 'netcore/dev' into temp-7667 2020-03-03 12:05:31 +00:00
cyberdot
01362d0dd0 NetCore: Abstract ConfigurationManager references 2020-03-03 11:18:54 +00:00
Elitsa Marinovska
84f19e093a NetCore: Refactor internal usages of UmbracoHelper (#7744) 
* Removing properties related to IPublishedContentQuery, ITagQuery, ICultureDictionaryFactory, IUmbracoComponentRenderer from UmbracoHelper and using the corresponding private fields instead. Removing Media related methods

* Removed UmbracoHelper from UmbracoApiControllerBase

* Removed UmbracoHelper references

* Inject the needed Interfaces to classes that previously used UmbracoHelper to get the same functionality

* Fixed tests referencing UmbracoHelper

* Adding Media methods back

* Cleanup and moved UmbracoHelper from more base classes, when not used + simplified tests

* Reintroduced some methods..

* Reintroduced some methods..

* Reintroducing last missing bits

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-03-03 11:59:17 +01:00
Bjarke Berg
4d3e9601f9 post merge fix 2020-03-02 09:07:05 +01:00
Bjarke Berg
1ea39f2762 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
#	src/Umbraco.Core/Packaging/ConflictingPackageData.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Core/PublishedCache/PublishedMember.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
#	src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/MediaTypeTreeController.cs
 2020-03-02 08:34:52 +01:00
Bjarke Berg
cd44935b1c Merge pull request #7722 from umbraco/netcore/feature/move-more-install-stuff 
NetCore: Moved install steps + dashboards
 2020-03-02 08:28:01 +01:00
Bjarke Berg
b5171fae30 Introduced GetRequiredUmbracoContext extension on IUmbracoContextAccessor 2020-03-02 07:58:02 +01:00
Bjarke Berg
ef16321265 Break cycular dependency, by injecting IUmbracoDatabaseFactory instead of ISqlContext Directly 2020-03-02 07:50:55 +01:00
Claus
f8b5083a9f Merge pull request #7719 from umbraco/v8/bugfix/fix-collection-items-DI 
Fixes CollectionBuilder's to ensure that each item in the collectionis registered in DI with the same lifetime as the collection itself
 2020-02-27 13:09:28 +01:00
Bjarke Berg
c3fcbc0a72 Moved functionality from HostingEnvironment into IUmbracoApplicationLifetime, to not have duplicated logic 2020-02-27 11:13:57 +01:00
Bjarke Berg
0c56437ddd Merge branch 'netcore/dev' into netcore/feature/move-more-install-stuff 
# Conflicts:
#	src/Umbraco.Web/Composing/Current.cs
 2020-02-27 10:55:26 +01:00
Bjarke Berg
f0dee45069 Refactored UmbracoApplication.Restart 2020-02-27 10:55:07 +01:00
Bjarke Berg
dc36fa1290 Fix issues in views 2020-02-27 10:43:09 +01:00
Bjarke Berg
6b9042de7d Merge branch 'netcore/dev' into netcore/feature/move-more-install-stuff 
# Conflicts:
#	src/Umbraco.Web/UmbracoHelper.cs
 2020-02-27 10:03:13 +01:00
Bjarke Berg
8e3cb8f3e6 Removed MembershipHelper from UmbracoHelper 2020-02-27 09:56:35 +01:00
Bjarke Berg
ba97598044 - Moved dashboards to Core 
- Introduced IUserAgentProvider, instead of using HttpContext directly
- Introduced IUmbracoApplicationLifetime, instead of using UmbracoApplication directly
- Introduced IMachineKeyConfig instead of using WebConfigurationManager directly
- Move information about dbProvider to the SqlSyntax
- Moved install steps
 2020-02-26 13:52:06 +01:00
Bjarke Berg
8d76499969 Separated TreeNode stuff from the commonMapper to allow move of more mappers 2020-02-26 10:33:05 +01:00
Bjarke Berg
57aa93959a Merge pull request #7717 from umbraco/netcore/feature/migrate-more-property-editors 
Netcore: Move property editors to Infrastructure
 2020-02-26 07:49:36 +01:00
Bjarke Berg
35eb67dd10 Merge pull request #7712 from umbraco/netcore/feature/AB5168-migrate-macros 
Netcore: Move macros to Abstractions and Infrastructure
 2020-02-26 07:39:06 +01:00
Shannon
3553bb2aa3 Fixes CollectionBuilder's to ensure that each item in the collection is registered in DI with the same lifetime as the collection itself 2020-02-26 12:12:15 +11:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00
Sebastiaan Janssen
67168068f6 Merge branch 'v8/contrib' into pr/7449 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2020-02-25 22:12:37 +01:00
Tom Pipe
f7594b36db Ensure macromodel implements IContentModel, fixing #7504 2020-02-25 22:08:03 +01:00
Kenn Jacobsen
7d0c5508da Rollback breaks for non-string property values 2020-02-25 21:54:34 +01:00
Kenn Jacobsen
50ab5ce79b Open rollback in a medium sized panel 2020-02-25 21:53:41 +01:00
Kenn Jacobsen
044dc4eb98 Only show culture for content links if there is more than one culture 2020-02-25 21:51:31 +01:00
Kenn Jacobsen
ea29eb993c Align "Field is mandatory" label with the actual toggle 2020-02-25 21:50:30 +01:00
Kenn Jacobsen
e4edd47a48 Ensure that empty asset URLs in plugin manifests do not break the application 2020-02-25 21:48:58 +01:00
Kenn Jacobsen
5e155a871c Fix the create dialog on empty installs 2020-02-25 21:42:37 +01:00
Kenn Jacobsen
f4cd1c2f0c Fix JS errors for Nested Content in single mode 2020-02-25 21:28:40 +01:00
Bjarke Berg
5e1ac76e5f Bugfix: Sometimes the httpcontext is null here 2020-02-25 21:11:17 +01:00
elitsa
42db16b430 Moving the last few Property Editors to Infrastructure proj 2020-02-25 16:06:14 +01:00
Elitsa Marinovska
e0b9219528 Update MacroContent.cs to use is operator for comparison to null 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2020-02-25 14:27:58 +01:00
Warren Buckley
aa8e2b0859 Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a)
 2020-02-25 13:08:22 +00:00
Warren Buckley
4acddb288a Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
 2020-02-25 13:07:34 +00:00
elitsa
02fbf0f9e7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5168-migrate-macros 2020-02-25 13:44:48 +01:00
elitsa
0bdf03bda2 Removing the last references to MacroTypes and removing the references to pageElements coming from old legacy (PublishedContentHashtableConverter), which is deleted as well 2020-02-25 13:43:08 +01:00
elitsa
65e719cfa6 Migrating more Macro files to Abstractions or Infrastructure 2020-02-25 13:40:22 +01:00
elitsa
0a130d6bbd Removing MacroType enum as we only have one type - PartialView. Refactoring all its references and fixing tests 2020-02-25 13:38:36 +01:00
elitsa
c3d3e6e27d As GetAsText() had no other purpose when WebForm Controls were removed, it is now replaced with the populated Text property 2020-02-25 13:33:22 +01:00
elitsa
10563577d9 Eliminating WebForms Controls from MacroContent and migrating the file from Web to Abstractions/Core project 2020-02-25 13:29:03 +01:00
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
 2020-02-25 11:57:11 +01:00
Bjarke Berg
814e74b5c5 removed reference to non existing project 2020-02-25 10:58:53 +01:00
Bjarke Berg
d140723b22 Cleanup legacy stuff in Umbraco.Web.csproj 2020-02-25 10:56:33 +01:00
Warren Buckley
a65bf08f1a Merge pull request #7630 from kjac/v8/fix/nested-content-single-mode-add-more-than-one 
V8: Nested Content can't add multiple items
 2020-02-25 09:43:56 +00:00
Bjarke Berg
95a27b82a2 Fix for jobject casting issue 2020-02-25 10:40:39 +01:00
Bjarke Berg
06af62d87d Merge pull request #7691 from umbraco/netcore/feature/move-mappings-after-httpcontext 
NetCore: Move more files
 2020-02-25 08:26:39 +01:00
Bjarke Berg
6bb920b457 Added comments, and replaced a static helper with extension methods 2020-02-25 07:57:59 +01:00
Kenn Jacobsen
69b3bc6fc7 V8: Remove create option in listviews for deleted content (#7655) 2020-02-24 18:46:36 +00:00