fa0588116f
remore ui replacements
2016-03-11 15:43:34 +01:00
f6f54fd057
Merge branch 'master-v7' into dev-v8
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
src/Umbraco.Core/Persistence/RepositoryFactory.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
src/Umbraco.Core/Services/ContentTypeService.cs
src/Umbraco.Core/Services/FileService.cs
src/Umbraco.Core/Services/LocalizationService.cs
src/Umbraco.Core/Services/MemberTypeService.cs
src/Umbraco.Core/Services/PackagingService.cs
src/Umbraco.Core/Services/ServiceContext.cs
src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/ClientDependency.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/web.Template.config
src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
src/Umbraco.Web/Services/ApplicationTreeService.cs
src/Umbraco.Web/Services/SectionService.cs
src/Umbraco.Web/Trees/MemberTreeController.cs
src/Umbraco.Web/UI/Pages/ClientTools.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/WebBootManager.cs
src/Umbraco.Web/umbraco.presentation/macro.cs
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
src/Umbraco.Web/umbraco.presentation/umbraco/channels/api.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
src/umbraco.businesslogic/BasePages/ClientTools.cs
src/umbraco.businesslogic/UmbracoSettings.cs
src/umbraco.cms/businesslogic/CMSNode.cs
src/umbraco.cms/businesslogic/Content.cs
src/umbraco.cms/businesslogic/cache/Cache.cs
src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
src/umbraco.cms/businesslogic/propertytype/propertytype.cs
src/umbraco.cms/businesslogic/web/Document.cs
src/umbraco.cms/helpers/DeepLink.cs
src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
2016-03-10 19:20:15 +01:00
b0060a9592
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
...
Conflicts:
build/InstallGit.cmd
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
src/Umbraco.Web/WebServices/SaveFileController.cs
2016-01-06 10:46:38 +01:00
15d06557e9
U4-7605 Colons/Parens Unnecessarily Removed From Data Type Names
2016-01-05 11:42:02 +01:00
415aaf3e2b
U4-7477 xss char stripping on data type names is being too agressive
2016-01-05 11:35:24 +01:00
5af839693c
U4-7600 Remove obsoleted string helpers, string extensions, umbraco.helper, umbraco.cms.helper.*
2015-12-22 16:48:55 +01:00
bdc7837f63
U4-7477 xss char stripping on data type names is being too agressive
2015-12-16 12:58:23 +01:00
9949e2676d
Merge branch 'dev-v7' into 7.4.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI.Client/bower.json
src/Umbraco.Web.UI.Client/src/less/main.less
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/Dashboard.Release.config
src/Umbraco.Web/Umbraco.Web.csproj
2015-12-01 15:16:57 +01:00
c97617f5b5
Fixes: U4-7461 xss vulnerability in content type editor
2015-11-25 20:15:28 +01:00
18c3345e47
Fixes U4-7459 XSRF protection bypass - ensures tokens are checked for the non-editor api controllers
2015-11-25 19:39:24 +01:00
7eb922a550
fixes build (merge issue)
2015-11-09 12:37:29 +01:00
a0761b92b8
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
...
Conflicts:
build/RevertToCleanInstall.bat
build/RevertToEmptyInstall.bat
src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
src/Umbraco.Web.UI.Client/src/less/pages/login.less
src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
2015-11-09 12:33:53 +01:00
79583c571c
Fixes: U4-7201 Can only save once in some editors after upgrade to 7.3
2015-10-22 15:40:12 +02:00
9d220b40af
Fixed: U4-7207 Cant save partial view more then once
2015-10-09 11:09:27 +02:00
3314ab026b
U4-7083 - filesystems, polish, fix, and back-compat
2015-09-10 14:20:21 +02:00
8b612a1047
Use SaveFileController for stylesheets too
2015-09-10 14:19:56 +02:00
8f78ba8b97
Revert "TEMP move stylesheet..." (pushed by mistake)
...
This reverts commit 7e1a11373b
2015-09-10 11:14:23 +02:00
7e1a11373b
TEMP move stylesheet editing to filesystem
2015-09-10 10:12:25 +02:00
200625aa3a
SaveFileController can also save stylesheets (not used at the moment)
2015-09-10 10:04:55 +02:00
6b5057b870
U4-7048 - more filesystems cleanup
2015-09-08 17:48:26 +02:00
d323b3c5c9
U4-7042 - use IFileService when editing scripts
2015-09-03 15:12:37 +02:00
caf972cd0f
Ensures virtual path is set on the template, updates the tree controller to render the correct editor if it's webforms, updates the rest service to return the updated contents if the server changes it and updates the UI
2015-01-09 17:01:38 +11:00
d4fd58e038
Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too.
2014-12-05 17:29:47 +11:00
86e82c7674
Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros)
2014-10-22 16:44:45 +10:00
de34379ddf
Updating PR after feedback from @sitereactor
2014-08-20 14:08:45 +02:00
1805857eea
Refactor PartialView.IsValid with logic found in SaveFileController
...
Refactor FileService.CreatePartialView to use Attempt so that it gets rid of PartialView.SaveSucceeded
Refactor SaveFileController to move all saving logic into the FileService
Added SavingPartialView and SavedPartialView events to the FileService
2014-08-19 12:51:07 +02:00
32057bd7ee
Macro instead of Macr. Removed events for SaveTemplate as the old Template class already has events
2014-08-19 10:39:52 +02:00
1ccee3f305
Moved all logic of PartialViewTasks and PartialViewMacroTasks to a base class as the only difference was 3 variables
...
Added events: PartialView(Macro): Create, Save and Delete
Added events: Template: Save (there's already a legacy event, this is a new one to transition to)
PartialViewMacro.ascx.cs was adding ".cshtml" just so that it could strip it of again, crazy
2014-08-14 17:20:25 +02:00
9b56c7eab6
Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse
2013-08-30 14:15:51 +10:00
671c8715b0
Fix merge issue
2013-04-19 10:18:46 -02:00
988940095c
Merge with 6.0.4
2013-04-18 23:03:52 +06:00
123e65c55f
Fixes: #U4-2118 - BOM encoding issue
2013-04-18 23:00:57 +06:00
c23be1fd96
Fixes #U4-414, #U4-1669 - publish dialog now uses new apis and ensures documents are validated during publishing. This also
...
enhances many other things in the publishing API including giving a status result for each item, ensuring that child items
do not try to get published when the parent item fails (based on a subset of rules)
2013-02-11 03:55:58 +06:00
b80415b34e
Fixes PublishingStrategy - It will still check if it's expired even if the event isn't cancelled. It now adheres
...
to some rules about publishing the children if a parent's publishing has failed or was cancelled. Have written unit
tests for these too.
2013-02-09 06:05:35 +06:00
de13f7e361
WIP ... Fixes: #U4-1666, Updates documentService to not have to manually
...
refresh content cache (and fix the unpublishing too since that logic wasn't correct)
Adds DebuggerDisplay support to ContentBase and Entity for better debugging info.
Adds new internal publishing methods to support publishing all children or only children previously published. This also adds new support
for getting a published result back even with bulk publishing.
Updates the publish dialog with new code and to use the new API based on issue #U4-1669.
Adds UmbracoUser property to AuthenticatedUmbracoController, Adds all common properties to the abstract UmbracoController.
Changes the legacy Document to allow content cache to be automatically refreshed (based on events)
2013-02-09 04:05:01 +06:00
d93ca26181
Streamlines how Template cache gets invalidated - ensures Save() is called on templates where it was needed,
...
cache now gets invalidated on events.
2013-02-07 05:26:53 +06:00
56fb570267
Adds a constant id for the template distributed cache object, adds extension method to DistrubutedCache to refresh the template cache,
...
Changes all distrubuted cache calls for templates to use extension method.
2013-02-07 03:49:45 +06:00
510d8b9dda
Ensures that all calls to 'dispatcher' are replaced with the new DistributedCache.Instance object.
2013-02-07 03:29:47 +06:00
9f7347a4f5
Updated LazyManyObjectsResolverBase to support removal. Moves cache refreshers to proper namespace and obsoletes old ones. Obsoletes
...
a couple of library cache clearing methods and moves them to CacheHelperExtensions. Fixes #U4-1653 for 6.1 and updates ExamineEvents to
ensure that Examine re-indexes media on all of the correct events (including Trashed). Changes for Caching are being done to begin work with
CD-148
2013-02-06 09:53:13 +06:00
e9f581bb51
Fixes #U4-1366 - conflict with partial view macro engine.
2013-01-01 00:42:20 +03:00
3ad793c4c5
Got partial view tree and partial view macros tree done. Need to get the custom create dialogs done now.
2012-12-31 02:51:30 +03:00
a7834b45da
Created UmbracoAuthorizeAttribute, UmbracoAuthorizedController for all base MVC controllers that required a back office user to be logged in.
...
Converted over the SaveTemplate and SavePartialView methods of the codeEditorSave legacy web service to use MVC services and marked them obsolete.
Created a generic route to route all controllers found in the namespace Umbraco.Web.WebServices. Added a 'Url' property on the BasePage webforms class
to expose a UrlHelper for use in views. Created UrlHelper extensions to easily get the base url path of the REST MVC web services.
Converted the EditView page and JavaScript to use the new REST services with jQuery instead of crappy MS ajax.
2012-12-30 03:11:21 +03:00
Shannon