yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,953 Commits 4 Branches 7 Tags
3b60ffeb28aafcea53641776aaa2e6cdb2e9bb8f
Commit Graph

1477 Commits

Author SHA1 Message Date
Shannon
3b60ffeb28 fixes test 2019-02-06 16:27:19 +11:00
Shannon
a0cda4075d Fixes issue with rendering macro content when the page doesn't exist 2019-02-04 13:42:07 +11:00
Shannon
c5819ca702 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
 2019-02-04 12:42:07 +11:00
Stephan
132c3c0c8e Cleanup PR, document and rename things 2019-02-01 17:19:12 +01:00
Bjarke Berg
9acf913872 #3545 - Added IContentTypeServiceBaseFactory to create a IContentTypeServiceBase (E.g. IContentTypeService or IMediaTypeService) based on the type of the IContentBase 2019-02-01 14:07:31 +01:00
Bjarke Berg
bfc2d53fa4 Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
 2019-02-01 12:52:20 +01:00
Shannon
0c4712de56 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 
# Conflicts:
#	src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2019-02-01 11:33:13 +11:00
Stephan
a6f9598a23 Introduce IPublishedRouter 2019-01-31 11:07:45 +01:00
Shannon
7b55d2f1b2 New IMacroRenderer and ITemplateRenderer and hides underlying logic for these in internal classes. Massively cleans up the macro rendering logic (almost makes sense now), removes unused macro code, injects UmbracoHelper wherever it's needed (not creating manually), fixes UmbracoHelper to have it's services injected, no more empty services, allows setting the AssignedContentItem on the UmbracoHelper and ensures it's lifespan is Transient, updates all corresponding ctors. Fixes macro rendering, ensures the correct culture variation is assigned, and that we can render macros for any given IPublishedContent, not just the one assigned in the request. 2019-01-31 15:09:31 +11:00
Shannon
8c813fa40d Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter 2019-01-31 11:10:01 +11:00
Callum Whyte
0cdccc1a9b V8: Removing legacy content tree menu items (#4278) 2019-01-30 12:01:57 +01:00
Shannon
7bb0eb109a moves class to separate file 2019-01-30 20:31:44 +11:00
Shannon
c213408b92 Changes OperatorFactory to internal 2019-01-30 20:24:42 +11:00
Shannon
273441a2fb Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2019-01-30 20:09:07 +11:00
Shannon
eef86689c8 Removes booting.aspx and creates embedded html pages for booting and failed (if those are ever seen ), renames some classes and namespaces, removes old cdf bundle classes 2019-01-29 23:05:59 +11:00
Shannon
22d879ab35 Merge branch 'temp8' into temp8-fixme-no-caching-of-url-and-inject-umbraco-context-accessor 
# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Web/Models/PublishedContentBase.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentNode.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2019-01-29 17:12:35 +11:00
Warren Buckley
633d9c6fb4 Merge pull request #4218 from umbraco/temp8-dashboards-collection 
V8 - Remove dashboards.config - use CollectionBuilder
 2019-01-28 14:47:44 +00:00
Stephan
85d4b4a61d Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-28 14:07:19 +01:00
Warren Buckley
117b836cd7 Merge pull request #4259 from umbraco/temp8-remove-related-links-with-migration 
Remove related links and migrate existing data to Multi URL Picker
 2019-01-28 09:42:56 +00:00
Warren Buckley
9f79f1833f Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection 
# Conflicts:
#	src/Umbraco.Web/Services/DashboardService.cs
 2019-01-28 08:33:52 +00:00
Bjarke Berg
3c24aac81d Merge remote-tracking branch 'origin/temp8' into temp8-ispublished-again 2019-01-28 08:46:17 +01:00
Kenn Jacobsen
a185d56ae5 Ensure that element types can't be assigned as allowed children to other content types 2019-01-27 11:46:55 +01:00
Chris Houston
193e24afd2 Fixing all the TODO, FIXME & HACK comments so they all follow the same layout. 2019-01-27 11:16:00 +01:00
Kenn Jacobsen
b709ed4aa3 Don't attempt to resolve URLs for element types 2019-01-26 18:27:53 +01:00
Chris Houston
0b6ba5aa52 Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148) 2019-01-26 16:52:19 +01:00
Sebastiaan Janssen
5a896e7417 Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker) 
(cherry picked from commit fedf0c78de)
 2019-01-25 16:06:49 +01:00
