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

24422 Commits

Author SHA1 Message Date
Shannon
e67bbdc25f Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-08 10:09:39 +11:00
Warren Buckley
d9ac1868e6 Merge pull request #4465 from umbraco/temp8-fix-for-non-root-start-node-for-media 
V8: Bugfix for loading paths Ids into TreeEntityPath
 2019-02-07 15:25:42 +00:00
Robert
a9b7c649ae Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-07 15:44:42 +01:00
Robert
1095948c27 Sets prop's prefixed with "$" to undefined. 2019-02-07 15:44:17 +01: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
Warren Buckley
2c0fc737a7 Merge pull request #4421 from umbraco/temp8-4405-reload-history-on-rollback 
#4405 - Load history on init if the active tab is info
 2019-02-07 13:29:52 +00:00
Claus
7c3b5d1086 Merge remote-tracking branch 'origin/temp8-update-deps' into temp8 2019-02-07 13:40:17 +01:00
Stephan
dbd6e0adbb Merge remote-tracking branch 'origin/temp8' into temp8 2019-02-07 13:10:26 +01:00
Stephan
c607c7e259 Merge branch 'temp8-contentAndType' into temp8 2019-02-07 13:09:56 +01:00
Stephan
29334ed2d5 Fix ModelsBuilder changes 2019-02-07 12:57:10 +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
4a8e5935c2 Merge branch 'temp8' into temp8-fix-default-userid-param 2019-02-07 10:01:15 +01:00
Stephan
8ed2dcb8bf Don't capture content caches! 2019-02-07 09:59:16 +01:00
Bjarke Berg
fc6548d87b Fix issue where Id was not set when loading all entity paths 2019-02-07 09:56:14 +01:00
Warren Buckley
5944ea20cc Merge remote-tracking branch 'origin/temp8' into temp8-fix-default-userid-param 
# Conflicts:
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Core/Services/Implement/ContentService.cs
 2019-02-07 08:24:03 +00:00
Stephan
8329097974 Review PR, adjustments 2019-02-07 08:53:49 +01:00
Stephan
d15f20f560 Merge branch 'temp8' into temp8-contentAndType 2019-02-07 08:40:46 +01:00
Bjarke Berg
87c85341fb Merge remote-tracking branch 'origin/temp8' into temp8 2019-02-07 08:20:02 +01:00
Bjarke Berg
f6da7e4444 JS error, handle user dialog in the same way as help dialog. Don't close on change of section. Before was a js error with missing method 2019-02-07 08:19:44 +01:00
Stephan
d11fd67a09 Bugfix PublishedContentTypeFactory 2019-02-07 08:04:53 +01:00
Shannon
977250dcdd tests as part of build 2019-02-07 17:15:49 +11:00
Shannon
1703c918d9 test pass now 2019-02-07 17:06:50 +11:00
Shannon
d76f7db700 fixes the runTest build so that it properly builds the babel js and fixes one of the tests 2019-02-07 16:59:25 +11:00
Shannon
261ddfbcd6 Gets unit tests running again and added a task runTests 2019-02-07 16:22:29 +11:00
Shannon
86b31c2782 fixes test.js to point to the correct karma config 2019-02-07 15:41:20 +11:00
Shannon Deminick
cb309e7f9e Merge pull request #4432 from kjac/v8-fix-rename-umbraco-domains-table 
V8: Rename umbracoDomains table to umbracoDomain (singular)
 2019-02-07 15:28:37 +11:00
Shannon
ed5023e431 Adds some null checks to Examine's value set builders in case some of the data is strangely incorrect 2019-02-07 15:13:45 +11:00
Shannon
fcec180dc4 Ship with correct skipIIsCustomeerrors setting 2019-02-07 14:54:22 +11: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
03eaf3aa3d So yup ISimpleContentType needs the IUmbracoEntity, so we'll explicitly implement essentially hiding the implementation from the API unless it's explicitly cast 2019-02-07 13:29:01 +11:00
Shannon
3b12e0b72a Updates ContentBase to track the original PropertyType's which means we don't ever need to look them up again, adds notes about this too since it seems it is probably unnecessary to begin with. 2019-02-07 13:28:23 +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
9df0f384af Removes the need for another .Current and a lookup, simplifies the whole GetUrl for media 2019-02-07 12:02:47 +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
78849bb7ff removes unused methods and internalizes methods we can't expose yet 2019-02-07 11:42:16 +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
Shannon
4655acfdeb Fixes ambiguous call 2019-02-07 11:26:09 +11:00
Stephan
37c130194f Merge branch 'temp8' into temp8-3640 2019-02-06 16:31:04 +01:00
Stephan
162e691828 Bugfix PublishedContentTypeFactory 2019-02-06 16:26:32 +01:00
Warren Buckley
51ad0f75d1 Fix up unit test but also uses constant for -1 as the parent id aka System Root Node Id 2019-02-06 15:16:11 +00:00
Warren Buckley
de5b32749e Merge branch 'temp8' into temp8-fix-default-userid-param 2019-02-06 14:56:52 +00: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
Warren Buckley
8b4315cd46 🦸🦸 Is it a bird, is it a plane, no it's SuperUser 🦸🦸 2019-02-06 14:01:14 +00:00
Stephan
48e11ab439 Fix 8.0 migration 2019-02-06 14:53:49 +01:00