7debe17c58
Merge remote-tracking branch 'origin/7.3.8' into dev-v7
...
Conflicts:
src/Umbraco.Web.UI/packages.config
2016-02-17 11:56:24 +01:00
3d6fd2d785
Updates to SQL CE 4.0.0.1
2016-02-17 11:44:33 +01:00
b6ef4bf6b5
Merge branch '7.3.8' into dev-v7
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2016-02-16 13:29:59 +01:00
82297a6ff1
U4-7929 Label datatype strips leading zeros
2016-02-16 13:23:37 +01:00
17ff952b52
Fixes the URL creating for media in the back office to use an IMedia instead of published media (since it's not published yet at the time)
2016-02-11 15:54:00 +01:00
2721c5cb12
adds dynamic caseinsensitive support for the image cropper model
2016-02-10 14:54:00 +01:00
0829bae5b2
Fixes TextStringValueConverter to include the text box and multi-textbox (since it's like that in the Core one that this overrides), adds new converter for Image cropper including ToString converter & custom type converter to convert from the strongly typed object to JObject, adds test to support this, adds equatable methods for the strongly typed model so it can be easily compared. Ensures that the webboot manager does not include the core value converter for image cropper.
2016-02-10 14:53:56 +01:00
9978b0d8ea
Merge branch 'dev-v7' into temp-U4-3447
2016-02-04 18:30:58 +01:00
e423864781
Merge remote-tracking branch 'origin/master-v7' into dev-v7
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
src/Umbraco.Web.UI.Client/src/less/hacks.less
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/WebBootManager.cs
2016-02-03 12:30:11 +01:00
08e9579481
U4-7863 Remove Nuget requirement: Microsoft.Net.Http - this is not used, nor is it required (it also installs a bunch of other packages we don't need)
2016-02-03 10:14:53 +01:00
1db635f24c
Updates DeepCloneableList to support behaviors, for the FullDataSetCachePolicy we only want to clone when writing to cache, not when reading, the cloning will then be done on individual items after filtering by the FullDataSetRepositoryCachePolicy
2016-02-02 01:32:36 +01:00
6e27b3d6d4
Fixes up the FullDataSetRepositoryCachePolicy to handle individual items, updates and removes correctly, splits up it's logic so it's not overriding the DefaultRepositoryCachePolicy since that is just different. Adds tests.
2016-02-02 00:47:18 +01:00
8916c68a0c
reverts profiler changes, we'll inlcude in 7.4
2016-01-28 18:35:29 +01:00
72900ef3b3
U4-7813 Enable MiniProfiler to profiler during startup
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
2016-01-26 17:56:25 +01:00
ba2fd96e88
U4-7695 Media items are not updated when a new crop is added to Image Cropper
2016-01-26 15:54:17 +01:00
4dc4c36581
U4-7811 Content type repositories should use FullDataSetRepositoryCachePolicyFactory for performance
...
Conflicts:
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
2016-01-22 17:08:21 +01:00
1f29d85f83
U4-7813 Enable MiniProfiler to profiler during startup
2016-01-22 11:46:10 +01:00
07d50464cc
U4-7811 Content type repositories should use FullDataSetRepositoryCachePolicyFactory for performance
2016-01-21 19:33:47 +01:00
54669ee2bc
Ensures you cannot move a child doc type, changes the result of GetAvailableCompositions to be a model instead of a tuple, the result also includes the current ancestor list which we can use to disable items in the list, makes these models/methods internal since they'll most likely be changing,
2016-01-13 16:25:35 +01:00
2a3619e219
Fix merge problem that broke the build
2016-01-12 12:06:15 +01:00
5a62713de4
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
...
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
2016-01-12 11:39:10 +01:00
4cb523fb66
Added tests for ContentTypeServiceExtensions
2016-01-08 12:29:11 +01:00
63785ae70f
Adds cache policy tests
2016-01-07 17:54:55 +01:00
68aa6ff093
Moves repository caching logic into new CachePolicies.
2016-01-07 16:31:20 +01:00
ff829d49a3
Updates all cache refreshers to reference the IsolatedRuntimeCache where required, refactors how IsolatedRuntimeCache is exposed on the CacheHelper, ensures that IsolatedRuntimeCache is used in all repositories instead of the global RuntimeCache, changes all obsolete usages of CacheHelper to the non obsolete equivalent, obsoletes many of the cache keys, obsoletes a couple cache refreshers that aren't used anymore in 7.3, simplifies CacheHelper with regards to it's 'disabled' cache state.
2016-01-06 18:08:14 +01:00
4f40fff5ee
Moves DeepCloneRuntimeCacheProvider to Cache namespace. Creates DeepCloneableList + tests. Updates RepositoryBase to use DeepCloneableList when GetAllCacheAsCollection is used (so that all entries that get cached are deep cloned into and out-of the cache). Adds test for DeepCloneRuntimeCacheProvider for dealing with this list type.
2016-01-06 14:17:51 +01:00
0df4949b82
Merge pull request #960 from umbraco/temp-deploy-31
...
deploy-31 Implement DB changes for Umbraco Deploy
2015-12-17 10:28:11 +01:00
8260c12d64
deploy-31 Implement DB changes for Umbraco Deploy
2015-12-16 14:07:09 +01:00
c3f309c146
Merge branch '7.4.0' into temp-U4-7365
2015-12-16 10:25:19 +01:00
727fd3aa17
U4-7537 File cleanup for old content type editor
2015-12-15 15:12:22 +01:00
f1fcb2adec
Fixes: U4-7365 Content list view sorting alias is “sort” and media list view sorting alias is “sortOrder”. This gives an ysod when changing sorting in media list views.
...
Changed the default list view for media to be created with the correct alias in the database.
Added migration for existing databases to be updated.
2015-12-15 13:43:52 +01:00
cd369bf078
Move some repeated GUIDs to a constants class
2015-12-03 09:43:33 +01:00
c7aa3d63fb
Merge branch 'temp-U4-7372' into 7.4.0
...
Conflicts:
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
2015-12-03 09:22:19 +01:00
d0865017d1
Merge branch 'dev-v7' into 7.4.0
2015-11-18 19:42:13 +01:00
aca181b32e
U4-7410 Version issue with MySql.Data after upgrade to 7.3.1.
...
#U4-7410 Fixed
2015-11-18 19:39:10 +01:00
214e4beb2f
Merge branch 'dev-v7' into 7.4.0
2015-11-17 18:51:29 +01:00
eb5589e064
Remove PropertyGroup.ParentId, sanitize Property groups/types
2015-11-17 16:55:14 +01:00
aaffa01f36
Implement PropertyGroup.Key (with migration)
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
2015-11-17 16:55:13 +01:00
f5f9cb676c
Fix CultureInfo leak in UmbracoApplicationBase too.
2015-11-17 16:54:24 +01:00
60c2040cba
Merge pull request #890 from umbraco/temp-U4-7286
...
Fixes: U4-7286 Upgrade script to normalize all GUIDs for content types + update Courier to support it
2015-11-17 11:48:19 +01:00
b59ea231c5
Merge 7.4.0 into temp-U4-6911
2015-11-13 12:53:34 +01:00
d00569325a
Merge branch 'dev-v7' into 7.4.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
src/Umbraco.Web.UI.Client/src/common/directives/util.directive.js
src/Umbraco.Web.UI.Client/src/less/application/grid.less
src/Umbraco.Web.UI.Client/src/less/main.less
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
2015-11-13 11:29:47 +01:00
bf40fc25e6
Fixes csproj and fixes migration script to use Sql object and ensures that it normalizes GUIDs across ALL content types
2015-11-13 11:17:14 +01:00
5209a54f2a
Added Move methods for both content types and media types ... these move methods are done as part of the UOW commit/transaction process, something that should be done with the Move/Copy operations of the content/media services. I added unit tests for the move operations for both content, media and data types. Events are all in places for content type and media type moves (something which Courier will need to use). Updated the trees/menu items to support moving which includes rendering the tree with only folders, updated the move dialog views to work.
2015-11-12 19:01:41 +01:00
f54cde050a
WIP - updated repositories to better support creating/deleting entity containers in a transaction, this is done by a child repository and a new EntityContainer type. Updated the controller to use this logic.
2015-11-12 18:59:39 +01:00
5d97a94dcb
Fixed to use alias instead of hardcoded id.
...
Added mapper for TaskType.
2015-11-11 12:02:12 +01:00
16da9f99d7
Fixes: U4-7286 Upgrade script to normalize all GUIDs for content types + update Courier to support it
...
Migration for ensuring content type guids are consistent on upgrade to v. 7.4.
2015-11-10 13:38:37 +01:00
505de31fa1
Fixes: U4-7370 Upgrading from 7.3.1 to 7.4 fails
...
Added migration for 7.3.2, ensuring the identity on the table is correct. It failed due to rows initially being inserted with identity disabled and therefore the seed of the table was zero even when the table had data.
2015-11-10 13:38:36 +01:00
35778bc08a
Fixes: U4-7286 Upgrade script to normalize all GUIDs for content types + update Courier to support it
...
Migration for ensuring content type guids are consistent on upgrade to v. 7.4.
2015-11-10 13:37:45 +01:00
61441dd436
Fixes: U4-7370 Upgrading from 7.3.1 to 7.4 fails
...
cherrypicked from 7.4.0 branch.
Added migration for 7.3.2, ensuring the identity on the table is correct. It failed due to rows initially being inserted with identity disabled and therefore the seed of the table was zero even when the table had data.
2015-11-10 12:15:44 +01:00
Sebastiaan Janssen