yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,363 Commits 4 Branches 7 Tags
48d34af7bb9d3571d571afa05f4b0bbdaedbf296
Commit Graph

3744 Commits

Author SHA1 Message Date
Shannon
bb4dd9c418 Merge branch '7.1.5-perf' into 7.2.0 2014-09-05 15:20:46 +10:00
Shannon Deminick
50b49f9ee2 Merge pull request #465 from mattbrailsford/7.1.6-movable-dictionary-tree 
Fix U4-5413 Makes the dictionary tree moveable
 2014-09-05 15:15:24 +10:00
Shannon Deminick
cf0eb87d03 Merge pull request #468 from codegecko/7.2.0 
Made ICultureDictionary, CultureDictionaryFactoryResolver and UmbracoCul...
 2014-09-05 15:08:32 +10:00
Shannon Deminick
927bf1d3a2 Merge pull request #471 from pynej/markdown-property-type 
Markdown property should store to text not varchar.
 2014-09-05 09:25:06 +10:00
Jeremy Pyne
24724ca6e8 Markdown property should store to text not varchar. 2014-09-04 16:05:34 -04:00
benjamin.howarth
8aa5a64883 Made ICultureDictionary, CultureDictionaryFactoryResolver and UmbracoCultureDictionary public instead of internal (cause they're useful to query, and obsoleted umbraco.MacroEngines.ICultureDictionary was/is public) 2014-09-03 09:40:34 +01:00
Shannon
42fe4c77f6 Fixes n+1 queries on template repository 2014-09-02 12:47:46 +10:00
Shannon
03f9b89810 fixes the n+1 queries on content and media type controllers and ensures if there are no ids that the query doesn' texeucte. 2014-09-02 11:53:12 +10:00
Shannon
c21dcb0279 Fixes n+1 queries for content and media types when resolving their properties and groups, this fixes the n+1 queries with the scheduled publishing too. Adds a test for template mappings, fixes call for GetAll on EntityController to not be called when there are no ids. 2014-09-02 11:50:04 +10:00
Shannon
202f582661 Renames TagsRepository to TagRepository, Fixes n+1 queries on entity repository, fixes n+1 queries on tag repository, updates umbraco member types to specify an entity type for IMember and IMemberType so the entity repository can use it. 2014-09-01 18:06:24 +10:00
mattbrailsford
7bcf8c17e5 Makes the dictionary tree moveable by looking up the application alias from the trees registration rather that hard coding to a specific section. 2014-08-28 14:10:22 +01:00
Shannon
ada2492c44 Merge branch '7.1.6' into 7.2.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-08-26 09:25:36 +10:00
Shannon
ebf24d69b5 Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 14:33:50 +02:00
Shannon
c94662e49c Fixes: U4-5388 YSOD after doctype rename & U4-5387 Deleting Properties in document types causes "Object reference not set to an instance of an object" 2014-08-25 14:33:03 +02:00
Sebastiaan Janssen
5d37eaf993 #U4-4673 Fixed Due in version: 7.1.6 2014-08-25 14:32:35 +02:00
Sebastiaan Janssen
2daacd8d57 #U4-5379 Fixed Due in version: 7.1.6 
Some users have not set an email, don't strip out empty entries
 2014-08-25 14:31:50 +02:00
Sebastiaan Janssen
03ba8c9e14 Update to 6.2.2, removes airinstallbadge 2014-08-25 13:46:21 +02:00
Shannon
da8469e4e4 Merge branch 'Nicholas-Westby-7.1.5' into 7.2.0 2014-08-25 17:02:12 +10:00
Shannon
16a4e425cb Merge branch '7.1.5' of https://github.com/Nicholas-Westby/Umbraco-CMS into Nicholas-Westby-7.1.5 2014-08-25 17:01:56 +10:00
Shannon
4b8042ceb1 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into 7.2.0 2014-08-25 16:51:51 +10:00
Shannon
7326541ce3 Merge branch 'AndyButland-u4-5365' into 7.2.0 2014-08-25 16:47:44 +10:00
Shannon
d2c7420c4c Merge remote-tracking branch 'origin/6.2.2' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
 2014-08-25 16:42:19 +10:00
Shannon
13b57c7638 adds some logging 2014-08-25 16:40:45 +10:00
Shannon
39987d5f7d Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 16:24:23 +10:00
Shannon
a8b297903d Ensures we don't get any ysods when changing doc type properties and the content re-creation since it's running on an async thread (U4-5388 , U4-5387 ) 2014-08-25 16:16:42 +10:00
Shannon
4cec6a3213 Fixes: U4-5388 YSOD after doctype rename & U4-5387 Deleting Properties in document types causes "Object reference not set to an instance of an object" 2014-08-25 16:13:21 +10:00
Shannon
45f44e1797 Changes the admin lookup back to just use the id 2014-08-25 13:42:57 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
AndyButland
274e2c18e1 Added checks to ensure if paged requests for content are made they have valid page parameter values 2014-08-24 23:37:10 +02:00
AndyButland
d16a733d9d Added support for paging queries at the database level for media 2014-08-24 23:22:32 +02:00
Sebastiaan Janssen
f3937b8b15 #U4-4673 Fixed Due in version: 7.2.0 2014-08-22 18:30:32 +02:00
Sebastiaan Janssen
eae0087307 #U4-5379 Fixed Due in version: 7.2.0 
Some users have not set an email, don't strip out empty entries
 2014-08-22 11:15:46 +02:00
Sebastiaan Janssen
2666742851 The admin (0) user in UaaS always has password "default" (unencrypted), checking for that for 
now until we can fix this properly. If we didn't update this scheduled publishing would be broken
 2014-08-21 14:10:54 +02:00
Sebastiaan Janssen
38c1e154d4 Fixes broken relation type manager 2014-08-21 12:08:43 +02:00
Shannon
de1b69d5ae adds some notes 2014-08-20 18:04:05 -06:00
Shannon
81d8a90f59 Adds some simple request based caching for the retrieval of the current member in the Umbraco helper. 2014-08-20 12:31:54 -06:00
Sebastiaan Janssen
2d5e5e9b3c Refactored initial relationtype creation as well and "Relate on copy" is now also using the relationservice so it fires events 2014-08-20 17:01:12 +02:00
Sebastiaan Janssen
03a845c957 Update relation type editors to use new RelationService so we can subscribe to it's events 2014-08-20 15:58:57 +02:00
Sebastiaan Janssen
b0d03e7493 Fixed #U4-5373 
Also cleaned up code a little
 2014-08-20 15:16:39 +02:00
Sebastiaan Janssen
ee2410ebe2 Fixed #U4-4287 Due in version 7.1.5 
Added the locale name after each language so you know what exactly you're picking
 2014-08-20 14:50:31 +02:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
de34379ddf Updating PR after feedback from @sitereactor 2014-08-20 14:08:45 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Sebastiaan Janssen
1805857eea Refactor PartialView.IsValid with logic found in SaveFileController 
Refactor FileService.CreatePartialView to use Attempt so that it gets rid of PartialView.SaveSucceeded
Refactor SaveFileController to move all saving logic into the FileService
Added SavingPartialView and SavedPartialView events to the FileService
 2014-08-19 12:51:07 +02:00
Sebastiaan Janssen
32057bd7ee Macro instead of Macr. Removed events for SaveTemplate as the old Template class already has events 2014-08-19 10:39:52 +02:00
per ploug
9aa9de5a7a WIP on background package installs 2014-08-18 20:42:56 +02:00
Shannon
895ecf5f16 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5003 2014-08-18 11:38:09 -06:00
Sebastiaan Janssen
bba0a58bac AssignedApp property is of no concern to FileService 2014-08-18 18:08:01 +02:00
Sebastiaan Janssen
14cbef5edf Add some logging to the cancelled event 2014-08-18 18:02:35 +02:00
Sebastiaan Janssen
65a2b79189 Moves PartialView save/delete to the FileService 2014-08-18 17:47:55 +02:00