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

65 Commits

Author SHA1 Message Date
Shannon
4b8fed9f06 Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well. 2013-07-25 15:31:26 +10:00
Shannon
71bff2d1d7 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Membership/UserProfile.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-07-03 20:24:02 +10: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
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Morten Christensen
4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Shannon
b6cbd521ce Merge branch '6.1.2' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-20 16:06: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 Deminick
76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Morten Christensen
2a2e867784 Fxies U4-2257 2013-06-02 11:30:27 -02:00
Shannon Deminick
160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled 
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
 2013-05-30 21:21:52 -10:00
Shannon Deminick
d976fbe4de Merge with 6.0.3 2013-03-22 22:03:50 +06:00
Morten Christensen
4f81e06d3d Fixes U4-1894 by ensuring that all overloads of SetValue uses the IOHelper.SafeFileName 2013-03-22 14:18:45 -01:00
leekelleher
37860b4015 Replaced all hard-coded GUID references to use the new Constants. 2013-03-14 22:00:37 +00:00
Shannon Deminick
010893a73a Fixes: #U4-1822, #U4-1797 - Is helpers and indexes on result collections using IPublishedContent or DynamicPublishedContent were incorrect, 
added unit tests to support issues and fixes.
 2013-03-02 01:02:38 +06:00
Shannon Deminick
a17a11d50b Fixed: #U4-1810, pretty much finished the examine management dashboard. 2013-03-01 03:04:29 +06:00
Shannon Deminick
5b15218174 Merge with 6.0.1 2013-02-26 01:05:36 +06:00
Morten Christensen
48ee59b94e Adding check related to U4-1757 2013-02-25 14:57:43 -01:00
Morten Christensen
ec4b1c8f70 Fixes U4-1689 and U4-1719. 
Refactoring UmbracoImageMediaFactory so it uses the extension method for uploading/setting images, so its a bit more DRY.
 2013-02-19 11:06:00 -01:00
Morten Christensen
81021f5821 Part of the fix for U4-1689 
Adds an alternative to the naming of the media subfolders instead of using the PropertyId.
 2013-02-18 15:46:18 -01:00
Stephan
a995c9557c Core.Strings - new IUrlSegmentProvider 2013-02-18 08:31:00 -01:00
Shannon Deminick
1733e876c4 Merge with 6.0.1 2013-02-19 20:19:43 +06:00
Morten Christensen
1c7bb623f1 Implements the retrieval of ancestors, children, descendats and parent IMedia in the MediaService and as extensions to IMedia. 
Corresponds to the IMedia implementation of U4-1638.
 2013-02-09 11:12:51 -01:00
Morten Christensen
75de4e4e67 Implements the retrieval of ancestors, children, descendats and parent IContent in the ContentService and as extensions to IContent. 
Corresponds to the IContent implementation of U4-1638.
 2013-02-09 10:58:21 -01:00
Morten Christensen
ef20f228ec Correcting issue related to MediaXmlTest, which was fixed in v6. 2013-02-05 09:13:21 -01:00
Shannon Deminick
e8d924cd2c Merge with 6.0.1 2013-02-01 19:43:10 +06:00
Morten Christensen
39d45ba4b0 Fixes U4-1618 2013-02-01 08:21:44 -01:00
Sebastiaan Janssen
a11d924736 Fixes U4-1553 - YSOD when umbracoUrlName value is null 2013-01-26 15:50:53 -01:00
Morten Christensen
086a0811cb Refactoring GetCreator/WriterProfile extension methods to use the service rather then repository, as it seems to cause threading issues per our threading test. 2013-01-25 07:30:25 -01:00
Morten Christensen
23141e1e8c Fixing broken media tests after having added ToXml and saving of xml to ContentXml table in the MediaService 2013-01-24 12:25:48 -01:00
Morten Christensen
b17dcd2b56 Fixes U4-1516 by ensuring that referenced templates are deleted prior to deleting the actual template. 
Removing uncommented code from the Media class as well as from the ContentExtension class.
Added saving of Media Xml to MediaService upon saving.
Removing referenced media test from csproj as cs file was missing.
 2013-01-24 09:50:27 -01:00
