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

1958 Commits

Author SHA1 Message Date
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
Tim Geyssens
5ce6ec124a Adds member group picker prop editor to Umbraco.Web 2013-10-30 13:11:59 +01:00
perploug
e5879a4c70 Macro container 2013-10-30 10:54:23 +01:00
Shannon
e4f8f6ebd5 Fixes macro parameter form validation, adds the number parameter editor, updates the parameter editor mapping, adds more fixes to the number fixer and changes the integer property editor to use a type='number' 2013-10-30 15:45:16 +11:00
Shannon
46ba9718ff Changes the explicit paramet editor implementations to simply use the already created property editors, updates the legacy parameter editor mappings and adjusts the resolver to use the mappings if one is not found. 2013-10-30 14:36:07 +11:00
Shannon
68b955e611 Fixes isDialog mode trees, creates content picker parameter editor, ensures the tree dialogs are all isdialog=true, fixes property editor resolution that are parameter editors. 2013-10-30 14:12:06 +11:00
Shannon
95d98b132a Updates installer to not install some data types that we're not shipping with, fixes up some mappings, changes the simple editor convert to be the markdown editor converter (need to test that) 2013-10-30 08:59:28 +11:00
Shannon
abb28250f8 Updated property editors legacy -> new mappings 2013-10-30 08:31:22 +11:00
Shannon
3d7f7db396 Fixes some value conversions and updates the entity search to be more accurate 2013-10-29 18:46:12 +11:00
Shannon
d62aae0205 Fixes property editors that have default pre-values for those prevalues to show up when creating a new data type, fixes: U4-3147 Create tag supported property editors - and adds the tag group to the pre-values for the tag property editor. 2013-10-29 18:17:10 +11:00
Shannon
2b7a9389b4 Fixes: U4-3254 Property level validation not working when no field level validators are used 
U4-2683 Ensure all uploaded files are cleaned up when they change for the FileUploadValueEditor
U4-3252 File uploader needs to adhere to DisallowedUploadFiles config
U4-2774 FileUploadValueEditor needs to remove old files
 2013-10-28 15:34:48 +11:00
Shannon
fea90482b6 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web/Standalone/StandaloneBootManager.cs
	src/Umbraco.Web/UmbracoContext.cs
 2013-10-28 11:26:01 +11:00
Shannon
6cfb864055 Fixes DataTypeDefinitionRepository to properly delete a data type including it's pre-values 2013-10-28 11:23:09 +11:00
Shannon
7fd823c9e9 Fixes DataTypeDefinitionRepository to properly delete a data type including it's pre-values 2013-10-28 11:22:23 +11:00
Stephan
89c5d5d613 PublishedContent - get published properties to report the CLR type of the value 2013-10-28 01:09:34 +01:00
Stephan
c66d49dbfe PublishedContent - remove useles code in model factory 2013-10-28 01:07:17 +01:00
Shannon
ecf73a6230 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web/Mvc/UmbracoViewPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-10-28 11:03:14 +11:00
Shannon
a915dff4a8 Fixes packaging service up to export data type's properly, fixes legacy DataTypeDefinition to export data type's properly with the prop ed alias instead of id, obsoletes old content extension methods. 2013-10-28 11:02:04 +11:00