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

396 Commits

Author SHA1 Message Date
Tim Geyssens
8cd7f26431 Fixes U4-3190 Look for all umbraco.aspx references as there's still some buttons redirecting to there 
Using Sebs suggestion
 2013-11-04 11:01:13 +01:00
Sebastiaan Janssen
45d339928a Include missing System.Net.Http/System.Net.Http.WebRequest 2013-11-03 10:57:42 +01:00
Shannon
c722e57914 Moves the our umbraco web reference to where it needs to be. 2013-11-01 09:21:29 +11:00
perploug
ce509638e1 Added 7.0 starterkit feed to installer 2013-10-30 19:34:35 +01:00
perploug
e5879a4c70 Macro container 2013-10-30 10:54:23 +01:00
Shannon
e0c1b5cd8d Fixes merge issues 2013-10-18 11:39:51 +11:00
Shannon
b95575572d Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/UserDto.cs
	src/Umbraco.Core/NameValueCollectionExtensions.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Models/PasswordChangedModel.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.cms/businesslogic/member/Member.cs
	src/umbraco.providers/Properties/AssemblyInfo.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-18 11:33:38 +11:00
Shannon
0fee434ac2 Working on the password changer control to present the correct inputs based on the membership provider given.... nearly there. 2013-10-17 22:40:38 +11:00
Shannon
e94f8da3e8 removes the macro renderings ref 2013-10-17 11:28:39 +11:00
Shannon
6400e7988f adds a logout.aspx for legacy reasons in case an inline page redirects to there 2013-10-16 13:33:08 +11:00
Sebastiaan Janssen
14ba484fc1 Don't include release configs in final package 2013-10-11 12:11:47 +02:00
Shannon
42dd48a3d1 removed editmember.aspx 2013-10-11 17:32:04 +11:00
Shannon
937b308444 Streamlines form and form validation with new val-form-manager (replaces a couple of other directives). Fixes styling on the umb-content-name, removes the test MyPackage stuff from app-plugins. 2013-10-11 15:44:49 +11:00
Shannon
b512376c5c more member editor updates 2013-10-10 18:46:28 +11:00
Shannon
3c38b335a6 Converts DlrScripting & xslt to the correct webforms structure. 2013-10-09 12:07:50 +11:00
Shannon
d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-09 11:12:33 +11:00
Sebastiaan Janssen
0184b396be Whoops! Left a weird linebreak in there 2013-10-08 19:08:30 +02:00
Sebastiaan Janssen
8b2e2f8447 Create appSettings.config / connectionString.config if they don't exist yet 2013-10-08 19:00:57 +02:00
perploug
30f147a9d3 excluding appsettings and connectionstrings config 2013-10-08 10:27:22 +02:00
perploug
dd4827493b missing files in sln 2013-10-08 09:31:30 +02:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
perploug
f676ce6ac2 Remove missing file to unbreak build 2013-10-07 10:08:48 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
perploug
5060dab7a5 adds getpath to contentController 2013-10-04 14:01:07 +02:00
perploug
418a29cbbf Odd, missing config files crashed the site 2013-10-04 11:18:57 +02:00
perploug
0b907d4ae3 more work on link picker, added dialog service and views 2013-10-04 10:53:07 +02:00
Shannon
4d8a3f4453 Updated the proj file to create the appSettings, connectionString config files if they are missing, then we also ignore these files and remove them from the repo - just like the web.config 2013-10-04 12:15:35 +10:00
Shannon
961928105c Moves connectionStrings to external file, now to figure out how to deal with both of these files with multiple devs 2013-10-04 10:53:22 +10:00
Shannon
c6229f131a Moves appSettings to external file and updates the code that modifies the app settings. 2013-10-04 10:34:00 +10:00
Shannon
ff3aebd4b1 Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly 2013-10-04 10:01:57 +10:00
Shannon
ed8f22c371 Completes: U4-2829 Allow for JSON objects to be saved/retrieved by property editors - OH YEAH!! 2013-10-03 13:52:33 +10:00
Shannon
6ac724951b Explicitly adds automapper to the UI proj so we don't get that strange YSOD that says it's not there sometimes. 2013-10-03 12:18:21 +10:00
Shannon
89f7a31bef Updates the Create/AddMenu overloads to ensure a name is specified, fixes all localization of all menu items for all new trees. 2013-10-02 20:00:01 +10:00
Shannon
be7179b962 Fixed up the TagRelationshipDto to have the correct columns, keys, etc.. as our upgrade, updated the old tags API to support the new changes. 2013-10-02 17:10:12 +10:00
Shannon
7eee954d4d OOPS! didn't mean to delete this a couple days ago :P 2013-10-02 15:56:53 +10:00
Shannon
f7103c97cf Completes: U4-2768 Remove legacy/unused webforms files/classes in folder: /umbraco 2013-10-01 17:03:03 +10:00
Shannon
6f6c33a721 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/TestHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-10-01 13:38:17 +10:00
Sebastiaan Janssen
5238293c09 Merge branch '6.1.6' into 6.2.0 
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2013-09-30 16:09:25 +02:00
Sebastiaan Janssen
cdda69c4cd U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option 2013-09-30 12:39:28 +02:00
Sebastiaan Janssen
328ada2f38 Bump version number 2013-09-30 10:46:08 +02:00
Shannon
30095000e6 Updates to latest version of JSON.Net 2013-09-27 13:25:28 +10:00
Shannon
5d224cca9b Updates to latest version of Microsoft.Net.Http 2013-09-27 13:22:27 +10:00
Shannon
f5f25ed017 Completes: U4-2900 remove explicit declarations in web.config 2013-09-26 11:57:45 +10:00
perploug
b918462e40 Missing csproj files + minor css updates 2013-09-25 15:39:23 +02:00
Shannon
b2e2a2b004 removes the old skinning.config and updates the installer to not show that option. 2013-09-25 18:18:36 +10:00
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