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

1565 Commits

Author SHA1 Message Date
perploug
cb06b97d69 Making propertyeditor and attribute public 2013-09-05 11:13:22 +02:00
Shannon
838788c270 Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/ 2013-09-04 13:18:23 +10:00
Shannon
e5633df6c3 Added pre-vals for the file upload property editor (backwards compatible format) and fixed saving a data type. 2013-09-03 18:28:14 +10:00
Shannon
70eb3e8613 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Controllers/RegisterController.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-03 17:30:08 +10:00
Shannon
7c9f5eda9d Fixes up more permissions checks, refactors MediaController.PostAddFile to use the correct WebAPI usage. Fixes issue with UmbracoClientManager throwing errors because the treeProps didn't include all called props. 2013-09-03 16:35:36 +10:00
Shannon
f0a2bfdea4 Updates EntityController with corrected permissions checking, updated media controller with correct permissions checking, added unit tests for the permisions filters. 2013-09-03 13:59:25 +10:00
perploug
623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
Sebastiaan Janssen
35c7b224bd Fix merge issue 2013-09-02 12:49:01 +02:00
Sebastiaan Janssen
437408464f Merge branch '6.1.5' into 6.2.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-02 12:29:47 +02:00
Sebastiaan Janssen
173ac65eb5 Remove misleading comment as this has been moved out of the if statement 2013-09-02 11:41:13 +02:00
Sebastiaan Janssen
7c28e1aeba Fixed U4-2763 Content rollback generates duplicates 2013-09-02 10:56:42 +02:00
Shannon
5cd04b5c9e Got lots of the default values configured with unit tests, still need to finish the rest though. 2013-09-02 16:36:47 +10:00
Shannon
5989d19f7f Re-fixes the issue with using IDataValueSetter.SetValue on the DefaultData implementation and ensures that when there is a null value that it reverts to an empty string since this was what the default value was in the Value getter of DefaultData when there was no value. Have added a couple unit tests to support. 2013-09-02 13:27:48 +10:00
Sebastiaan Janssen
2111a5e31e Fix MySQL install failing on UmbracoServer table 2013-09-01 17:28:22 +02:00
Sebastiaan Janssen
c3ef39661b Fix MySQL install failing on UmbracoServer table 2013-09-01 17:21:19 +02:00
Morten Christensen
5640daff32 Fixes U4-2752 ContentService.DeleteVersion and DeleteVersions fail 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-08-31 19:19:25 +02:00
Shannon
7806762b80 Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase. 2013-08-31 11:28:19 +10:00
Sebastiaan Janssen
fbfdd8d398 Bump version number 2013-08-30 12:00:33 +02:00
Shannon
2b408df24c Fixes: U4-2727 PluginManager's TypeList can contain duplicates - updates the locks to be upgradeable read locks, changes over all lists/collecitons to be HashSet<T> this ensures no duplicates and also improves performance. 2013-08-30 10:51:06 +02:00
Sebastiaan Janssen
3a4a6579d3 Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-30 10:40:29 +02:00
Shannon
c228c24ba5 Creted MergeParentContextViewData filter, this is by default applied to SurfaceController's and the PartialViewMacroController. Now if you are rendering a partial view macro or a child action from a SurfaceController and are putting data into ViewData on a POST, you don't have to access the ViewData from the ParentViewContext. 2013-08-30 12:03:16 +10:00
Sebastiaan Janssen
23517d0c36 Argh, starter kit is hardcoding a content type, so I have to register the new member type with a different Id 2013-08-29 16:10:23 +02:00
Sebastiaan Janssen
4ef10c8afe Install a default member type during initial setup 2013-08-29 13:54:30 +02:00
Shannon
52700c0c18 Fixes: U4-2730 500 - PostSave 2013-08-29 17:26:18 +10:00
Shannon
733b6aa945 Completes: U4-2742 Remove legacy xsltExtensions.config - xslt extensions are configured using attributes 2013-08-29 17:14:34 +10:00
Shannon
89324370b4 Completes U4-2415 Remove legacy RestExtensions and restExtensions.config 2013-08-29 15:50:48 +10:00
Shannon
f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
 2013-08-29 15:18:19 +10:00
