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

4078 Commits

Author SHA1 Message Date
Shannon
d9f453d860 Gets the user store up to date with the correct queries. 2015-04-01 13:41:28 +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
48317d7e61 massively simplifies the cookie handling, we don't use our own and just use the defaults, the trick to not validating everything is to use the cookie path. This does mean that each clientside request will also be validated but there's no way to override this behavior in identity currently, the cookie handler is internal so unless we copy/paste all of it's code can't do much about that. 2015-04-01 13:41:18 +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
3d09157091 fixes build 2015-03-31 17:06:13 +11:00
Shannon
74f4b60a21 Merge branch 'dev-v7' into 7.3.0 2015-03-31 14:04:49 +11:00
Shannon
fb24becd0d completes: U4-6468 Move all 'Strategies' in the Web project that performs Core data operations to the Core project 2015-03-30 17:40:36 +11:00
Shannon
58857c5d83 Moves publishing strategies into CacheRefresherEventHandler where the event handlers are supposed to exist. 2015-03-30 17:36:54 +11:00
Shannon Deminick
0742108ec1 Merge pull request #662 from AndyButland/u4-6412 
U4-6412 - Ensures footer breadcrumb in content and media returned in correct order
 2015-03-30 10:44:08 +11:00
Shannon
5464107a9a replaces all LogHelper calls with to use ILogger in XmlCacheFilePersister 2015-03-27 15:21:12 +11:00
Shannon
fda72b2acc changes the MaxWaitMilliseconds tp 30000 to be consistent with the 7.3 branch 2015-03-27 15:19:31 +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
ec742d1f66 removes the usages of ILogger and ProfilerLogger since this is not for 7.3.0, will need to re-fix for 7.3 branch. 2015-03-27 14:56:12 +11:00
Shannon
4bdac1475f fixes log scrub interval with ms with updated background tasks 2015-03-27 14:52:38 +11:00
Stephan
58ce04e26b cleanup 2015-03-27 14:49:31 +11:00
Shannon
4c3de920c6 Removes the 'else' so that 'wait' is always checked. 2015-03-27 14:49:31 +11:00
Stephan
be37026587 refactor latched background tasks, now use a task for xml 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
 2015-03-27 14:49:25 +11:00
Stephan
a73b7a5849 refactor Scheduler to use new BackgroundTaskRunner capabilities 
Conflicts:
	src/Umbraco.Web/Scheduling/Scheduler.cs
 2015-03-27 14:48:47 +11:00
Stephan
b7436dc55f refactor BackgroundTaskRunner 2015-03-27 14:47:42 +11:00
Shannon
bc068b201d Updates BackgroundTaskRunner to ensure canceled or skipped tasks are disposed, updated tests to reflect 2015-03-27 14:47:42 +11:00
Shannon
912b01c9aa Updates BackgroundTaskRunner to support more complex options including the ability to only execute the last/final task in the queue. Added tests to support, updated the 'content' object to use this option so that only the last task in the queue will execute so that file persisting doesn't get queued but the correctly queued data will be written. 2015-03-27 14:47:42 +11:00
Shannon
a82035061c Updates BackgroundTaskRunner to support async operations. Updates the content xml cache file persisting to use a IBackgroundTask instead of the strange queuing for persistence - which was super strange because in many cases another request thread will actually be the thread that is persisting the xml file than the request thread that requested it created. This implementation is far better, the xml file will be persisted on a non request thread and will handle multiple documents being published at the same time guaranteeing that the latest published version is the one persisted. The file persistence is also web aware (due to how BackgroundTaskRunner works) so during app shutdown the file will still be written if it's currently being processed. 2015-03-27 14:47:41 +11:00
AndyButland
0c107fd869 Ensures footer breadcrumb in content and media returned in correct order 2015-03-25 21:52:39 +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
4e195543ea fixes null ref with component renderer in UmbracoHelper 2015-03-24 15:12:58 +11: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
Shannon
b02e0c0232 Fixes: U4-6433 Usercontrol loaded after package installation not executing 2015-03-20 17:47:33 +11: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
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Stephan
3b2ae6bc4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web/Models/ContentExtensions.cs
 2015-03-19 09:39:31 +01:00
Stephan
5ddcf42bc3 U4-3753 - keep some things internal 2015-03-19 09:37:39 +01:00
Stephan
b714cbbd72 U4-6320 - fix log scrubbing intervals (from dev-v7) 2015-03-19 09:30:16 +01:00
Shannon
09afb93ec3 fixes test 2015-03-19 18:04:26 +11:00
Shannon
2e877aa446 fixes build errors 2015-03-19 17:42:57 +11: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
85ba41dd06 Fixes: U4-5435 Dropdown list multiple, publish keys - single item 2015-03-19 15:50:58 +11:00
Shannon
e5cf7b089c oops, added timeouts where they cannot exist for request cache, fixes build 2015-03-19 14:47:08 +11:00
Shannon
b9082cf390 Fixes our usages of GetCacheItem so that there is a timeout, this is needed otherwise memory won't be given back unless memory gets too high where in fact for most of these we want to give it back as soon as possible if it isn't being used. 2015-03-19 14:00:48 +11:00
Shannon
9469b0b844 Fixes: U4-6402 Grid config file should be merged with package.manifests & U4-6427 Grid config file has caching problems because it's downloaded as a static file 
This also fixes up the OutputCaching params on the BackOfficeController since OutputCache is bypassed when an action requires authentication, so now we manually do some caching when not in debug mode for authorized actions (of course auth happens before any cached response can occur). This also fixes up the static caching that was happening with the ManifestBuilder so now when that is not in use it gives back it's memory. This also fixes up any client side caching that was happening on BackOfficeController - before we were allowing client cache to happen for a few actions on that controller which is incorrect, we need to disable all client cache for all actions on that controller.
 2015-03-19 13:53:15 +11:00
Shannon
5737cdfbe2 Fixes the way HttpResponseMessages are created - they should always be created with Request.CreateReponse! 2015-03-19 12:03:55 +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
Helmuth Bederna
f742c0a958 fixed issue U4-6419 by removing that character 2015-03-18 10:41:15 +01:00
Shannon
02b0e4dd6a Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice 2015-03-18 19:06:41 +11:00
Shannon
9c1d3fabb8 Fixes: U4-6418 Loading back office with ClientDependency does not respect the configured value for the compositeFileHandlerPath 2015-03-18 19:04:49 +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