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

2347 Commits

Author SHA1 Message Date
Shannon
ff602da0fa Updates owin packages and updates the web.config tempate for owin redirects 2015-04-01 13:41:45 +11:00
Shannon
d9cf9cee88 Includes nice social buttons, updates styling on login and user panel, updates logic to un-link accounts 2015-04-01 13:41:40 +11:00
Shannon
afa4c7b697 open id connect is working with azure ad 2015-04-01 13:41:38 +11:00
Shannon
a2a8c8fbd7 updated to latest owin 2015-04-01 13:41:36 +11:00
Shannon
52c4d80cfc more identity awesome 2015-04-01 13:41:33 +11:00
Shannon
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
Shannon
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
Shannon
927add6f44 Updates UmbracoBackOfficeIdentity to add claims and adds a new ctor so people can create an identity manually - this is really the key, by doing this we'd already be able to have 3rd party authentication happening. Ensures our custom secure data format persists the user data 2015-04-01 13:41:21 +11:00
Shannon
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
Shannon
028ddfe290 Starts adding asp.net identity 2015-04-01 13:41:13 +11:00
Shannon
74f4b60a21 Merge branch 'dev-v7' into 7.3.0 2015-03-31 14:04:49 +11:00
Shannon
cd3191012f Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
 2015-03-27 15:15:49 +11:00
Shannon
12fd5c642d Fixes a copy local and specific version ref for a webapi assembly 2015-03-27 12:47:48 +11:00
kgiszewski
6419f301f7 Fix for U4-6462 2015-03-25 16:30:47 -04:00
Sebastiaan Janssen
e775471013 Set disableFindContentByIdPath=false for local debugging of Umb source (the release config was already correct) 2015-03-25 17:08:53 +01:00
Sebastiaan Janssen
9dfccd86fd U4-2499 Remove the possibility for accessing pages with nodeid's or give a redirect option 
#U4-2499 Fixed Due in version 7.2.5
 2015-03-24 20:09:48 +01:00
Shannon
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
Arnoud de Vries
e3925f18ef Fix some spelling mistakes in package installer 2015-03-22 16:29:53 +01:00
Sebastiaan Janssen
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
Sebastiaan Janssen
907e5e7ca4 Bump version 2015-03-20 11:25:59 +01:00
Shannon
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
Sebastiaan Janssen
90fdbb007e Bump version 2015-03-19 14:45:00 +01:00
Sebastiaan Janssen
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Shannon
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
Shannon
e004ad31b5 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
 2015-03-19 11:36:05 +11:00
Shannon
6cf25f0043 Fixes: U4-6428 Grid configuration does not support virtual paths - and therefore is not compatible with virtual directories 2015-03-19 11:35:04 +11:00
Shannon Deminick
8cefe22bee Merge pull request #649 from protherj/grid-rendering-quote-fix 
Changed the surrounding quotes for Grid custom settings/styles to be double quotes
 2015-03-18 19:55:32 +11:00
Stephan
6856f9f341 Merge pull request #654 from umbraco/U4-274-disable-alttemplate 
U4-274 - Adds config option to disable alternative templates
 2015-03-17 14:32:08 +01:00
Sebastiaan Janssen
d24ef3650e U4-274 - Adds config option to disable alternative templates 2015-03-17 13:50:33 +01:00
Stephan
4974e2a2ce U4-6306 - hostname validation issue 2015-03-16 10:52:54 +01:00
Shannon
4544520b66 Fixes: U4-6303 SaveAndPublishWithStatus error - updates to latest Examine with the fix. 2015-03-09 15:06:32 +11:00
Sebastiaan Janssen
97a085d12b Bump version 2015-03-03 20:19:41 +01:00
Shannon
36bed40db0 typo 2015-03-03 17:37:42 +11:00
Shannon
f708a24401 fixes U4-6333, U4-6348 2015-03-03 17:36:53 +11:00
Jason Prothero
32bedfaa6a Changed the surrounding quotes for Grid custom settings/styles to be double quotes 2015-02-27 10:06:45 -08:00
Shannon
0ae1453fb1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/umbraco.cms/businesslogic/Dictionary.cs
 2015-02-23 13:18:01 +01:00
Shannon
2da3ec27db fixes punycode reference 2015-02-19 14:55:00 +01:00
Shannon
5342d819d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-02-18 17:40:29 +01:00
Shannon
b2399e97cc updates cdf refs 2015-02-18 17:39:33 +01:00
Shannon
4eef90fe25 Merge remote-tracking branch 'origin/dev-v7-7.1.3-BetterXmlCacheFilePersisting' into 7.3.0 2015-02-17 15:15:29 +01:00
Shannon
428df7ae4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-02-17 15:11:10 +01:00
Sebastiaan Janssen
25cfceadc0 Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2015-02-17 10:46:36 +01:00
Shannon
c7778467e3 Updates to latest examine version which internally supports tokenized paths in config so we don't need to do this in the umbraco core. 2015-02-13 15:34:54 +11:00
Shannon Deminick
c0dd32d1f9 Merge pull request #625 from bjarnef/dev-v7-U4-4418 
U4-4418 - fix issue with tab sorting
 2015-02-13 11:13:46 +11:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Nathalie Larsson
788ed68b5b Changes to lang config, notifications area - Sv 2015-02-09 15:47:16 +01:00
Stephan
e12984af4c refactor latched background tasks, now use a task for xml 2015-02-08 16:25:30 +01:00
Stephan
6d08d9b7b0 Merge branch 'dev-v7' into 7.3.0 2015-02-03 20:08:46 +01:00
Shannon Deminick
b5696de71e Merge pull request #629 from AndyButland/u4-6183 
U4 6183 - Only allow change document type to types that would allow the existing children to be created under them
 2015-02-02 18:16:37 +11:00
Shannon
b899ab6557 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:49:58 +11:00