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

1328 Commits

Author SHA1 Message Date
Morten Christensen
7ff0e6cd4b Fixes #U4-2458 2013-07-04 10:50:02 +02:00
Morten Christensen
8465b4e556 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 12:34:52 +02:00
Morten Christensen
30835797ff Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 11:47:09 +02:00
Shannon
4077a01a6b Fixes: #U4-2344 - fixes examine re-indexing for media and a null check for DataType.Data 2013-07-03 19:47:06 +10:00
Shannon
da545b890b Updated UserRepository to not contain the general query methods, we do those in the service. 2013-07-03 19:26:28 +10:00
Morten Christensen
9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Shannon
d3b69e04e1 Updated IUserService and added more unit tests for new methods. Fixed unit tests that were failing due to incorrectly set settings... not sure how this is working on the server but oh well. 2013-07-03 19:01:37 +10:00
Shannon
d67480e98b Updated UserService, didn't need one of the methods on there, updated the unit tests to test all the other methods. 2013-07-03 17:09:14 +10:00
Shannon
5d76ead469 backported changes to IUserRepository from v7 2013-07-03 16:52:00 +10:00
Shannon
2796100067 added another unit test. 2013-07-03 16:45:56 +10:00
Shannon
a132f609d7 backports changes for -> Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections & streamlines Persistence/Mappers with less code duplication. 2013-07-03 16:40:22 +10:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Morten Christensen
b0f4cb7d02 Merge branch '6.0.7' into 6.1.2 2013-06-28 13:30:04 +02:00
Morten Christensen
f809dec874 Updating repository factory to inject unique name setting into ContentRepository 2013-06-28 13:28:03 +02:00
Morten Christensen
2477500045 Fixes #U4-2414 and removes internal usage of action handlers Yay! 2013-06-28 13:27:23 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Morten Christensen
b1db99f639 Fixing issue in previous fix for #U4-2182 2013-06-27 10:57:49 +02:00
Morten Christensen
ccbb838cef Fixing another part of #U4-2186 2013-06-27 10:56:45 +02:00
Sebastiaan Janssen
0d5ec8bfd5 Merge branch '6.0.7' into 6.1.2 2013-06-26 20:57:32 +02:00
Sebastiaan Janssen
5f67e85471 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-26 20:55:11 +02:00
Sebastiaan Janssen
d9228c368f Fixes U4-2404 Photo gallery broken on Azure - Since the template saving routine is doing ToSafeAlias, we should also do it when setting the default template 2013-06-26 20:54:36 +02:00
Morten Christensen
8226505e5b Merge branch '6.0.7' into 6.1.2 2013-06-26 15:55:49 +02:00
Morten Christensen
41b8de09b7 Fixes U4-2234 including test case from issue 2013-06-26 15:49:00 +02:00
Morten Christensen
bbf06cd13d Fixes U4-2234 2013-06-26 14:31:36 +02:00
Morten Christensen
639cb17741 Fixes U4-2182 and U4-2167 2013-06-26 14:31:10 +02:00
Morten Christensen
4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Morten Christensen
e4387b8dae Adding some internal bits in the ServiceContextManager and PackagingService 2013-06-25 13:43:57 +02:00
Morten Christensen
188aca499a Merge branch '6.0.7' into 6.1.2 2013-06-25 11:54:24 +02:00
Morten Christensen
3040d362ef Fixes #U4-2361 2013-06-25 11:48:37 +02:00
Stefan Kip
b01b4f7aa7 Forgot to update XML comments 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:29:03 +02:00
Stefan Kip
49a699c858 Added RemovePropertyGroup method 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:28:42 +02:00
Morten Christensen
f68571ef7c Merge pull request #24 from kipusoep/U4-2421-RemovePropertyGroup 
U4-2421 Added RemovePropertyGroup method
 2013-06-24 01:18:21 -07:00
Stefan Kip
d553dfd4b0 Forgot to update XML comments 2013-06-23 20:24:22 +02:00
Stefan Kip
f3e737720b Added RemovePropertyGroup method 2013-06-23 16:38:11 +02:00
Shannon
3618722574 Fixed some merging issues. 2013-06-20 15:57:23 +10:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon
5a6ee168c3 Merge branch '6.0.7' into 6.1.2 2013-06-20 10:08:50 +10:00
Shannon
52292cab60 Fixes: #U4-2403 2013-06-20 10:08:02 +10:00
Sebastiaan Janssen
c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
 2013-06-19 18:26:45 +02:00
WadeKallhoff
a6768263d3 image thumb extension fix 2013-06-19 18:11:28 +02:00
Sebastiaan Janssen
26e4091f28 Due to previous fix we don't need to sort individually any more 
(see changeset 32f86f750e)
 2013-06-19 16:01:50 +02:00
Dennis Ravn Pedersen
32f86f750e Query would reverse logic sorting of children. Would make move operations ignore sorting. 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-19 15:36:08 +02:00
Sebastiaan Janssen
556c2d625f Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-06-19 14:42:14 +02:00
Sebastiaan Janssen
baa0069262 Merge branch 'master' into 6.0.7 
Conflicts:
	README.md
 2013-06-19 14:22:57 +02:00
Sebastiaan Janssen
9ac4c7aef5 Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS 2013-06-19 14:14:51 +02:00
Jeremy Pyne
5e2c3a0a8b Fixed a type on content copy. 2013-06-18 10:38:08 -04:00
Jeremy Pyne
f5121bd183 Fix for U4-2384. Author not changed to current user when a node is copied. 2013-06-18 09:35:33 -04:00
Morten Christensen
bc1b2dc5f4 Fixes #U4-2333 2013-06-07 05:19:45 -02:00
Morten Christensen
0bb643672f Adding some minor changes/adjustments to the TypeFinder to make a bit more flexible for external usage. 2013-06-07 05:19:25 -02:00