Shannon Deminick
c8807c3798 Fixes: #U4-1530. Backports ContentExtension changes from 6.1 required for Examine and media. Added unit tests to support and enhanced old unit test for ToXml for content 
to test for more values to ensure nothing is broken. Updates ExamineEvents to ensure that no event binding occurs until the application is configured and the
database is ready. Updates ExamineEvents to ensure that data is indexed using the new 6.0 APIs, though this is a temporary fix and a better one will be implemented
in 6.1 since UmbracoExamine is in the source.
 2013-01-24 06:16:44 +03:00
Morten Christensen
72ff03f142 Fixes U4-1512 by using the same safe alias method as in the legacy code base. 
This should ensure that published content aliases has the same format as in v4.
 2013-01-22 08:44:06 -01:00
Stephan
b8ac74a05d fix merges 2013-01-28 09:02:28 -01:00
Stephan
a699d9e1de merge from 6.0.1 2013-01-27 16:02:59 -01:00
Shannon Deminick
36a5313336 Merge with 6.0.0 2013-01-25 06:19:14 +03:00
Shannon Deminick
fedcdcfcd5 Manually re-merged latest changes to ContentExtensions from 6.0 branch to include changes to check for 
UseLegacyXmlSchema
 2013-01-23 19:00:28 +03:00
Shannon Deminick
11964401c8 Merge 2013-01-23 18:54:42 +03:00
Shannon Deminick
48202cfa09 Merge with 6.0.0 2013-01-23 18:50:44 +03:00
Stephan
25c481b3ca merge with 6.0.0 2013-01-23 09:33:26 -01:00
Morten Christensen
749a872fec Fixes U4-1444 so HttpPostedFiles are now properly accepted through the SetValue method. 
Corrects an issue with the RootUrl in the PhysicalFileSystem.
 2013-01-14 11:02:12 -01:00
Morten Christensen
7e060d665b Renamed a few properties on the PropertyType object, as the original naming was confusing. 2013-01-08 07:38:54 -01:00
Shannon Deminick
8b49d2d377 Removes all MyGet dependencies for UmbracoExamine (since it is in the core now). 
Converts UmbracoContextService and UmbracoMediaService for UmbracoExamine to use the new data api's
to extract latest data. Currently had to hack a bit with a new class called LegacyLibrary because at the moment
we'll have a circular dependency with Umbraco.Web which needs to be fixed. Moves all Examine event management to
Umbraco.Web (again mainly because of circular dependencies, but makes sense to have it there). Fixes the ExamineEvents
to implement IApplicationEventHandler instead of IApplicationStartupHandler to ensure that all resolvers have been
initialized before attempting to initialize examine indexes. Updates Examine ILogService to use the LogHelper.
Adds some new ContentExtensions for IMedia since currently Examine needs xml structures, but have kept it internal.
 2013-01-05 22:46:50 +03:00
Morten Christensen
c98d906f36 Correcting a few formatting issues after importing patch. 2012-12-28 19:08:01 -01:00
Morten Christensen
e198f76356 Committing changes from randy.mccluer's pull request 2012-12-28 19:03:15 -01:00
Morten Christensen
39e2314102 Correcting merge issues. 
Fixing reset of published state in ContentRepository.
Correcting Querying tests after spacing has changed a bit.
 2012-12-21 09:45:34 -01:00
Morten Christensen
d816ac1125 Merge with 6.0.0 2012-12-21 08:38:43 -01:00
Morten Christensen
9d55fed6e7 Adding method to DataTypeService, which allows the retrievel of PreValues for a specific DataTypeDefinition. 
Updaitng ContentExtension to use configured thumbnail sizes for Upload-DataTypes.
 2012-12-20 09:06:08 -01:00
Morten Christensen
b368debfb4 Adding extension to IContent and IMedia that allows you to set a HttpPostedFile, HttpPostedFileBase or HttpPostedFileWrapper as the value for a property. 2012-12-20 08:53:28 -01:00
Morten Christensen
30d7381ee3 Correcting all usages of getProperties to GenericProperties since its marked as Obsolete and shouldn't be used anymore. 
Starting refactor of legacy Content class.
Refactoring DefaultData to use new datalayer.
Updating usages of the ServiceContext after as its no longer a singleton.
Correcting a few merge issues.
 2012-12-17 11:16:09 -01:00