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

1177 Commits

Author SHA1 Message Date
Shannon
e962e86c3c Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-09-10 11:49:05 +10:00
Shannon
41766d7738 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 2013-09-10 11:29:11 +10:00
perploug
6bc8713b7f Remove vaue->value typo in all files 2013-09-09 15:26:22 +01:00
Sebastiaan Janssen
58ba7d2d6d Fixes U4-502 TextString/TextBox multiple don't accept polish Ś character 2013-09-08 21:29:20 +02:00
Sebastiaan Janssen
edd9aa80ae Fixes U4-489 Installer, link to folder permission video broken 2013-09-08 21:18:00 +02:00
Sebastiaan Janssen
7ddb77db66 Fixed U4-576 Umb 4.7.x - Dashboards 2013-09-08 21:06:22 +02:00
Sebastiaan Janssen
303c1e16b8 Change document type did unnecessary checks on root node which resulted in YSOD 2013-09-06 16:17:08 +02:00
Shannon
b3ec44b61d Getting all the unit tests working again with the GUID to alias change, lots of little fixes everywhere. 2013-09-06 17:50:31 +10:00
Shannon
cf6a3cdfef A bunch more work done to convert the GUID -> alias for prop eds 2013-09-06 16:00:35 +10:00
Shannon
78741bf134 more work on removing the GUID requirement for prop editors, removes legacy editDataType webforms editor (U4-2801 Remove legacy/un-used editDataType.aspx webforms editor) 2013-09-06 15:27:38 +10:00
Shannon
038780614c Re-deletes files that should not be committed! Seriously WHY DOES THIS KEEP HAPPENING??! Have updated the ignore to try and stop this 2013-09-05 14:38:22 +10:00
perploug
cab92d203e Delete contour files checked in by mistake 2013-09-04 21:08:48 +02:00
perploug
8e93cfa94d merge 2013-09-04 16:00:30 +02:00
Shannon
b105bd305b Ok, getting pretty close to making those legacy tree dialogs work. 2013-09-04 18:10:57 +10:00
Shannon
be9c3b8996 Got a solution for legacy dialog trees with the new format trees, just committing all of the work in case i need to come back and reference some stuff I'm about to remove. 2013-09-04 17:36:05 +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
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
ede8f837a0 media picker item html 2013-09-02 17:08:27 +02:00
Anders Stentebjerg
5b2705181b Styling Mediapicker dialog 2013-09-02 15:44:41 +02:00
perploug
623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
perploug
2a0878a071 move markdown editor to umbraco.packages module 2013-09-02 15:34:35 +02: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
Sebastiaan Janssen
e9b9fb15c1 Can't install starterkits message was always showing, even if install folder was present 2013-09-01 16:47:28 +02:00
Sebastiaan Janssen
3d4b54064f I love managing files in csproj files.. NOT. 2013-09-01 15:32:55 +02:00
Sebastiaan Janssen
14303fab0c File move didn't make it into the csproj file previously, leading to build errors. Fixed! 
Also changed default PartialView template and added another Empty one
 2013-09-01 15:05:17 +02:00
Sebastiaan Janssen
262ef8d305 Merge pull request #115 from stocksr/6.2.0 
U4-516 - Fix DatePicker with time default value
 2013-09-01 05:34:18 -07: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
perploug
c7c3bb6183 Forgot to update the dashboard.release.config 2013-08-30 12:29:48 +02:00
perploug
e921c670dd Another missing package file 2013-08-30 10:54:28 +02:00
perploug
a057e9bcbd Missing file in vs csproj 2013-08-30 10:32:31 +02:00
perploug
d004d529b7 New dashboard using angular 2013-08-30 10:17:46 +02:00
Shannon
9b56c7eab6 Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse 2013-08-30 14:15:51 +10:00
Stephan
c62689450b Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-08-29 17:28:46 +02:00
Stephan
0ed4c1868b U4-2549 - fix it differently 2013-08-29 17:08:16 +02:00
Sebastiaan Janssen
2238f81d83 Oops, accidentally killed creating a partial view from the backoffice as it's also using PartialViewTasks.cs (like when you create a partial view macro) 2013-08-29 16:09:23 +02:00
Sebastiaan Janssen
4ef10c8afe Install a default member type during initial setup 2013-08-29 13:54:30 +02:00
Shannon
aa0fca5de9 Fixes small error with entityresouce, adds app based security to some of the entity controller methods, need to add diff sec checks to the other ones based on the type requested. 2013-08-29 20:15:08 +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
cd7f737fa6 Removes remaining references to the restExtensions.config 2013-08-29 15:55:58 +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
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
Stephan
3fc4f36859 U4-2549 - fix issue with last chance content finder 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-28 18:16:20 +02:00
Sebastiaan Janssen
49637e62fe Updated, more robust versions of the Member template/snippets 2013-08-28 17:52:06 +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
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