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

1373 Commits

Author SHA1 Message Date
Shannon
3f5aa3aa2b U4-7954 Error upgrading database to 7.4.0 - [ FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup_id ] doesn't exist 2016-02-16 12:17:21 +01:00
Stephan
42c23dadc9 U4-7887 - default to database connection timeout 2016-02-04 14:51:19 +01:00
Shannon Deminick
aa31e293ec Merge pull request #1086 from umbraco/temp-U4-7598 
U4-7598 - fix migrations during 4.7 to 7.4 upgrade
 2016-02-04 11:10:45 +01:00
Shannon
797eb34f36 Fixes merge issues and tests 2016-02-03 13:43:51 +01:00
Shannon
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
Shannon Deminick
36119848e7 Merge pull request #1085 from umbraco/temp-U4-7861 
U4-7861 - fix moving a content type
 2016-02-03 12:13:31 +01:00
Claus
076efad616 Merge pull request #1084 from umbraco/temp-U4-7713 
U4-7713 - fix CountPublished
 2016-02-03 11:45:15 +01:00
Stephan
325f92f6ca U4-7598 - fix migrations during 4.7 to 7.4 upgrade 2016-02-02 18:53:08 +01:00
Sebastiaan Janssen
462f7a59b5 Merge pull request #1078 from dawoe/U4-7872 
Use product name in migration runner instead of Umbraco productname
 2016-02-02 17:06:56 +01:00
Shannon
a1c70a219a ensures correct sort order for content type queries + test 2016-02-02 16:51:57 +01:00
Stephan
3f23b06e24 U4-7861 - fix moving a content type 2016-02-02 16:40:01 +01:00
Shannon
0de3be42cf U4-7869 Examine & SQL Azure - Timeouts - ensure the other reader is executed with retry. 2016-02-02 15:33:22 +01:00
Stephan
8791f7ee97 U4-7713 - fix CountPublished 2016-02-02 13:52:55 +01:00
Shannon
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
Dave Woestenborghs
647fbea066 Use product name in migration runner instead of Umbraco productname 
Fixes http://issues.umbraco.org/issue/U4-7872
 2016-02-01 11:48:32 +01:00
Shannon
d526ff43f2 Merge branch 'temp-RepoCachePerf' into dev-v7 2016-01-28 15:16:02 +01:00
Shannon
85d6ee5713 Merge branch '7.3.6' of https://github.com/umbraco/Umbraco-CMS into 7.3.6 2016-01-28 13:50:55 +01:00
Shannon
ec81583741 Fixes case sensitive matching on alias in TemplateRepository 2016-01-28 13:50:45 +01:00
Sebastiaan Janssen
332da9bf2d Merge pull request #1070 from umbraco/temp-RepoCachePerf736 
Temp repo cache perf736
 2016-01-28 12:15:24 +01:00
Shannon
e912238574 Saw there was another place with the incorrect case for the column name AllowedId 2016-01-28 09:32:01 +01:00
glennweb
5d3e580cda Saw there was another place with the incorrect case for the column name AllowedId 2016-01-28 15:12:14 +10:00
glennweb
93aadc196f Fixed incorrect case property in select statement causing case sensitive database's to throw error. 
https://our.umbraco.org/forum/core/general/49619-Went-wrong-in-a-moment-Invalid-column-name
 2016-01-28 15:07:18 +10:00
Shannon
9a830e5de6 fixes tests 2016-01-27 19:44:36 +01:00
Shannon
7d9ba0e36e manually backports changes from 7.4 fixes 2016-01-27 19:42:06 +01:00
Shannon
6c5e09fd84 Ensures that the main content type repositories are returning the correct result from their GetAll methods. Fixes the FullDataSetRepositoryCachePolicy to ensure that any request with Ids actually returns the result of GetAll and then filters to ensure caching is correct. 2016-01-27 19:26:08 +01:00
Shannon
5d96534678 fixes tests 2016-01-27 19:20:24 +01:00
Shannon
0cefdcbc20 Fixes ContentTypeBaseRepository - there were several hack in place to query by GUID but this is totally irrelavent because we are caching them all so the result should be from the GetAll(), so this removes all of those hacks which greatly simplifies things. This fixes the MapContentTypes and MapMediaTypes methods - before this was looking up a collection and then recursing back to Get(int) (but we already have all of the data we need), then it was storing a lot of arrays in memory to build up an Entity when it's much faster to just iterate forward only and build up the entity. This saves 5 SQL calls on startup. 2016-01-27 18:55:10 +01:00
Shannon
02b74a5059 Fixes FullDataSetRepositoryCachePolicy so that whenever Ids are requested, it retrieves all of the items and then post filters - ensuring there's no additional trips to the database. Fixes MemberTypeRepository so that calls to PerformGet(int) are wrapping the GetAll() call. 2016-01-27 18:51:37 +01:00
Shannon
49fc068b38 Merge remote-tracking branch 'origin/7.3.6' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	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
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/UmbracoContext.cs
 2016-01-27 15:42:06 +01:00
