Shannon
|
1c7b374c42
|
Fixes new property value converters to shadow their old ones correctly
|
2017-03-10 12:27:29 +01: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
|
b893df035b
|
Files were committed by mistake
|
2017-03-10 08:48:26 +01:00 |
|
Sebastiaan Janssen
|
67c6146f96
|
Merge pull request #1787 from umbraco/temp-u4-9595
U4-9595 - improve log error msg on thread aborts on timeouts
|
2017-03-09 15:59:47 +01:00 |
|
Stephan
|
b8c0d4c4ea
|
U4-9595 - improve log error msg on thread aborts on timeouts
|
2017-03-09 11:35:06 +01:00 |
|
Stephan
|
6992b0319a
|
Version 7.6-alpha074
|
2017-03-08 18:59:27 +01:00 |
|
Stephan
|
d1111009e3
|
Fix SemVer lib version
|
2017-03-08 18:45:00 +01:00 |
|
Sebastiaan Janssen
|
6c624ca08a
|
Merge pull request #1785 from CreunaAB/fix/add-missing-sv-translation
Adds missing swedish translation for document type without template
|
2017-03-08 15:21:55 +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 |
|
Shannon
|
5291558b23
|
Further refactoring, using attributes, moving and removing some classes, using DI where necessary.
|
2017-03-08 14:27:39 +01:00 |
|
Warren Buckley
|
a3f6fb78f5
|
Bump version to alpha-73 after downgrade to .NET 4.5
|
2017-03-08 12:22:47 +00: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
|
31d980b0c5
|
Merge pull request #1782 from umbraco/temp-u4-9605
U4-9605 - debug switch for uncompleted scopes
|
2017-03-08 13:07:03 +01:00 |
|
Claus
|
9f6e4d4fd5
|
updating nuspec.
|
2017-03-08 12:04:48 +01:00 |
|
Claus
|
d90658d814
|
Merge pull request #1783 from umbraco/temp-u4-9588
u4-9588 - filesystems
|
2017-03-08 11:58:47 +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 |
|
nengberg
|
8a133938e6
|
Adds missing swedish translation for document type without template
|
2017-03-08 09:57:32 +01:00 |
|
hartvig
|
c1b3f1977d
|
Merge pull request #1768 from danieland/dev-v7
U4-9571: Legacy icons look weird
|
2017-03-07 18:58:13 +01:00 |
|
hartvig
|
f086156d48
|
Merge pull request #1781 from majken92/dev-v7
Updating sv.xml with correct translation
|
2017-03-07 18:53:43 +01:00 |
|
hartvig
|
7080013dd6
|
Merge pull request #1777 from jamescoxhead/U4-9373
U4-9373 Fix for duplicate dashboards after upgrading
|
2017-03-07 18:45:50 +01:00 |
|
Stephan
|
5bbb44479f
|
U4-9588 - expand filesystems manager
|
2017-03-07 17:57:45 +01:00 |
|
Warren Buckley
|
5218d31f23
|
Bumps version to alpha-072
|
2017-03-07 15:43:29 +00:00 |
|
Stephan
|
9e55f5835c
|
U4-9605 - debug switch for uncompleted scopes
|
2017-03-07 12:42:44 +01:00 |
|
Michael Razmgah
|
b080825bb2
|
Updating sv.xml with correct translation
|
2017-03-06 21:31:42 +01:00 |
|
Stephan
|
8bb696bf9a
|
Merge pull request #1776 from umbraco/temp-U4-9587
U4-9587 RebuildXmlStructures doesn't clear out stale data so there is…
|
2017-03-06 14:51:50 +01:00 |
|
Shannon
|
55e8451513
|
changes to in groups of 2000
|
2017-03-06 14:44:41 +01:00 |
|
Shannon
|
7e4e2a1d5d
|
Fixes query when rebuilding xml structures for a content type
|
2017-03-06 14:42:02 +01:00 |
|
Claus
|
1101fc199f
|
Merge pull request #1585 from umbraco/temp-U4-9145
U4-9145 Updating TinyMCE to latest (4.4.3)
|
2017-03-06 12:14:18 +01:00 |
|
Emil Wangaa
|
6de76571d7
|
Adds a couple of tests for ContentService.GetPagedChildren
|
2017-03-03 14:56:41 +01:00 |
|
Emil Wangaa
|
0f535f233e
|
ContentService.GetPagedChildren should also only get children
|
2017-03-03 14:15:04 +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 |
|
Mads Rasmussen
|
05fa58694e
|
Merge pull request #1773 from umbraco/temp-ui-colors
fixes: U4-9583 Update UI colours and typography
|
2017-03-03 09:50:28 +01:00 |
|
Mads Rasmussen
|
ecc8575454
|
colour tweaks
|
2017-03-03 09:48:50 +01:00 |
|
James Coxhead
|
9acfd8f5d2
|
Updated dashboard config transform
Fix for dupicate dashboards after upgrading
|
2017-03-02 21:02:25 +00:00 |
|
Shannon
|
0b530ce181
|
Fixes rebuilding xml structures when a content type is specified, we need to filter on that when looking for orphaned items.
|
2017-03-02 19:17:39 +01:00 |
|
Shannon
|
402835d72d
|
Merge branch 'Colletz-U4-9573' into dev-v7
|
2017-03-02 18:45:06 +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
|
8b92755487
|
Merge branch 'U4-9573' of https://github.com/Colletz/Umbraco-CMS into Colletz-U4-9573
|
2017-03-02 17:55:16 +01:00 |
|
Shannon
|
01b48107f3
|
ensures that the content type is not used in the query when it is null.
|
2017-03-02 17:45:21 +01:00 |
|
Shannon
|
a546803970
|
Need to also update the health check check not just the old endpoint for non trashed media.
|
2017-03-02 17:40:39 +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 |
|
Shannon
|
65a22417f7
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-03-02 16:54:37 +01:00 |
|
Shannon
|
6c271e7af9
|
Fixes issue with U4-9456 when we use the withCache flag we do not add that to the defs collection so an error would occur if one was resolved from cache.
|
2017-03-02 16:54:25 +01:00 |
|
Mads Rasmussen
|
df93dfe63c
|
Merge pull request #1766 from umbraco/temp-U4-9538
U4-9538 - Add Keyboard shortcut (overview & template editor)
|
2017-03-02 16:12:56 +01:00 |
|
Mads Rasmussen
|
711981adab
|
remove comment
|
2017-03-02 16:10:41 +01:00 |
|
Mads Rasmussen
|
199c5a9606
|
add keyboard shortcuts to partial view editor
|
2017-03-02 16:05:31 +01:00 |
|