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

1396 Commits

Author SHA1 Message Date
Shannon
90a66aeebd fixes merge / build 2016-04-05 16:32:46 +02:00
Shannon
c20984dca7 Merge branch 'dev-v7' of https://github.com/aadfPT/Umbraco-CMS into aadfPT-dev-v7 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.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/IContentService.cs
	src/Umbraco.Core/Services/IMediaService.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
	src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
	src/Umbraco.Web/Editors/ContentController.cs
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Editors/MemberController.cs
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2016-04-05 16:20:39 +02:00
Shannon
80d7443bd3 fix build 2016-04-05 16:00:49 +02:00
Shannon
ef3f15ec9b Merge branch 'u4-6003b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-6003b 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/IContentService.cs
	src/Umbraco.Core/Services/IMediaService.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web/Editors/MemberController.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2016-04-05 15:31:33 +02:00
André Ferreira
bd2a40d214 U4-6003 List View - Order By Custom Property Fix 
Original work done on https://github.com/umbraco/Umbraco-CMS/pull/711 but ported to the latest version

Content below for reference
With the current implementation of the list view you can only sort by system columns (Name, SortOrder etc.) and not custom columns you have added to your document types. This PR allows that.

The crux of it is a sub-query added to the ORDER BY clause when we are ordering by a custom field. This looks up the field's value from the most recent content version.

Provided here and not in the previous pull request is:

MySQL support
Have done some performance testing. On a local laptop with 1000 nodes in a list view, it's sorting in around 220-250ms. It's a little slower that sorting on native properties like node name, but still perfectly usable - there's no significant delay you see in use.
Please note also:

GetPagedResultsByQuery() in VersionableRepositoryBase was previously doing an ORDER BY in SQL and then repeating this via LINQ to Objects. I couldn't see that this second ordering was necessary so removed it, but wanted to flag here in case I've missed something around why this was necessary.
The PR also includes small amends to fix or hide sorting on a couple of the default columns for the member amd media list views.
 2016-04-01 11:28:51 +01:00
Stephan
ecdca378c6 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies 2016-03-16 13:41:58 +01:00
Stephan
2004f6a51e U4-8154 - bugfix 2016-03-16 10:10:31 +01:00
Claus
07d0d82bd1 Merge branch 'U4-8026' of git://github.com/arknu/Umbraco-CMS into arknu-U4-8026 2016-03-15 13:47:10 +01:00
Claus
91eb3ea59e Merge pull request #1152 from AndyButland/u4-7888 
Fixed U4-7888 - Cannot change default template for document type
 2016-03-15 13:43:07 +01:00
Stephan
65b16fbfe5 U4-8154 - bugfix Sql query expressions parsing 2016-03-11 14:18:08 +01:00
Warren Buckley
94ea677ec0 Merge pull request #1146 from umbraco/temp-U4-7641 
U4-7641 - enable content type copy
 2016-03-08 09:38:16 +00:00
Shannon
a707d23692 Allows for specifying explicit product names by overriding the property in MigrationStartupHander 2016-03-07 15:13:31 +01:00
AndyButland
1a4322eb48 Fix issue with database field check that led to default template for content type not being set 2016-02-29 09:04:50 +00:00
Stephan
dafde545b0 U4-7641 - bugfix + implement for media types 2016-02-25 16:02:04 +01:00
Stephan
610538261e U4-7641 - enable content type copy 2016-02-25 15:26:03 +01:00
Asbjørn Riis-Knudsen
e8f84cfec0 Add parens around all BinaryExpressions to make sure that errors such U4-8026 do not happen 2016-02-25 12:20:58 +01:00
Stephan
9f7b82e20f U4-8077 - ensure product name in migration event handlers 2016-02-24 13:59:15 +01:00
Stephan
f1366c7d29 U4-8017 - fix issues with MySql InitColumnTypeMap 2016-02-19 13:33:11 +01:00
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