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

1353 Commits

Author SHA1 Message Date
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
Morten Christensen
2a2e867784 Fxies U4-2257 2013-06-02 11:30:27 -02:00
Morten Christensen
242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly. 
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
 2013-06-01 20:40:51 -02:00
Sebastiaan Janssen
d8a8bf5f74 Bump version number 2013-05-30 10:26:40 -02:00
Sebastiaan Janssen
a8ad8c2a43 Bump version number 2013-05-30 10:23:35 -02:00
Morten Christensen
db7cb2dcb4 Merge with 6.0.6 2013-05-29 13:18:40 -02:00
Morten Christensen
6281268954 Updating sort method in Content- and MediaService 2013-05-29 13:18:03 -02:00
Sebastiaan Janssen
cd606a7e9e Merge 2013-05-29 05:41:50 -02:00
Sebastiaan Janssen
ae9d77a765 Bump version number 2013-05-29 05:40:55 -02:00
Morten Christensen
f6e44b4e7c Merge with 6.0.6 2013-05-29 05:38:35 -02:00
Morten Christensen
8e1c45e981 Updating Sort methods to skip items that hasn't been sorted 2013-05-29 05:37:55 -02:00
Sebastiaan Janssen
2f61bc27c8 Bump version number 2013-05-28 15:15:32 -02:00
Morten Christensen
634e4a6949 Merge with 6.0.6 2013-05-27 08:47:14 -02:00
Morten Christensen
e61b567ee1 Fixes #U4-2270 and #U4-2269 2013-05-27 08:45:07 -02:00
Morten Christensen
469db82f1d Internal creation of backoffice users and unit test to verify 2013-05-27 06:50:14 -02:00
Morten Christensen
e0bc99af9c Merge 2013-05-24 08:14:07 -02:00
Morten Christensen
232581664b Moving internal membership provider classes. 
Adding missing alias to AllowedContentTypes on ContentType.
Adding Package export test.
 2013-05-24 08:13:24 -02:00
Shannon Deminick
b15e147d6b Removed internal classes relating to property editors that are not used and were initially ported from v5 but we'll be 
creating new/different ones for v7.
 2013-05-23 21:32:26 -10:00
Morten Christensen
c7a4c782e3 Internal work around the creation of users through the new api. 2013-05-23 13:25:14 -02:00
Morten Christensen
780908e24f Fixing merge issues and updating nodeSorter to use EntityService and new Sort method for improved performance. 
Fixes #U4-1750
 2013-05-23 11:34:06 -02:00
Morten Christensen
3ac7e237c4 Merge with 6.0.6 2013-05-23 10:38:09 -02:00
Morten Christensen
6943a454f3 Implementing Sort-method for the Content/MediaService 2013-05-23 10:29:44 -02:00
Morten Christensen
41b17160f7 Excluding a few new classes, which won't make it into 6.1.0. 2013-05-22 11:08:27 -02:00
Morten Christensen
b19621c07b Improving tree performance for Content and Media trees using the new EntityService and the thin IUmbracoEntity object. 
Updating a few internal overloads as well as adding new ones to ensure backwards compatibility for events used by the tree.
Fixing issue with the Published/Unpublished/Saved/Pending Changes states shown in the content tree.
 2013-05-22 11:06:21 -02:00
Morten Christensen
0ff979e814 Adding missing method for retreiving parent or child relations. 
Implements #U4-2237
 2013-05-22 07:53:16 -02:00
Morten Christensen
f26e39f5ce Adding a new extensibility in relation to #U4-2244 which allows consumers of the CoreBootManager to explicitly set the path to the root of an umbraco site/solution. 
A bit of cleanup in the IOHelper class.
 2013-05-22 07:48:42 -02:00