Shannon
2e747caa10 Fixes: U4-2727 PluginManager's TypeList can contain duplicates - updates the locks to be upgradeable read locks, changes over all lists/collecitons to be HashSet<T> this ensures no duplicates and also improves performance. 2013-08-29 13:33:01 +10:00
Shannon
357dc6ec8e Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-29 12:27:49 +10:00
Shannon
232c81543a Fixes the rest of U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 12:11:48 +10:00
Shannon
9fc3efd73a Fixes U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 11:59:07 +10:00
perploug
8a9f38f97c Adding GetByIds to mediaService.cs 2013-08-28 20:57:42 +02:00
Sebastiaan Janssen
02566589fe Added admin permission for change doctype action to the OOB installer 2013-08-28 17:52:44 +02:00
Sebastiaan Janssen
f26d759c84 Moved controllers and models as per Shannon's suggestion 
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
 2013-08-28 13:36:04 +02:00
Shannon
4b4fc037dd Fixes up pre-value formatted data so it doesn't include ID in the value since this confuses things. 2013-08-28 18:52:00 +10:00
Shannon
0ebe9ec0fa Updated some of the property editor API to ensure that when formatting data for persistence we have access to the pre-values as well since these might need to be used to format the persisted data. Completed the new property editor: Multiple text box and it is saving the data in a backwards compatible format. Changed the internal AsDictionary method of the pre value collection to be a public method called FormatAsDictionary. 2013-08-28 17:53:31 +10:00
Sebastiaan Janssen
8274883fa5 Bump version number to 6.2.0 2013-08-28 09:09:21 +02:00
Shannon
79ab84a793 Fixes some issues with pre-values with the previous changes made to include the IDs of the pre-values, needed to ensure they are formatted incoming/outgoing properly so the id isn't included. 2013-08-28 14:45:33 +10:00
Shannon
cb368b4335 Implemented the numeric property editor 2013-08-28 13:30:05 +10:00
Shannon
d257835cb5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-08-28 11:08:23 +10:00
Shannon
dedaa2125d Fixes up a few issues found with media uploading 2013-08-28 10:45:50 +10:00
Shannon
76666a4c67 Lots more done on the multi-value property editors like drop down list, check box list, color picker in regards to the pre-value editor and ensuring correct validation is done on the server side including some unit tests. Also allows for updating values not just removing and adding. Now need to make a directive of it so we can customize more for the color picker. 2013-08-27 17:33:11 +10:00
Shannon
3e95b0468f Checkbox list property editor is now working. 2013-08-27 13:18:47 +10:00
Morten Christensen
37d190c97d Implementing read-only DTOs for improved reading of Members from db. 
Started implementation of Member, MemberType and MemberGroup repositories.
 2013-08-26 16:59:41 +02:00
Morten Christensen
f1818aae1b Updating the Profile and Member classes 2013-08-26 16:58:08 +02:00
Shannon
86a82a666f Got all drop down editors working: normal, multiple, normal publishing keys, multiple publishing keys and should be backwards compatible. 2013-08-26 19:00:04 +10:00
Shannon
3708b0de65 Got value editors being able to handle 'object' not just string so we can post and return json structures directly to the angular editors, got the multiple drop down list working and saving data. U4-2704 Change property editor value editor to return/receive object instead of string 2013-08-26 18:03:35 +10:00
Shannon
5b289a4971 Implemented much more for the new drop down property editors to ensure backwards compatibility, had to implement a new required method for property editors to format their data for cache storage. Changed how the drop down angular list is generated, now it uses a dictionary which is much more elegant with less code. Got drop down (normal) and drop down publishing keys working and saving the correct data types, nearly have drop down list multiple working but going to change the property editors to be able to post object (json) instead of just a string for values. 2013-08-26 17:24:08 +10:00
Shannon
2157942b38 Adds GetAllUsers to the UserService and converts the call in the UserController (and removes the need for User model mapper as we just use auto-mapper now). U4-2720 Add a get all users method to the UserService 2013-08-26 11:26:58 +10:00
Sebastiaan Janssen
d21f10ec1e Db migration to allow admins to change the document type 2013-08-25 17:14:01 +02:00