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

30 Commits

Author SHA1 Message Date
Tom Fulton
5eb9138775 Fix IsBackOfficeRequest returning false for virtual directory paths - U4-6346 2015-06-22 16:26:35 -04:00
michael
ae3c17073b Move MVC dependencies from Umbraco.Core to Umbraco.Web 
note:MvcHandler.DisableMvcResponseHeader = true was removed from UmbracoApplicationBase.StartApplication.
This was the only breaking change, it can be put back in at a higher level if necessary.
 2015-04-06 16:48:55 +12:00
Stephan
08a2c0d082 U4-6184 - pipeline falls back from example.com:666 to example.com 2015-01-30 14:44:47 +01:00
Shannon
93151a43ac Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
 2014-07-10 11:14:20 +10:00
Shannon
b3c41e051f Fixes: U4-5199 Appending certain query strings to URLs cause InvalidOperationException (The UmbracoContext.Current is null) 2014-07-10 11:10:49 +10:00
Shannon
314abde9ac fixes merge 2014-02-20 13:56:18 +11:00
Shannon
5441c30780 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Web.UI/install/Default.aspx.cs
	src/Umbraco.Web/UmbracoModule.cs
 2014-02-20 13:42:02 +11:00
Shannon
a206652a0d updates login redirect logic to be more inline with v7, less greedy which is better. 2014-02-20 13:37:12 +11:00
Shannon
545040fdf0 Fixes installer upgrade 2014-02-20 13:09:54 +11:00
Shannon
fd682efdb1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2014-01-15 13:37:46 +11:00
Shannon
5c614a88a2 ensures webapi plugincontrollers are routed to /backoffice if [IsBackOffice] is specified 2014-01-15 13:29:17 +11:00
Shannon
f27a0c0461 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
	src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2014-01-15 13:28:41 +11:00
Shannon
3ef9635406 Fixes: U4-4010 Member and user session gets mixed - fixes how we detect a back office request + unit tests and added new IsBackOffice attribute 2014-01-15 13:17:38 +11:00
Shannon
8d9f741a6a Working on user timeouts - now have the user timeout time being nicely tracked in the back office with a bit of injector magic both on the client side and the server side with filters. Now to wire up the call to get remaining seconds if a request hasn't been made for a specified amount of time, then we can add UI notification about timeout period. 2013-10-15 18:46:44 +11:00
Stephan
3ca8b356ee Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedItemType.cs
	src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
	src/Umbraco.Core/PublishedContentExtensions.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
	src/Umbraco.Tests/LibraryTests.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
	src/Umbraco.Web/ExamineExtensions.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
 2013-09-23 21:57:22 +02:00
Stephan
08566f32de Take care of more FIXMEs 2013-09-18 10:09:05 +02:00
Stephan
d1af20424e merge branch '6.2.0' into '7.0.0' 2013-09-12 13:09:04 +02:00
Stephan
ddfd9eeb18 Core.UriExtensions - refactor + issue with IsClientSideRequest 2013-09-10 17:56:39 +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
Shannon
c4b44ea0e3 Fixes: U4-2577 Can't save umbraco user - without re-filling in the password 
Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
 2013-08-02 15:16:04 +10:00
Shannon
cbda86fe92 Fixes build error, streamlines all calls to validate a user for base controllers. 2013-07-31 17:24:36 +10:00
Shannon
b48f0f52e0 updates uri extensions + tests 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
 2013-07-31 17:08:10 +10:00
Shannon
b9cb3de167 updates uri extensions + tests 2013-07-31 17:06:45 +10:00
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon Deminick
67b57dea50 Changes profiler over to use a resolver and uses an interface for it. Changes core over to use a 
LogProfiler and the web project to use a web profiler (MiniProfiler). Fixes medium trust implementation,
adds performance check for binding to begin request, changes Web profiler over to be decoupled from the
umbraco application objects (binds to events by itself)
 2013-05-12 15:25:46 -10:00
Stephan
d9540bcfc5 Core - cleanup UriExtensions, create unit tests, make it public 2013-02-26 16:52:27 -01:00
Stephan
80dca1e3f2 U4-1089 - non-ascii chars in urls cause 404 2012-10-28 11:58:48 -01:00
Stephan
eeb305c740 fix uQuery.GetNodeIdByUrl 2012-10-01 13:08:10 -02:00
sgay
5fbf4379cc refactor routing 2012-07-20 18:54:59 -02:00
shannon@ShandemVaio
25b06a88ab Began integration of Stephen's new routing logic. The sln compiles and things have been refactored 
from the initial concept. The module is not active as it currently will not work because of
contructor dependencies and classes marked as internal, will liase with Stephen regarding this.
 2012-07-20 01:04:35 +06:00