yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,013 Commits 4 Branches 7 Tags
5f13dde1cd32e602327dfbe9435c7a44f8d2e1e4
Commit Graph

33013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
5f13dde1cd Moved functionality to write to the connection strings into the configuration area 2020-03-12 16:56:39 +01:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Bjarke Berg
cb0994a929 Cleaned up config for Security settings 2020-03-12 14:36:25 +01:00
Bjarke Berg
e27a05c3e8 Cleaned up config for RequestHandler settings 2020-03-12 12:46:08 +01:00
Bjarke Berg
e2dfc68718 Cleaned up config for WebRouting settings 2020-03-12 09:52:34 +01:00
Bjarke Berg
e4ff481053 Cleaned up config for Keep Alive settings 2020-03-12 08:28:31 +01:00
Bjarke Berg
f446e52d8f Cleaned up condig for Logging and Tours 2020-03-12 08:24:02 +01:00
Bjarke Berg
e07c9abd58 Updated js code in UI project 2020-03-11 12:54:33 +01:00
Bjarke Berg
da7552204d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web/Models/RegisterModel.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2020-03-11 07:44:17 +01:00
Bjarke Berg
39026258ec Merge pull request #7752 from umbraco/v8/feature/AB5435-make-umbracohelper-props-obsolete 
Obsoleting UmbracoHelper properties
 2020-03-11 07:40:46 +01:00
Sebastiaan Janssen
a695a6ad76 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	apidocs/umbracotemplate/styles/main.css
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
#	src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
#	src/Umbraco.Web/Cache/MediaCacheRefresher.cs
#	src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Profiling/WebProfiler.cs
#	src/Umbraco.Web/Profiling/WebProfilerProvider.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
#	src/Umbraco.Web/Search/ExamineEvents.cs
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
 2020-03-10 22:03:28 +01:00
Sebastiaan Janssen
7dc6ddf3a8 Merge branch 'v7/dev' into v7/7.15 2020-03-10 21:54:01 +01:00
Steve Megson
d11a1946f5 V7: Don't call ClearPreviewXmlContent from ClearDocumentXmlCache (#6631) 2020-03-10 21:52:53 +01:00
Sebastiaan Janssen
959a6df634 Merge branch 'v7/dev' into v7/7.15 2020-03-10 21:51:00 +01:00
Marc Goodson
7ca6781d09 v7: Fix false matches for AltTemplate convention Urls (#7150) 2020-03-10 21:49:59 +01:00
Sebastiaan Janssen
cfdc4ce807 Merge branch 'v7/dev' into v7/7.15 
# Conflicts:
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2020-03-10 21:38:33 +01:00
Bjarke Berg
cf060e9789 Merge remote-tracking branch 'origin/v8/feature/AB5435-make-umbracohelper-props-obsolete' into v8/feature/AB5435-make-umbracohelper-props-obsolete 2020-03-10 10:37:13 +01:00
Bjarke Berg
9be30f3e91 Added info to obsolete message 2020-03-10 10:36:34 +01:00
Bjarke Berg
9d6762fb6a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
#	src/Umbraco.Tests/Models/PropertyTypeTests.cs
 2020-03-10 08:25:43 +01:00
Shannon
d3ebdb6198 fixes test 2020-03-09 22:25:58 +11:00
Bjarke Berg
be753754a4 Merge pull request #7740 from AndyButland/netcore/77007-replace-no-nodes 
NetCore: Replaced nonodes.aspx with MVC controller and view, with configurable view location
 2020-03-09 12:07:06 +01:00
Jason Elkin
bad1913e0e update Umbraco.ModelsBuilder.Embedded attributes to match assembly name 2020-03-09 10:19:26 +01:00
Anders Brohäll
46686ffd90 Corrected document outline 2020-03-09 08:51:00 +01:00
Andy Butland
8e3967c596 Merge branch 'netcore/dev' into netcore/77007-replace-no-nodes 
# Conflicts:
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-Web.cs
 2020-03-06 07:28:13 +01:00
Shannon Deminick
a0aad045fb Merge pull request #7652 from benjaminhowarth1/patch-1 
Update PropertyType.cs
 2020-03-05 17:51:03 +11:00
Shannon Deminick
fbe3925b54 Merge pull request #7705 from umbraco/netcore/feature/executable-backoffice 
NetCore: Executable in .NET Core
 2020-03-05 15:20:47 +11:00
Shannon
4a01cfe754 changes to class libraries 2020-03-05 15:20:08 +11:00
Kenn Jacobsen
4ad73dc183 Fix completely broken(tm) media pickers 2020-03-04 16:27:28 +01:00
Bjarke Berg
6241bee1b2 Introduce methods on current, that can be necessary if not using the obsolete properties. 2020-03-04 13:49:13 +01:00
Bjarke Berg
8bc077fa18 Introduce methods on current, that can be necessary if not using the obsolete properties. 2020-03-04 13:37:05 +01:00
Bjarke Berg
290e5b58a0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntime.cs
 2020-03-04 10:10:03 +01:00
Warren Buckley
7bfeae7329 Merge pull request #7745 from kjac/v8/fix/media-picker-upload-rte 
V8: Fix broken "upload and insert media" in RTE
 2020-03-04 10:04:00 +01:00
Bjarke Berg
d53dd71204 Merge pull request #7750 from umbraco/netcore/feature/untangle-membership 
Netcore: Untangle membership helper and trim Web even more
 2020-03-04 08:20:25 +01:00
Bjarke Berg
152fcf7d1b Fixed based on review findings 2020-03-04 07:50:37 +01:00
Poornima Nayar
fd47c3300c Semantic fixes grid pre values (#7748) 
* Create Content Blueprints - Semantic fixes

* Grid Prevalues Screen -Semantic changes

* reverted a change I accidentally made
 2020-03-03 23:02:14 +01:00
Poornima Nayar
ffb5265f35 Create Content Blueprints - Semantic fixes (#7747) 2020-03-03 22:40:45 +01:00
Niels Lyngsø
8db6291c5f Adding more fine colors for UI (#7535) 
* adding colors: pinkExtraLight + gray-12 + @gray-13

* convert to hex color code

* adjusted color slightly

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
 2020-03-03 21:46:00 +01:00
Bjarke Berg
fec9c44433 Merge pull request #7751 from cyberdot/temp-7667 
NetCore: Abstract ConfigurationManager references
 2020-03-03 14:39:21 +01:00
Bjarke Berg
2d175ffb86 - Moved ModelsBuilder constant into Core under constants 
- Move the registration of configs into the factory
- Moved extension methods of ModelsMode into Umbraco.Core
- Removed references to Umbraco.Configuration from Umbraco.Infrastructure and Umbraco.ModelsBuilder.Embedded
 2020-03-03 14:15:30 +01:00
Bjarke Berg
341ac1c46b Removed the abstractions project file 2020-03-03 13:46:02 +01:00
Bjarke Berg
bce196353e Fix view 2020-03-03 13:43:53 +01:00
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
Bjarke Berg
a4003ad799 Clean up 2020-03-03 12:09:15 +01:00
elitsa
4cbaec68f0 Obsoleting UmbracoHelper props which are going to be removed in the future 2020-03-03 12:07:56 +01:00
Bjarke Berg
53769b42b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/untangle-membership 2020-03-03 12:01:54 +01: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
e9f7034365 Moved compoenents and composers 2020-03-03 07:29:51 +01:00
Kenn Jacobsen
55bfa57525 Fix broken "upload and insert media" in RTE 2020-03-02 21:57:59 +01:00