yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,062 Commits 4 Branches 7 Tags
40097c441a200b9edadf42e2c87fca19af6189f1
Commit Graph

9141 Commits

Author SHA1 Message Date
Shannon
40097c441a Ensure the same logic for property editors is executed for parameter editors to get the final configuration object 2019-02-08 16:07:03 +11:00
Shannon
63b3c06b3a Ensures the correct DefaultConfiguration values are specified for any editor that is actively overriding ToValueEditor and setting these values there 2019-02-08 16:00:59 +11:00
Warren Buckley
7bd0a8edc2 Merge pull request #4429 from umbraco/temp8-4398 
#4398 - Added validation to the grid editor, such that columns must b…
 2019-02-07 14:38:59 +00:00
Warren Buckley
4a2b6116f2 Merge pull request #4418 from kjac/v8-feature-allow-all-at-root 
V8: Allow all content types at root if none are explicitly allowed
 2019-02-07 13:47:33 +00:00
Claus
7c3b5d1086 Merge remote-tracking branch 'origin/temp8-update-deps' into temp8 2019-02-07 13:40:17 +01:00
Stephan
c607c7e259 Merge branch 'temp8-contentAndType' into temp8 2019-02-07 13:09:56 +01:00
Stephan
990e82d183 Upgrade ModelsBuilder, cleanup dashboard 2019-02-07 12:37:52 +01:00
Stephan
2092156db3 Cleanup 2019-02-07 12:27:19 +01:00
Bjarke Berg
f7ee8c0899 Merge pull request #4411 from kjac/v8-fix-redirect-tracking-composer 
V8: Fix the redirect tracking composer
 2019-02-07 11:09:22 +01:00
Stephan
a9adc4eee5 Merge branch 'temp8' into temp8-contentAndType 2019-02-07 10:10:55 +01:00
Stephan
8ed2dcb8bf Don't capture content caches! 2019-02-07 09:59:16 +01:00
Shannon
a9045c254e Removes the need to do any lookup for GetNonGroupedProperties, we already know if they belong to a non-group based on the ID 2019-02-07 14:01:00 +11:00
Shannon
123daed990 Removes the need for .Current in some places, adds TODO notes to test a theory, removes IUmbracoEntity from ISimpleContentType since all tests seem to pass without it and because the SimpleContentTypeMapper doesn't actually use ISimpleContentType i don't think it's needed, we'll see what the tests say. 2019-02-07 12:43:11 +11:00
Shannon
562855a687 removes fixme, adds comments and null checks 2019-02-07 11:53:43 +11:00
Shannon
030b626350 Removes the need for a .Current, removes an unused method 2019-02-07 11:49:30 +11:00
Shannon
c04da30547 Merge branch 'temp8' into temp8-contentAndType 
# Conflicts:
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
 2019-02-07 11:41:06 +11:00
Stephan
19d8796c40 Merge branch 'temp8' into temp8-3640 2019-02-06 15:07:49 +01:00
Stephan
0be5ff64bc Be friendly 2019-02-06 15:05:56 +01:00
Shannon
817ce71e83 updates threading libs 2019-02-06 21:44:12 +11:00
Shannon
4c2ea81c53 updates Light Inject 2019-02-06 21:41:46 +11:00
Shannon
e556e39cd1 latest HtmlAgility 2019-02-06 21:31:50 +11:00
Shannon
0947a1a109 Automapper upgraded 2019-02-06 21:14:50 +11:00
Shannon
b4bf1cb01c puts the profiler back to the right 2019-02-06 19:58:56 +11:00
Shannon
4b9a13c3a1 Updates mini profiler 2019-02-06 19:04:52 +11:00
Shannon
5bf0b143d9 another owin update and nuspec fix 2019-02-06 17:08:47 +11:00
Shannon
33bc979cfc Fixes binding of FormDataCollection for GET requests which fixes the compatibility with the latest WebApi 5.2.7 version (cherry picked from https://github.com/umbraco/Umbraco-CMS/pull/3851), fixes a binding redirect 2019-02-06 17:03:23 +11:00
Shannon
50d1b9ddfd Latest MVC, WebApi, Owin and Signalr 2019-02-06 16:53:15 +11:00
Shannon
1bbb9c2b6e updates to latest newtonsoft 2019-02-06 16:43:04 +11:00
Shannon
3b60ffeb28 fixes test 2019-02-06 16:27:19 +11:00
Bjarke Berg
6f9be482be #4398 - Added validation to the grid editor, such that columns must be at least as large as the layouts. 2019-02-05 14:52:02 +01:00
Stephan
29f2f34f9b Refactor IContent vs IContentType 2019-02-05 14:06:48 +01:00
Robert
9e8e62dc71 Merge pull request #4346 from kjac/v8-fix-nested-content-elements-with-culture-variance 
V8: Make Nested Content resilient towards culture variance in elements
 2019-02-05 12:57:51 +01:00
Stephan
d2692a2ff5 NuCache respects global local temp storage 2019-02-05 12:20:13 +01:00
Stephan
d3b0913047 Fix UmbracoHelper preventing upgrades 2019-02-05 12:19:57 +01:00
Kenn Jacobsen
9579b42330 Allow copying/moving any content type to root if none are marked as "AllowAsRoot" 2019-02-05 07:54:59 +01:00
Kenn Jacobsen
c9936058b5 Allow creating any content type at root if none are marked as "AllowAsRoot" 2019-02-05 07:54:42 +01:00
Shannon
b65dac946f Merge branch 'temp8-IContentService-SaveAndPublish-4324' into temp8-3640 
# Conflicts:
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/IContent.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
 2019-02-05 16:14:46 +11:00
Shannon
9f612465cf Cleans up IContent/IContentBase, no more internal methods or setters, moves manipulation used by the DocumentRepository to ext methods 2019-02-05 14:13:03 +11:00
Kenn Jacobsen
be881ba9ca Fix the redirect tracking composer 2019-02-04 20:09:17 +01:00
Stephan
1e8b8feee8 Make ContainerControllerFactory exceptions more explicit 2019-02-04 17:59:12 +01:00
Shannon
c20e597115 Merge remote-tracking branch 'origin/temp8' into temp8-IContentService-SaveAndPublish-4324 2019-02-05 01:13:43 +11:00
Stephan
3c65770008 Upgrade ModelsBuilder, cleanup 2019-02-04 14:08:35 +01:00
Stephan
e636f12459 Fix leak in BackgroundTaskRunner 2019-02-04 13:39:32 +01:00
Shannon
b51d3036e3 Adds overload of SaveAndPublish to accept multiple cultures, renames SavePublishing to CommitDocumentChanges, removes IContent.ChangeContentType 2019-02-04 16:55:35 +11:00
Shannon
9fba7345aa When rendering macro contents, be sure to use the preview published content since the item 2019-02-04 13:48:53 +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
Shannon
9be6acf449 Oops forgot to remove the IconClosed and IconOpen TreeAttribute props 2019-02-04 12:09:04 +11:00
Stephan
df61a76868 Cleanup PR 2019-02-01 17:52:29 +01:00
Stephan
3a0f80fc7e Merge branch 'temp8' into temp8-oembed-collection 2019-02-01 17:44:53 +01:00