yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,274 Commits 4 Branches 7 Tags
2e4e8a3fbc60fb6cdaaec7ca5fe28f0bd94cd5d7
Commit Graph

16274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bjarnef
40f7e87e04 Fix issues when using custom font icons in backoffice. 2016-04-02 13:36:55 +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
1b8747bd6d removes legacy disable user menu item and uses the new/normal way of dealing with menu items. 2016-03-31 19:41:42 +02:00
Shannon
c6a586274e Merge branch 'U4-8189' of https://github.com/danlister/Umbraco-CMS into danlister-U4-8189 
Conflicts:
	src/Umbraco.Core/Constants-Applications.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-31 19:40:07 +02:00
Shannon
4df5ddcb4c Removes old serializers for old tree formats 2016-03-31 18:50:25 +02:00
Shannon
cf822be04f Merge branch 'MangoPieface-dev-v8' into dev-v8 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-31 18:46:26 +02: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
Shannon
b6f88895dc re-adds images that are still required for some of the legacy file editors 2016-03-31 14:35:49 +02:00
Shannon
734392bb0e Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2016-03-31 14:31:21 +02:00
Shannon
b22fda1e80 fixes some ysods 2016-03-31 14:28:41 +02:00
Shannon Deminick
aefe2ee1c3 Merge pull request #1196 from BatJan/dev-v8 
Part 1 of U4-8226 Remove all unused/un-needed webforms files from the Umbraco.Web and Umbraco.Web.UI projects
 2016-03-31 14:27:31 +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
Chriztian Steinmeier
5f0fe69c82 Update links to https 2016-03-30 21:11:29 +02:00
Chriztian Steinmeier
e325e06efc Update link to Our on Backoffice sections 2016-03-30 21:10:41 +02:00
Chriztian Steinmeier
5e7db1047b Add the missing 't' ⚡ 2016-03-30 21:09:14 +02: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
Shannon
79bebb9e14 Merge remote-tracking branch 'origin/dev-v8' into dev-v8 
Conflicts:
	src/Umbraco.Web.UI/config/trees.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 16:08:08 +02:00
Shannon
74e1078c31 Merge branch 'U4-8198_file_system' of https://github.com/yannisgu/Umbraco-CMS into yannisgu-U4-8198_file_system 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 16:07:45 +02:00
Warren Buckley
659af0ba48 Merge branch 'U4-8194' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-8194 
# Conflicts:
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 14:44:03 +01:00
Shannon Deminick
3c697436b1 Merge pull request #1195 from yannisgu/U4-8193 
U4-8193  replaced loadMacros with MacrosTreeController
 2016-03-30 15:15:41 +02:00
Shannon
429d7e2aff WIP - starts porting umbraco over to lucene 3 and Examine v2 2016-03-30 15:12:30 +02:00
bjarnef
d1c865480f Add tooltip for listview layout + cursor style for listview table row. 2016-03-29 23:22:42 +02: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
James Coxhead
efa8bf44f9 Merge remote-tracking branch 'upstream/dev-v8' into U4-8194 
# Conflicts:
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
 2016-03-24 20:56:44 +00:00
James Coxhead
d99aef5ee8 Updated config transforms 2016-03-24 20:30:31 +00:00
Stephan
e6a187a3d6 Merge pull request #1197 from yannisgu/fixNewtonsoft 
Fix Newtonsoft.JSON dependency when running in debug mode in v8
 2016-03-24 20:17:53 +01:00
Yannis Guedel
69dc8bc57f fix newtonsoft.json 8.0.0 when running in debug mode 2016-03-24 19:49:01 +01:00
Jan Skovgaard
2d3d36a14c Removing unused member usercontrols and master layouts. 2016-03-24 12:43:51 +01:00