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

349 Commits

Author SHA1 Message Date
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
perploug
80d2407aab Updated user editors 2013-09-18 09:01:11 +02:00
Shannon
371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
 2013-09-17 00:27:17 +10:00
perploug
135701b845 change password dashboard form 2013-09-16 09:17:46 +02:00
Shannon
968c921829 Finished the new installer screen report, finished and tested the v7 db upgrade script which is working!! :) Changed over all package manifests to have an alias instead of a GUID. 2013-09-11 18:25:51 +10:00
Shannon
e75c050eff Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
 2013-09-11 13:07:22 +10:00
perploug
d5846a5a4c delete unneedded files 2013-09-10 18:01:52 +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
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
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
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
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
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
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
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
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
Sebastiaan Janssen
8274883fa5 Bump version number to 6.2.0 2013-08-28 09:09:21 +02: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
Sebastiaan Janssen
86276206d5 Add register member partial view macro template 2013-08-27 19:29:15 +02:00
Sebastiaan Janssen
53b6fb7b56 Add login template to partial view macros 2013-08-27 11:37:20 +02:00
Sebastiaan Janssen
d17b2cf884 Added ability to have predefined templates for Partial View Macros 2013-08-26 17:28:15 +02:00
Sebastiaan Janssen
76d0ffb797 Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-25 15:50:07 +02:00
perploug
b850cd68a1 csproj file updates 2013-08-23 12:22:37 +02:00
perploug
6c9f4c6353 Removes missing files from web.ui csproj 2013-08-21 09:32:50 +02:00
Shannon
0dab52e8f6 Fixes creating content: U4-2677 Fix content/media creation - now to fix media 2013-08-21 13:38:49 +10:00
Sebastiaan Janssen
e71fa681e6 Update build to v7 and include belle files 2013-08-20 14:18:02 +02:00
perploug
55e74eba39 Fixing the folder uploader for media section 2013-08-16 15:41:13 +02:00
Shannon
d7fd1efd60 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
 2013-08-13 18:22:45 +10:00
Shannon
bfabfd9fa5 Updated to latest Examine version (contains bug fix for U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8) and removes the partially trusted callers attribute from the PDF lib because itextsharp by default doesn't support med trust. 2013-08-13 15:41:40 +10:00
Shannon
a1b6917c10 Changes the port back to what it should be 2013-08-09 13:39:17 +10:00
Per Ploug
2ca894f605 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-07 13:48:21 +02:00
Per Ploug
55385d6374 Removes hardcoded reference to shannons users dir from sln file 2013-08-07 13:48:12 +02:00
Shannon
0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
 2013-08-07 10:29:34 +10:00
Sebastiaan Janssen
898d25f3cb Include lang files in project so they'll actually end up in the final build 2013-07-31 18:31:39 +02:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
 2013-07-31 18:52:14 +10:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Shannon
53891a69af Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want. 2013-07-23 16:43:08 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon
80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Sebastiaan Janssen
914005b2b6 Merge pull request #46 from michielvoo/u4-2417 
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-07-19 15:09:07 +02:00
Shannon
d3fe37a080 Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer. 2013-07-18 17:05:40 +10:00
Sebastiaan Janssen
60867af1a7 Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico 
Also fixes casing of folder names
 2013-07-15 16:31:19 +02:00