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

6751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
f6f6da2f21 Tree icons update 2013-09-03 14:26:04 +02:00
perploug
0175bb0d9e IAction icons update 2013-09-03 14:26:03 +02:00
Shannon
c40e4fed87 Got the file upload making thumbs based on pre-vals - U4-2778 FileUploadValueEditor - need to create pre-values like we had in v6 including thumb sizes. 2013-09-03 18:33:17 +10:00
Sebastiaan Janssen
21954f7bc6 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-03 10:31:17 +02:00
Sebastiaan Janssen
25d2b56ed7 U4-2776 Default Content For A Razor Layout Section 2013-09-03 10:31:00 +02: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
eeeb99b3b5 Fixes U4-2738 Collection Disposal issue when deploying 6.1.4 on Windows Server 2008 (Random, environment specific) 2013-09-03 17:19:31 +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
Shannon
aee521ce1a Fixes: U4-2770 Legacy content dialogs doesnt render and removes a file that shouldn't have been committed. 2013-09-03 12:27:48 +10:00
perploug
020623acd3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-02 17:09:16 +02:00
perploug
427efcdfe2 stadard icon sizing 2013-09-02 17:08:59 +02:00
perploug
9f4ac8a1af image picker multiple select toggle 2013-09-02 17:08:48 +02:00
perploug
ede8f837a0 media picker item html 2013-09-02 17:08:27 +02:00
perploug
5c6578c06b recommit iconpicker 2013-09-02 17:08:15 +02:00
perploug
9a33849f6e Auto resize image on insert 2013-09-02 17:08:04 +02:00
Morten Christensen
008d413302 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
 2013-09-02 15:55:05 +02:00
Morten Christensen
186d5157ec Implementing the read only side of the MemberType/MemberTypeRepository. 
PropertyTypes and PropertyGroups are loaded as part of the MemberType in one go.
MemberTypeRepository uses the same approach as the ContentTypeRepository and MediaTypeRepository for saving/updating.
Refactoring how the 9-PropertyType convention is handled.
 2013-09-02 15:53:09 +02:00
Anders Stentebjerg
5b2705181b Styling Mediapicker dialog 2013-09-02 15:44:41 +02:00
perploug
c49ee0da7a Mocks merge 2013-09-02 15:43:33 +02:00
perploug
623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
perploug
26da26fe8d add icon picker dialog 2013-09-02 15:34:48 +02:00
perploug
2a0878a071 move markdown editor to umbraco.packages module 2013-09-02 15:34:35 +02:00
perploug
551c7b38b7 rte tweaks 2013-09-02 15:34:14 +02:00
perploug
0f108eb842 seach headline 2013-09-02 15:34:07 +02:00
perploug
f4310687ea tree search css 2013-09-02 15:33:23 +02:00
perploug
fa6c9b3ba4 image helper for resizing 2013-09-02 15:33:08 +02:00
perploug
5713226297 add umbraco.package module 2013-09-02 15:32:55 +02:00
perploug
2324e4f810 Media mocks 2013-09-02 15:32:31 +02:00
Anders Stentebjerg
350d90e9a3 Changed from Font Awsome to Helveticons + custom Umbraco icons 2013-09-02 14:47:31 +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
Shannon
dc05b10f46 Added more config defaults + unit tests 2013-09-02 19:54:31 +10:00
Shannon
30b42332e1 Completes: U4-2434 Remove legacy webservices and config section from umbracoSettings 2013-09-02 19:46:31 +10:00
Shannon
a5f31dba1a moved tests into diff files 2013-09-02 19:44:02 +10:00
Shannon
6367b33980 Updated more default config values with unit tests. 2013-09-02 19:42:51 +10: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
6fd091b7a3 Added a lot more defaults to the config section + unit tests to test the default values. Removed the web services config: U4-2434 Remove webservices config section from umbracoSettings - then need to remove the webservices themselves. 2013-09-02 18:49:00 +10:00
Morten Christensen
969dece8fc Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-02 09:53:42 +02:00
Shannon
6bf0a255b6 updated case 2013-09-02 17:44:56 +10:00
Shannon
b99c29b404 changing file name to change case 2013-09-02 17:44:41 +10:00
Shannon
a99794c34c Fixed up a couple things based on code review 2013-09-02 17:43:56 +10:00
Shannon
0be1604163 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-02 16:37:02 +10: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
Shannon
da1c33a034 Fixes unit test 2013-09-02 12:57:56 +10:00
Sebastiaan Janssen
2111a5e31e Fix MySQL install failing on UmbracoServer table 2013-09-01 17:28:22 +02:00
Sebastiaan Janssen
5478de911b Merge pull request #115 from stocksr/6.2.0 
U4-516 - Fix DatePicker with time default value
 2013-09-01 17:24:03 +02:00