Shannon
74ddd09c5d U4-7836 YSOD when upgrading Umbraco with error during AddUserDataClaims - this also ensures that no empty/null sections can be added to the user object since this is where the original exception was coming from. 2016-01-26 17:05:46 +01:00
Sebastiaan Janssen
e461cb92da U4-7787 Shorthand use of ?altTemplate= doesn't work 
#U4-7787 Fixed
 2016-01-26 16:07:44 +01:00
Claus
17629ea1b5 Merge pull request #1055 from umbraco/temp-U4-7698 
Ensures that all property data is deleted for a doc type when it is b…
 2016-01-26 14:13:46 +01:00
Shannon
ba9ebd394b fixes MediaTypeRepositoryTest's 2016-01-26 13:43:56 +01:00
Shannon
7d616cf937 Ensures that all property data is deleted for a doc type when it is being deleted, updates the ChangeDocType to not use the legacy EnsuredPage, updates the non-legacy EnsuredPage.ClientTools to support the legacy logic. 2016-01-26 12:13:53 +01:00
Mads Rasmussen
e91b53e66d back ported: 2d0f198f58 2016-01-25 11:09:20 +01:00
Shannon
20dc4f5bc4 fixes merge issue/build 2016-01-23 12:27:40 +01:00
Shannon
5ab61e7638 U4-7816 The IsolatedCache instance in the RepositoryFactory differs from the ApplicationContext singleton instance 2016-01-22 17:09:44 +01:00
Shannon
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
Shannon
f78a425985 U4-7816 The IsolatedCache instance in the RepositoryFactory differs from the ApplicationContext singleton instance 2016-01-22 16:37:47 +01:00
Shannon
07d50464cc U4-7811 Content type repositories should use FullDataSetRepositoryCachePolicyFactory for performance 2016-01-21 19:33:47 +01:00
Shannon
2d0f198f58 U4-7546 Cannot delete document type - fanoe starter kit Text Page 2016-01-20 18:26:30 +01:00
Shannon Deminick
2ef673bc84 Merge pull request #1038 from umbraco/temp-U4-7768 
U4-7768 - Fixes validation issue with new CTs and invalid server side…
 2016-01-20 18:08:58 +01:00
Shannon
8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Shannon
ce3028446b Moves all serialization logic, including the part for folders into the EntityXmlSerializer where it needs to be, updates the data type repo to ensure paths are udpated correctly when moving, removes folder logic from other packaging logic, it's purely the responsibility of the serializer. adds new methods to content type and data type services to return an entities total folder collection. 2016-01-14 19:33:53 +01:00
Shannon
73f1458190 Fixes the Move content type command to ensure that all paths are updated correctly. 2016-01-14 18:25:14 +01:00
Shannon
afe2aeda1b Merge branch '7.4.0' into temp-deploy-29 2016-01-13 19:11:20 +01:00
Shannon
dfa687e695 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:18:30 +01:00
Claus
59759c4919 Merge pull request #1018 from umbraco/temp-U4-5982 
U4-5982 Webpages unpublishing by themselves
 2016-01-13 14:29:37 +01:00
Shannon
68ddea2776 refactors a bit of code from the PR, adds more translations to the other english file. 2016-01-13 12:33:57 +01:00
Stephan
02e94f9243 deploy-29 - Sanitize UniqueId 2016-01-13 12:32:30 +01:00