2c11f0be0f
updates method to use the available request instance instead of using HttpContext.Current! no idea why it was using that.
2015-10-15 17:07:46 +02:00
5b7e9c712e
Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
...
Conflicts:
src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
2013-12-04 13:50:55 +11:00
33aa4e2062
Fixes potential xss
2013-12-04 13:33:24 +11:00
1efa75c891
Fixes potential xss
2013-12-04 12:42:40 +11:00
2a05687c8b
Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
...
Conflicts:
src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/PluginManager.cs
src/Umbraco.Tests/Services/ContentServiceTests.cs
src/Umbraco.Web.UI/install/Default.aspx.cs
src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
src/Umbraco.Web.UI/umbraco/dashboard.aspx
src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
src/Umbraco.Web.UI/umbraco/logout.aspx
src/Umbraco.Web.UI/umbraco/umbraco.aspx
src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
src/umbraco.cms/businesslogic/Packager/Installer.cs
src/umbraco.providers/members/MembersMembershipProvider.cs
2013-12-03 18:10:00 +11:00
a7e32e97e3
Fixes xss issue
2013-12-03 15:40:12 +11:00
9cfbb24f4c
Content is now saving properly in the editor.
2013-06-07 02:29:24 -10:00
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
8ed1d76bc7
cleans up a bit of code relating to U4-1412
2013-01-10 05:55:55 +03:00
51c1c5c717
added more HttpRequestExtensions, cleaned up some code in legacyAjaxCalls, adds UmbracoRequestId to UmbracoContext
...
(for future use)
2013-01-10 03:59:11 +03:00
872c163999
Updated EditMacro.js to support inserting different syntax depending on rendering engine. Just need to get it to insert the params for MVC now.
...
Added HttpRequestExtenions with a method GetItemAsString which obsoletes/supercedes the old 'umbraco.helper.Request' method.
2013-01-03 06:21:55 +03:00
Shannon