Stephan
38ec97bbe3 Need to refactor IsPublished 2019-01-24 15:22:20 +01:00
Bjarke Berg
5f1ddad835 Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection 2019-01-24 13:27:15 +01:00
Sebastiaan Janssen
9e0d2e5873 Revert "Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker)" 
This reverts commit fedf0c78de.
 2019-01-24 11:37:28 +01:00
Warren Buckley
26f43cda97 Merge remote-tracking branch 'origin/temp8' into temp8-dashboards-collection 2019-01-23 14:38:26 +00:00
Warren Buckley
69a3c85bbc Refactor of dashboards 
* Remove dashboards from Configs().Dashboards
* Remove dashboard.config XML file & associated code reading from XML
* Load Dashboards from TypeLoader into a CollectionBuilder
* Load merge/concat C# Dashboard Types with package.manifest
* Add buildercolletion to an extension method on Composition
 2019-01-23 14:37:33 +00:00
Bjarke Berg
f8b52a57c3 Injecting Umbraco Context Accessor and not saving the url on the class 2019-01-23 14:16:42 +01:00
Bjarke Berg
f10b35780c - Removed PostFilterParams 
- Handling of PostFilter using Expression trees
 2019-01-23 10:22:29 +01:00
Sebastiaan Janssen
fedf0c78de Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker) 2019-01-23 09:01:53 +01:00
Bjarke Berg
e871392405 Added IsPublished(culture) to IPublishedContent 2019-01-23 07:54:45 +01:00
Chris Houston
78319bae9e Temp8 fix typos 2 (#4130) 2019-01-23 00:03:39 +01:00
Rasmus John Pedersen
e1175b814e Add Multi Url Picker 2019-01-22 16:00:15 +01:00
Stephan
9e811ddd50 Fix fallback 2019-01-21 17:38:06 +01:00
Stephan
358a36dd87 Merge branch temp8 into temp8-3668-query-builder-snippits 2019-01-21 16:07:20 +01:00
Stephan
ee0c868687 Misc fixes for PR and Fallback 2019-01-21 16:02:16 +01:00
Stephan
9522ee826f Deal with fixme in Umbraco.Web 2019-01-21 16:01:37 +01:00
Niels Lyngsø
82d6af2013 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 
# Conflicts:
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
 2019-01-21 11:13:08 +01:00
Stephan
d4664fbae6 Merge branch 'temp8' into temp8-3668-query-builder-snippits 2019-01-21 10:50:40 +01:00
Bjarke Berg
566895d3cd Merge branch 'temp8' into temp8-3417-macro-crud 2019-01-21 09:14:40 +01:00
Stephan
876056f0bb Merge branch temp8 into temp8-appCaches 2019-01-18 14:54:08 +01:00
Bjarke Berg
6fce8810fc Merge remote-tracking branch 'origin/temp8' into temp8-4037 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs
 2019-01-18 13:28:57 +01:00
Dave Woestenborghs
7fd7d7a582 #3417 also send id of parameter with api response 2019-01-18 12:37:04 +01:00
Stephan
6f9a63d035 Merge branch 'temp8' into temp8-packaging-view-3996 2019-01-18 11:04:28 +01:00
Stephan
437385fd61 Bit of cleanup 2019-01-18 10:53:51 +01:00
Dave Woestenborghs
a83ac4a24d #3417 retreive data for edit screen 2019-01-18 09:31:38 +01:00