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

1978 Commits

Author SHA1 Message Date
Shannon
8dab2148f1 changes TinyMCEv3Alias to just TinyMCEAlias but unfortunatey we cannot change the actual alias stored in the db because we're already in RC - that means that people will forever see TinyMCEv3 as the property editor alias :( even though it is already v4 2013-11-14 13:39:03 +11:00
Shannon
86c996efb8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-14 10:51:52 +11:00
lars-erik
d8debf6789 Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use PackagingService.ImportTemplates. 
Fixed nullreference bug in ImportTemplates when used with XElement("Template"). (Added test for case with one template only)
 2013-11-13 14:27:05 +01:00
Shannon
8dbdd67c98 Reverted CleanStringForSafeFileName to the original name that doesn't strip unnecessary characters. 2013-11-13 12:33:03 +11:00
Shannon
d0c5dd208f Reverted to Newtonsoft.Json 4.5.11 2013-11-13 11:28:14 +11:00
Shannon
c52e0cbb65 Added GetTemplateNode and FindTemplateInTree to the IFileService 2013-11-13 11:05:08 +11:00
Shannon
9e8286bda9 Adds ability to query the template tree (hierarchy) with the template repository + unit tests. 2013-11-13 10:59:36 +11:00
Shannon
2129ac8241 Adds template repository tests, updates template repo business logic to be able to delete the whole template tree, updates some script repo tests too. 2013-11-12 22:28:43 +11:00
Shannon
a532b49485 Fixes: U4-3482 keepUserLoggedIn setting ignored? and streamlines some of the auth methods. 2013-11-12 17:38:32 +11:00
Shannon
e7201b6a69 Fixes: U4-3485 Can't use membership provider functions with a membertype that contains a "Belle" property editor 2013-11-12 16:07:53 +11:00
Shannon
c0037a40c6 Fixes a unit test - before if the packager could not resolve a legacy data type because the ids were not valid, it would just ignore that properly, now it logs warnings and just converts to a label property. 2013-11-11 18:17:49 +11:00
Shannon
0be60a5c88 Fixes: U4-3466 Deleting Document Type with children fails 2013-11-11 15:09:26 +11:00
Shannon
367cdde35e Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/umbraco.cms/businesslogic/workflow/Notification.cs
 2013-11-08 08:55:22 +11:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
Morten Christensen
f9a86385b5 Rearranging the create schema extensions methods to provide a bit more flexibility for external usage. 2013-11-07 14:03:34 +01:00
Morten Christensen
b8f7df1a96 Fixing the broken stylesheetrepository test and ignoring the StylesheetRepository in the RepositoryResolverTest for the time being as it takes two different UOWs as opposed to other repositories. 2013-11-07 13:33:49 +01:00
Morten Christensen
3ba50e7bae Merge pull request #176 from pynej/add-stylesheet-ids 
Fix for missing Id's on FileService.GetStylesheets() call.  This is need...
 2013-11-07 03:41:33 -08:00
Shannon
bacdcb7abf updates some more logic when saving macro properties to always try to map to the new ones if legacy aliases are used. 2013-11-07 16:07:08 +11:00
Shannon
d9abbd4232 Fixes: U4-3437 Deleting a macro with parameters causes YSOD 2013-11-07 15:16:18 +11:00
Shannon
3d6eea9470 Fixes: U4-3350 Content Validation: Can't get rid of DateTime error 2013-11-07 14:58:41 +11:00
Shannon
fad84ac0bb Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/members/EditMember.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-11-07 12:30:28 +11:00
perploug
ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
Sebastiaan Janssen
11c02eba49 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 09:05:56 +01:00
Sebastiaan Janssen
2617124ee8 Bump version to RC 2013-11-05 09:05:41 +01:00
Stephan
74df45a056 U3-3314 - refactor 4895b5a 2013-11-05 09:01:11 +01:00
Shannon
787f304de7 Adds GetByKey to entity controller/repository/service, fixes: U4-3263 Member picker isn't working as expected 2013-11-05 13:23:27 +11:00
Tim Geyssens
4895b5a2a8 Fixes U4-3314 Doctype property alias doesn't auto generate camelcase but does pascalcase instead 2013-11-04 15:00:13 +01:00
perploug
102bf79320 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 14:58:42 +01:00
perploug
f342b80e86 Fixes installer issue on CE 2013-11-04 14:56:56 +01:00
Stephan
dca0c85db5 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-11-04 12:54:07 +01:00
Shannon
8d7456dfe7 Fixes: U4-3309 Dashboards cannot have multiple area elements 2013-11-04 22:12:17 +11:00
Shannon
365eb6497f Fixes an issue with packaging service with property alias changes which fixes part of another test and I think the issue per was having with package installs 2013-11-04 18:12:37 +11:00
Shannon
5006115b2d Fixes object extensions and tests 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
 2013-11-02 15:20:04 +11:00
Shannon
a348177126 Fixes object extensions and tests 2013-11-02 15:18:08 +11:00
Shannon
5836c061fa Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
 2013-11-02 13:03:46 +11:00
Stephan
058cec7551 Cache AspNet hosting permission level 2013-11-01 16:57:31 +01:00
Stephan
2671709991 U4-2518 - issue with virtual dir named Umbraco 2013-11-01 09:53:50 +01:00
Shannon
20c624915f Fixing up more unit tests - still a bunch more to do 2013-11-01 18:12:23 +11:00
Shannon
ac2d8633af Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-11-01 18:07:18 +11:00
Shannon
76bc312842 Fixes an issue with empty string conversions to date time - should fail 2013-11-01 18:06:58 +11:00
Shannon
e4bd459da4 Completes: U4-2666 Change the drop down for selecting an icon/thumbnail for doc/media types to display the new list of icons to choose from 2013-11-01 17:18:57 +11:00
Shannon
083ca23d93 Fixes: U4-3290 PackageBinaryInspector returns error during install 2013-11-01 17:10:01 +11:00
Shannon
b2c5d7270e Fixes: U4-3286 Using a custom aspx page that inherits from UmbracoEnsuredPage seems to log you out - moves the authentication/ticket logic to one central place, now for all base page validation requests if the ticket is not already there it will attempt to authentication the request. This only occurs when a page is being loaded that requires back office authentication but is not part of the umbraco back office route (so packages mainly) 2013-11-01 15:37:59 +11:00
Shannon
59a81f4d12 Fixes: U4-2852 Create dialog with legacy implementations. 2013-11-01 14:46:33 +11:00
Shannon
c1f35e6991 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-01 09:07:04 +11:00
Stephan
767719357e U4-3279 - better exception message when failing to find a content type 2013-10-31 18:28:49 +01:00
Stephan
7b29bd67f3 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-10-31 15:29:16 +01:00
Shannon
acb2e58a5c Completes: U4-3067 Send to publish not implemented 2013-10-31 18:28:02 +11:00
Shannon
523c48d4fd Nearly have send to publish working, it's all wired up in the UI to the controller, just need to implement the logic. 2013-10-31 18:17:30 +11:00
perploug
81d2aac0d2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-30 19:35:02 +01:00