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

96 Commits

Author SHA1 Message Date
Stephan
3c7fb8aeff U4-2581 - public UmbracoContext.UrlProvider 2014-10-10 11:35:40 +02:00
Shannon
885f691c0e Updated install steps, classes and logic 2014-03-04 11:16:42 +11:00
Shannon
57c9d9ca7b Merge remote-tracking branch 'origin/6.2.0' into 7.1.0-installer 
Conflicts:
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Web/UmbracoContext.cs
 2014-03-03 04:17:40 +01:00
Shannon
feb9f40237 updates some ctors on umbraco context and routing context to have lazy overloads which allows us to more easily create/mock the umbraco context. 2014-03-03 04:16:09 +01:00
Marc
dc727ba0de Fix for U4-3908 YSOD on frontend after being logged out 2013-12-19 10:41:44 +01:00
Shannon
660e89a46c Fixes merge issues 2013-10-28 11:38:07 +11:00
Stephan
73b7729b82 Standalone - fix so it works again 2013-10-28 01:07:29 +01:00
Stephan
a264342bcc Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
 2013-10-03 18:16:29 +02:00
Shannon
55247fe31d Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :) 2013-10-03 12:45:40 +10:00
Stephan
ea638c37b7 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web/UmbracoContext.cs
 2013-09-30 14:05:12 +02:00
Stephan
bfa7ab788b Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-09-30 14:00:01 +02:00
Shannon
33599a15a2 Fixes: U4-2952 Preview mode causes ysod - null reference 2013-09-30 16:06:56 +10:00
Shannon
bbdce28951 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
 2013-09-30 13:52:01 +10:00
Shannon
957760d29a Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe 2013-09-30 12:02:35 +10:00
Stephan
a8a2c706ba Merge branch '7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/PublishedContentHelper.cs
 2013-09-27 15:59:42 +02:00
perploug
dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
Stephan
36d6e4b4da Merge branch '7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2013-09-26 08:57:01 +02:00
Shannon
c739146f24 Completes: U4-2917 Remove canvas/live editing support, U4-2919 Remove defaultToLiveEditing column, U4-2825 Remove default permissions column 2013-09-24 19:27:13 +10:00
Stephan
c7ac4eea2f Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-24 10:53:26 +02:00
Shannon
972d33ccec Got macro content loading in editor async updated more of the macro plugin to ensure the macro contents cannot be edited. 2013-09-24 13:34:29 +10: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
0415a31d0e PublishedContent - the big refactoring 2013-09-16 17:17:45 +02:00
Shannon
f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
 2013-08-29 15:18:19 +10:00
Shannon
93691f13df Fixes U4-2734 Don't set the cache references to null when disposing the UmbracoContext 2013-08-29 12:38:14 +10:00
Shannon
c5a80ccb03 Changed WebSecurity to expose IUser instead of User, then fixed up the knock-on effect, obsoleted all calls to the legacy User object in the base classes to point to use the WebSecurity class to access the new user object. 2013-08-09 13:24:26 +10:00
Shannon
4e24016052 adds a region 2013-07-31 18:32:14 +10:00
Shannon
dcf730a1bc ensures the ui cultures are set in the back office. adds WebSecurity as a dependency for UmbracoContext. 2013-07-31 18:21:27 +10:00
Shannon
9bc3fdd555 Makes UmbracoContext disposable and fixes the module's DisposeHttpContextItems to actual perform the disposal of each item. 2013-07-31 17:34:42 +10:00
Shannon
6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00
Shannon
a7b546527c Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though). 2013-06-17 16:03:27 +10:00
Shannon Deminick
9431ae7fdb Fixed issues of using StateHelper since we do things in async which don't have an HttpContext.Current, so we use our 
UmbracoContext.Current instead if required. Changed StateHelper to be obsolete as we need to replace all calls to it with
proper extension methods. Updated the content model mappers to ensure we ToArray property objects so they don't keep
re-processing the Linq statement when iterating. Content is now saving to the db.
 2013-06-07 01:39:53 -10:00
Stephan
e3af8b4e5f Web.Routing - public, though readonly, UmbracoContext.PublishedContentRequest 2013-04-11 11:44:15 -02:00
Stephan
76a12f3f33 merge with 6.1.0 2013-04-10 13:56:39 -02:00
Stephan
cd823db766 merge with 6.1.0 2013-04-05 10:28:50 -02:00
Stephan
2f9de56968 U4-2030 - failed to update UmbracoContext on some devt webservers 2013-04-05 10:28:19 -02:00
Stephan
49a61c5820 merge with 6.1.0 2013-04-05 06:22:35 -02:00
Shannon Deminick
495b4ed9e0 Refactors the WebSecurity class to not be static and be part of the UmbracoContext. Makes a few methods internal on it so that 
it's not relying on the legacy User class. Cleans up the new BasePage and EnsuredUmbracoPage
 2013-04-04 23:30:17 +06:00
Stephan
4abb9fff3e merge with 6.1.0 2013-04-03 11:19:41 -02:00
Stephan
2490908401 merge with 6.1.0 2013-04-03 08:41:53 -02:00
Shannon Deminick
182107286c Fixes merge issues 2013-04-02 23:08:43 +06:00
Stephan
65cb6fbaff merge with 6.1.0 2013-03-31 19:19:24 -02:00
Stephan
efee4d0c0c Web.PublishedCache - IPublishedCaches creates contextual caches 2013-04-04 05:09:26 -02:00
Stephan
70ad3edc1f Web.UmbracoContext - refactor constructor to use IPublishedCaches 2013-04-03 08:40:35 -02:00
Stephan
32a6a49077 Macros - bugfix & cleanup macros 2013-03-31 18:47:37 -02:00
Stephan
9982a09826 Web.PublishedCache - merge resolvers so caches can be related 2013-03-31 18:40:55 -02:00
Stephan
75f0f1f4ee Web.UmbracoContext - allow for InPreviewMode override in tests 2013-03-31 18:40:54 -02:00
Shannon Deminick
7e0c1fac36 Fixes: #U4-1717 - UmbracoContext.EnsuresContext is public. 2013-03-22 05:23:11 +06:00
Stephan
fcb8f0d417 Web.Routing - RoutesCache goes with PublishedCache 2013-03-20 16:01:49 -01:00
Stephan
73d77083ae Web.PublishedCache - bugfix & fix tests 2013-03-19 17:54:41 -01:00