71c24b7bf3
reverts proj change
2015-05-19 09:01:54 +10:00
6c218c3ab5
datatype controller methods for ct editor
2015-05-18 20:08:00 +02:00
64cbeb4c9d
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/Services/EntityService.cs
src/Umbraco.Core/Services/ServiceContext.cs
src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
src/umbraco.cms/businesslogic/template/Template.cs
2015-05-13 12:20:43 +10:00
a42526b890
This file just keeps being marked as "changed" by git, committing it so I don't have to discard changes all the time
2015-05-12 11:15:02 +02:00
4ebc0fe4cf
U4-6383 Download all translation tasks as XML Error
...
#U4-6383 Fixed Due in version 7.2.5
2015-05-11 21:33:52 +02:00
d2deaf0375
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
95ff94c532
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/packages.config
2015-05-11 12:26:53 +10:00
a4a49b1466
Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC.
2015-05-11 11:45:13 +10:00
3be1cd8b0d
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/packages.config
2015-05-07 16:24:29 +10:00
1cac4ed075
Fixes MVC 4.0.0.1 problem once and for all.
2015-05-07 08:10:45 +10:00
d01e963365
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
...
Conflicts:
src/Umbraco.Web.UI/packages.config
2015-05-06 17:28:05 +10:00
821daa82c4
Fixes: U4-6474 Update to latest examine v0.1.63
2015-05-06 17:14:10 +10:00
4144590189
Upgrade to latest MySql.Data and loosen up NuGet dependency
2015-05-05 12:15:28 +02:00
2f9753cc12
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/umbraco.presentation/content.cs
src/umbraco.macroRenderings/app.config
2015-05-05 12:27:01 +10:00
be065b2fa3
Generate symbols nupkg (apparently you can create it from an existing NuSpec file, very cool)
...
Making sure that all pdbs ARE actually generated in Release mode (the AllBinaries file was missing loads of files)
Generate all and include all xml doc files too
Corrects WebPI zip, also shouldn't include dotLess.Core.dll
2015-05-01 14:27:26 +02:00
624975b4c9
Updates to WebApi2, fixes nuspec to include the correct dependencies (and simplifies them)
2015-05-01 14:03:59 +10:00
f0dfd0dce2
U4-6568 NuGet 7.2.4 missing Microsoft.Threading.Tasks.dll and Microsoft.Threading.Tasks.Extensions.dll
...
#U4-6568 Fixed Due in version 7.2.5
2015-04-29 16:15:24 +02:00
a1c7352da1
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Integration/GetCultureTests.cs
src/Umbraco.Tests/Models/ContentTests.cs
src/Umbraco.Tests/Models/ContentTypeTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
src/Umbraco.Web/Models/ContentExtensions.cs
src/Umbraco.Web/Mvc/SurfaceController.cs
2015-04-09 16:50:07 +10:00
c525be3e44
Completes: U4-6474 Update to latest examine v0.1.62
2015-04-09 15:33:58 +10:00
5e90e74969
Merge branch '7.3.0' of https://github.com/umbraco/Umbraco-CMS into 7.3.0
...
Conflicts:
src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
2015-04-01 14:03:05 +11:00
bceed10bd8
Merge branch 'dev-v7-distcache' into 7.3.0
2015-04-01 14:00:13 +11:00
ad92006f54
Removes the extensibility files and build for identity stuff - that now exists in a separate github repo.
2015-04-01 13:42:43 +11:00
1de9dbf18c
Updates build process to include building a nuget Identity package to provide extensibility points in Umbraco.
2015-04-01 13:42:36 +11:00
394cab5ab4
Updates the owin startup classes - we now have a default one shipped as a DLL which will always execute based on the appSettings, then we can ship with 2 optional ones that people can learn and use from which just requires them to update the appSetting. Now to decide on how to ship these .cs files
2015-04-01 13:42:34 +11:00
140d3c0268
Update to latest Identity. Moves startup code to App_Start like VS templates have, this will be better for our nuget packages (like i do in UmbracoIdentity which works for both web apps and websites). Updates web.config to explicitly declare the owin startup otherwise we'll end up with conflicts (YSODs) and now people can configure it properly.
2015-04-01 13:42:26 +11:00
b67250c3d5
Updates back office auth extension methods to be explicit with specifying that it's for back office because we need to explicitly tell each provider the SignInAsAuthenticationType so that it uses the back office auth provider and not a user's own front-end one.
2015-04-01 13:42:14 +11:00
4d50dcea61
adds the auth extensions and removes all 3rd party packages
2015-04-01 13:42:02 +11:00
2d72a66879
Updates OwinStartup and split the methods into an extension methods file complete with documentation on how to implement the providers. Tested the microsoft provider. Now to clean things up: remove the 3rd party package installs to be ready for shipping, ensure that the user parts are extensible enough for people to plugin their own interfaces.
2015-04-01 13:41:50 +11:00
7dc50fda26
moves NaiveSessionCache to web proj
2015-04-01 13:41:48 +11:00
ff602da0fa
Updates owin packages and updates the web.config tempate for owin redirects
2015-04-01 13:41:45 +11:00
afa4c7b697
open id connect is working with azure ad
2015-04-01 13:41:38 +11:00
a2a8c8fbd7
updated to latest owin
2015-04-01 13:41:36 +11:00
8c51e8bad8
Implements IExternalLoginService and the db table, implements more logic to start enabling this to work in the back office, need to implement the rest of the userstore and then implement a way once logged in to the back office to allow users to link their accounts with external logins. Currently if an external login is detected during startup and it has not been linked we'll throw an exception. Very very close to making this all work nicely.
2015-04-01 13:41:26 +11:00
d4b21243ca
Allows external logins to be listed on login page, updates BackOfficeController with actions for invoking them.
2015-04-01 13:41:24 +11:00
93df2edec2
Initial install which now uses Identity middleware to perform the back office auth (no longer done in our module). Created custom data secure classes that use the legacy Forms auth logic for backwards compat. This means that the cookie can still be written the old way and still auth the new way if required. Now need to clean a lot of this up.
2015-04-01 13:41:16 +11:00
028ddfe290
Starts adding asp.net identity
2015-04-01 13:41:13 +11:00
12fd5c642d
Fixes a copy local and specific version ref for a webapi assembly
2015-03-27 12:47:48 +11:00
2c918a2015
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-24 15:10:45 +11:00
53a4d063e0
U4-464 The embedded passwordStrength.js file is GPL-licensed
...
#U4-464 Fixed Due in version 7.2.5
2015-03-22 13:13:51 +01:00
907e5e7ca4
Bump version
2015-03-20 11:25:59 +01:00
f15301a7a0
Merge remote-tracking branch 'origin/dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-20 08:26:16 +11:00
90fdbb007e
Bump version
2015-03-19 14:45:00 +01:00
311d503d8b
Updates CDF dependency to latest version
2015-03-19 12:54:00 +01:00
d3eff734aa
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Models/Template.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
src/Umbraco.Core/Services/LocalizedTextService.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Plugins/TypeFinderTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/Models/ContentExtensions.cs
src/Umbraco.Web/PublishedContentExtensions.cs
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
src/Umbraco.Web/Scheduling/Scheduler.cs
src/Umbraco.Web/Umbraco.Web.csproj
2015-03-19 17:37:00 +11:00
4544520b66
Fixes: U4-6303 SaveAndPublishWithStatus error - updates to latest Examine with the fix.
2015-03-09 15:06:32 +11:00
97a085d12b
Bump version
2015-03-03 20:19:41 +01:00
0ae1453fb1
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/umbraco.cms/businesslogic/Dictionary.cs
2015-02-23 13:18:01 +01:00
2da3ec27db
fixes punycode reference
2015-02-19 14:55:00 +01:00
5342d819d9
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
2015-02-18 17:40:29 +01:00
b2399e97cc
updates cdf refs
2015-02-18 17:39:33 +01:00
Shannon