 Stephan
|
7801cdf9ff
|
Merge remote-tracking branch 'origin/dev-v7.6' into temp-u4-9640
|
2017-03-21 13:14:18 +01:00 |
|
|
Shannon
|
c84e3dac38
|
Adds notes, return false if the file is not actually deleted, adds test assertions
|
2017-03-21 18:37:46 +11:00 |
|
|
Stephan
|
454aad2170
|
U4-9543 - fix shadow filesystem filter
|
2017-03-20 13:01:03 +01:00 |
|
|
Stephan
|
3121ea6111
|
Merge branch 'dev-v7.6' into temp-u4-9462
|
2017-03-15 13:48:27 +01:00 |
|
|
Stephan
|
54afd3d954
|
Fix failing test
|
2017-03-15 12:08:52 +01:00 |
|
|
Sebastiaan Janssen
|
1a0046df95
|
Merge pull request #1795 from umbraco/temp-U4-9498
U4-9498 LocalLinks as UDI
|
2017-03-14 15:54:03 +01:00 |
|
|
Shannon
|
0a3220df85
|
Fixes null check, adds another test case
|
2017-03-14 16:26:17 +11:00 |
|
|
Shannon
|
9a57f463ce
|
Updates LocalLinks to be UDI, this will support both INT and UDI as LocalLink but when a new LocalLink is picked, it will use the UDI so eventually the INT will be gone
|
2017-03-14 15:31:30 +11:00 |
|
|
Shannon
|
8f48da8bb0
|
Gets the related links editor working with the old property value converter too, udpates the install script so that works and updates tests to reference the correct one, adds GUID overloads to the UrlProvider
|
2017-03-13 16:58:41 +11:00 |
|
|
Shannon
|
7100a00ef1
|
fix merges
|
2017-03-10 12:22:44 +01:00 |
|
|
Shannon
|
df04100ff6
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
# src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
# src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI.Client/src/less/tree.less
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
|
2017-03-10 10:40:28 +01:00 |
|
|
Stephan
|
6439e2fdd0
|
Merge dev-v7.6 into temp-u4-9462
|
2017-03-09 15:29:26 +01:00 |
|
|
Stephan
|
d1111009e3
|
Fix SemVer lib version
|
2017-03-08 18:45:00 +01:00 |
|
|
Shannon Deminick
|
1722831bf5
|
Merge pull request #1640 from umbraco/temp-u4-7318
Value Converters for All Core Property Editors
|
2017-03-08 14:29:40 +01:00 |
|
|
Warren Buckley
|
736b3565d0
|
Merge pull request #1784 from umbraco/temp-deploy-257
deploy-257 Downgrade Core and Deploy to framework 4.5
|
2017-03-08 12:17:08 +00:00 |
|
|
Claus
|
ed782998ef
|
Merge pull request #1779 from umbraco/temp-U4-9521
U4-9521 MediaService.GetPagedChildren should only get children and not descendants
|
2017-03-08 13:13:23 +01:00 |
|
|
Claus
|
7fa8f04b11
|
deploy-257 Downgrade Core and Deploy to framework 4.5
|
2017-03-08 11:20:48 +01:00 |
|
|
Stephan
|
bf2232258e
|
U4-9588 - filesystems manager tlc
|
2017-03-08 11:02:30 +01:00 |
|
|
Emil Wangaa
|
6de76571d7
|
Adds a couple of tests for ContentService.GetPagedChildren
|
2017-03-03 14:56:41 +01:00 |
|
|
Emil Wangaa
|
56da13fa79
|
MediaService.GetPagedChildren now only gets children even if parent id is root node instead of also getting descendants
|
2017-03-03 13:45:21 +01:00 |
|
|
Stephan
|
79d4956b75
|
Merge branch 'dev-v7' into temp-U4-9587
|
2017-03-03 13:26:43 +01:00 |
|
|
Shannon
|
08d579ec87
|
Fixes a bunch of id assignments in PublicAccessRepository along with clearing out old entries that are flagged for removal, adds a lot more assertions for retrieving items and their rules.
|
2017-03-02 18:44:42 +01:00 |
|
|
Shannon
|
96c28c2611
|
U4-9587 RebuildXmlStructures doesn't clear out stale data so there is unpublished or trashed items remaining in the xml table, xml data integrity check is misleading due to the media lookup
|
2017-03-02 17:28:34 +01:00 |
|
|
Claus
|
54efe86020
|
fixes broken tests...
|
2017-03-02 16:00:11 +01:00 |
|
|
Stephan
|
3c75693e20
|
Add a few (ignored) tests used for debugging
|
2017-03-02 14:01:58 +01:00 |
|
|
Shannon
|
a9c5877e5b
|
Merge branch 'refs/heads/dev-v7.6' into temp-u4-7318
# Conflicts:
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-03-01 15:04:00 +01:00 |
|
|
Shannon
|
96a18ec8e9
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-U4-9536
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
|
2017-02-27 15:24:55 +01:00 |
|
|
Shannon
|
65c39a3117
|
Fixes issue with returning multiple versions and mapping their property values, adds more assertions
|
2017-02-27 15:19:59 +01:00 |
|
|
Claus
|
15150f9a16
|
Merge pull request #1763 from umbraco/temp-U4-9545
U4-9545 EntityRepository performs poorly for Media due to unnecessary outer joins
|
2017-02-27 12:00:06 +01:00 |
|
|
Shannon
|
28f0ab1001
|
Fixes U4-9456, ensures that property sets are mapped to a content version instead of an Id, adds more unit tests, ensures that if this warning ever occurs in a test that the test will fail.
|
2017-02-24 13:51:14 +11:00 |
|
|
Shannon
|
266f82b6c5
|
Fixes issue with returning all versions, adds more tests/assertions, updates content and media repository to double check that the versions match before returning from cache.
|
2017-02-24 13:23:27 +11:00 |
|
|
Shannon
|
813a8956d3
|
Gets EntityRepository to deal with corrupted newest/published flags, adds tests and lots of assertions for each method
|
2017-02-24 12:27:36 +11:00 |
|
|
Stephan
|
16f8f6036c
|
U4-9560 - fix db issue
|
2017-02-22 15:52:02 +01:00 |
|
|
Shannon
|
7cadbb6398
|
Backports some required EntityRepository changes, starts adding the custom collection to remove duplicate (throw err currently)
|
2017-02-22 21:09:25 +11:00 |
|
|
Shannon
|
f8d6c7e7d0
|
Fixes expression tree changes
|
2017-02-22 18:34:55 +11:00 |
|
|
Shannon
|
90ba9a1a3a
|
Adds new overload to IMediaService.GetPagedChildren to filter on media type ids which turns out to be much easier than filtering on media type aliases, however i did all of the work to make that happen including unit tests and then it turned out to not be required but we now have the code if necessary, i've left comments about it. I've backported some updates from 7.6 for the SqlIn stuff for the ExpressionVisitor which we still use in the media type id filtering. I updated the JS to query for the folders which all works now.
|
2017-02-22 17:22:22 +11:00 |
|
|
Shannon
|
6815731da1
|
adds failing test that i'll need to fix
|
2017-02-22 13:31:04 +11:00 |
|
|
Stephan
|
8d5f7af780
|
U4-9462 - cleanup file unit of work
|
2017-02-21 13:19:58 +01:00 |
|
|
Stephan
|
08c8b84a10
|
U4-9462 - cleanup units of work, code, fixmes
|
2017-02-21 13:19:58 +01:00 |
|
|
Emil Wangaa
|
552909fde2
|
Merge pull request #1753 from umbraco/temp-U4-9293
Fixes: U4-9293 Search the entire media section in Media Picker when inserting an image into content
|
2017-02-21 12:00:26 +01:00 |
|
|
Emil Wangaa
|
7adae4d345
|
Merge pull request #1755 from umbraco/temp-U4-9470
U4-9470 Mini list view: only show expand option for nodes with children
|
2017-02-21 09:00:52 +01:00 |
|
|
Shannon
|
febeb82d10
|
Fixes the EntityController.GetPagedDescendants to not return items in the recycle bin, added some tests.
|
2017-02-21 15:43:46 +11:00 |
|
|
Stephan
|
578ca7d41d
|
Merge branch dev-v7.6 into temp-U4-9509
|
2017-02-16 18:38:22 +01:00 |
|
|
Claus
|
cc885c1231
|
Merge pull request #1750 from umbraco/deploy-219
deploy-219 - files management
|
2017-02-16 09:52:59 +01:00 |
|
|
Shannon
|
af287c387e
|
Adds test to show that the content repo can deal with corrupted data, this fix actually simplifies a bunch of logic too and should consume slightly less memory, have added some TODOs in the code and need to then write more tests and code to deal with this in the EntityRepository.
|
2017-02-16 18:54:44 +11:00 |
|
|
Shannon
|
422dd1a627
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
|
2017-02-16 13:22:59 +11:00 |
|
|
Shannon
|
6ae06ad2e0
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9470
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
|
2017-02-15 17:41:12 +11:00 |
|
|
Shannon
|
8387c435d4
|
Gets mini list view working so that only nodes with children show the arrow, added GetPagedChildren to EntityController
|
2017-02-15 17:40:10 +11:00 |
|
|
Shannon
|
5807bbccc4
|
revert change to petapoco, we will calc the total manually for this due to an outer join/aggregate, adds GetDescendents + tests for EntityService
|
2017-02-15 16:38:43 +11:00 |
|
|
Shannon
|
1bfc041bbe
|
Adds Paged query to entity repo/service + tests, had to fix paged queries in petapoco to strip ending GROUP BY otherwise the COUNT is incorrect
|
2017-02-15 15:13:23 +11:00 |
|