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

15893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
6856540a7c fixes bool parameter for members 2016-04-06 09:49:53 +02:00
Shannon
b9b3d62994 fixes boolean isSystem for media 2016-04-06 09:44:33 +02:00
Shannon
dac7b93209 fixes GetChildren non bool argument to work as a bool again. 2016-04-06 09:17:05 +02:00
Shannon
90a66aeebd fixes merge / build 2016-04-05 16:32:46 +02:00
Shannon
f485755082 Merge branch 'aadfPT-dev-v7' into 7.5-ListViewCustomFieldSorting 2016-04-05 16:21:10 +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
ed7c682a68 Merge branch 'AndyButland-u4-6003b' into 7.5-ListViewCustomFieldSorting 2016-04-05 15:31:41 +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
Sebastiaan Janssen
c856795cb7 Fix hilariously wrong copy/pasted TODO comments.. 2016-04-05 08:03:47 +02:00
madden-tom
2d514ac09e Added check for publish permissions to remove option for Publish At a… 
U4-287 "Publish at" circumvents "Send for approval/publishing"
 2016-04-05 08:01:05 +02:00
Sebastiaan Janssen
8e8b8bdea1 Revert "Removes old obsoleted ping.aspx" 
This reverts commit 453efc02a5.

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

U4-8274 '/umbraco/ping.aspx' is missing
 2016-04-04 09:20:59 +02:00
Sebastiaan Janssen
d8c781f97f Make the file exclusion filter more readable 2016-04-03 13:39:05 +02:00
Sebastiaan Janssen
6502470708 U4-8265 Listview list and listview grid does not handle acceptedFileTypes in same way 2016-04-03 12:08:25 +02:00
Sebastiaan Janssen
680396daab Localize server-side error message for disallowed file uploads 2016-04-03 12:08:23 +02:00
Asbjørn Riis-Knudsen
4e4ea59433 * Only restrict to image files when onlyImages is active* Handle disallowed filetypes as per other upload controls 
* Only restrict to image files when onlyImages is active
* Handle disallowed filetypes as per other upload controls
 2016-04-02 19:07:35 +02:00
Warren Buckley
fbce20d0c3 Merge pull request #1158 from umbraco/temp-U4-8016 
Fixes: U4-8016 Pick only images from media
 2016-04-01 13:54:37 +01:00
André Ferreira
c147db1334 Merge branch 'dev-v7' of https://github.com/aadfPT/Umbraco-CMS into dev-v7 2016-04-01 11:29:33 +01: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
André Ferreira
9376731533 Adhering to Umbraco's Coding Standards 2016-04-01 11:24:30 +01:00
Shannon Deminick
982fa26b7e Merge pull request #1210 from umbraco/temp-U4-8103 
U4-8103
 2016-03-31 18:26:09 +02:00
Stephan
c3055ca43f U4-8103 - fix DisableBrowserCacheAttribute to handle exceptions 2016-03-31 16:37:16 +02:00
Stephan
4cca364511 U4-8103 - refactor YSOD overlay to display inner exceptions 2016-03-31 16:36:36 +02:00
Stephan
9e0ed94d77 Fix typo in lang xml files 2016-03-31 12:56:24 +02:00
Warren Buckley
374147a1a0 Merge pull request #1208 from umbraco/temp-U4-2954 
U4-2954 - refresh domain cache when emptying recycle bin
 2016-03-31 10:28:31 +01:00
Stephan
61fe0a4a93 U4-2954 - refresh domain cache when emptying recycle bin 2016-03-30 17:56:34 +02:00
Warren Buckley
aa1aabef3a Merge pull request #1204 from umbraco/temp-U4-7862 
U4-7862 Brackets cause issues in the stylesheet editor
 2016-03-30 16:11:15 +01:00
André Ferreira
d560223eca Fixes to make it work 2016-03-29 20:13:53 +01:00
Claus
c427c51053 U4-7862 Brackets cause issues in the stylesheet editor 2016-03-29 14:29:27 +02:00
paulsterling
08070e319a Update number of sites running 2016-03-28 16:46:31 -07:00
André Ferreira
54394f2ce9 fixes 2016-03-28 10:35:05 +01:00
André Ferreira
4f141e8b27 Fixing column sort on columns with custom headers 2016-03-28 10:35:04 +01:00
Warren Buckley
ac2ebc4071 Merge pull request #1193 from umbraco/temp-U4-8220 
U4-8220 ModelState and ViewData is not carried through when using the…
 2016-03-23 12:10:05 +00:00
Shannon
d4c79a0915 Fixes tests, adds more asserts 2016-03-23 11:02:27 +01:00
Shannon
61f9845db0 bumps version 2016-03-23 10:06:53 +01:00
Shannon
43e23829ae updates EnsurePartialViewMacroViewContextFilterAttribute to check for child actions 2016-03-23 10:06:13 +01:00
Stephan
5774ce68c7 GitIgnore Umbraco.Tests/media 2016-03-22 14:37:22 +01:00
Shannon
b9af6f631a U4-8220 ModelState and ViewData is not carried through when using the obsolete Content.GetGridHtml method 2016-03-22 11:23:09 +01:00
Shannon
cd401f5e37 U4-8216 Hijacked controller actions fail with custom RenderModel subclass due to ModelBinding error 2016-03-21 16:12:34 +01:00
Sebastiaan Janssen
75c2b07ad3 Update ModelsBuilder dependency for the NuGet package 2016-03-18 16:32:05 +01:00
Sebastiaan Janssen
969fe30f6e Merge pull request #1186 from umbraco/temp-U4-8043 
U4-8043 - reboot app when PureLive models go wrong
 2016-03-18 16:26:52 +01:00
Stephan
0f90d357cf U4-8043 - reboot application when PureLive models go wrong 2016-03-18 16:14:06 +01:00
Stephan
d955daab0f Upgrade ModelsBuilder to 3.0.2 2016-03-18 16:13:19 +01:00
Shannon
617b17ca9e puts back in the current node permission check - since we use this for Create 2016-03-18 15:43:14 +01:00
Shannon
9e3d7a1cce updates default pipeline marker stage for the preview middleware, updates MembershipHelper to not throw an exception if the Role manager is disabled. 2016-03-18 11:05:39 +01:00
Warren Buckley
f04071d7c7 Merge pull request #1180 from umbraco/temp-U4-8165 
U4-8165 Ensure browsers are not caching service requests
 2016-03-18 09:53:12 +00:00
Shannon Deminick
2cce9395da Merge pull request #1181 from mittonp/dev-v7 
French translations for Grid.
 2016-03-18 10:15:50 +01:00
Mitton
6ad56863d4 Grid translation - French 2016-03-18 06:15:37 +02:00
Mitton
2703fa7ea2 Grid translation - French 2016-03-18 06:12:44 +02:00
Shannon
b3c6654d41 bumps version 2016-03-17 17:31:36 +01:00