Stephan
ddd89fa6e8
Remove legacy refs from Umbraco.Web
2017-06-20 11:00:09 +02:00
Stephan
7ea9c9c8e2
Move Web.Current to Composing
2017-05-30 18:13:11 +02:00
Stephan
8561d85f7a
porting 7.6-rc1 into 8
2017-05-24 12:25:39 +02:00
Stephan
7f39f7748f
Persistence reorg, killed DatabaseContext
2016-12-16 17:56:10 +01:00
Stephan
b26b415096
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
2016-11-03 10:31:44 +01:00
Stephan
5c2232aa3b
Refactor logging and profiling, boot reporting
2016-09-19 16:33:47 +02:00
Stephan
0597eea72b
Resvolution - Components, Runtime & Booting
2016-09-19 16:33:43 +02:00
Stephan
9949f07a46
Resvolution - Loggers & Booting
2016-09-19 16:33:38 +02:00
Stephan
55eb813536
Resvolution - PropertyEditorResolver
2016-09-19 16:30:38 +02:00
Sebastiaan Janssen
0a43fea1c0
U4-8939 Old openContentPicker() method is failing
...
Adding jquery-migrate to make sure legacy applications keep working
2016-09-05 14:42:45 +02:00
Shannon
b22fda1e80
fixes some ysods
2016-03-31 14:28:41 +02:00
Shannon
1a880f6b68
moves the LegacyDialogHandler stuff to _Legacy namespaces for now, moves the legacy ITask and ITaskReturnUrl to the same namespace/proj.
2016-03-17 15:30:25 +01:00
Shannon
24fed0de2e
removes ISqlHelper usages from Web project
2016-03-17 10:35:02 +01:00
Shannon
9ac2d04aea
User and User type from the old businesslogic assembly are GONE!
2016-03-16 17:52:08 +01:00
Shannon
8729e00864
it builds! ... but not sure it works yet.
2016-03-10 19:47:10 +01:00
Shannon
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
Claus
44f2a9e96f
Fixes: U4-7837 Changing document type should refresh the current node
2016-02-05 14:37:01 +01:00
Shannon
7d616cf937
Ensures that all property data is deleted for a doc type when it is being deleted, updates the ChangeDocType to not use the legacy EnsuredPage, updates the non-legacy EnsuredPage.ClientTools to support the legacy logic.
2016-01-26 12:13:53 +01:00
Simon Busborg
5f4309d2ca
Fixes: U4-7590 List view layout cookie: Change to use local storage and clean up entry if its back to default layout.
2016-01-05 09:23:27 +01:00
Shannon
e005c5bba6
Massive file cleanup, removed the old BasePage, UmbracoEnsuredPage, ClientTools, moved the menu 'Action' to the Web project until we can remove those too.
2015-12-23 13:51:16 +01:00
Shannon
de776f86a4
Lots of code cleanup, lots of unused/obsolete classes & files removed.
2015-12-22 19:25:10 +01:00
Shannon
afe06ffb02
U4-5424 Upgrade to latest .Net framework version (4.6.1)
2015-12-21 19:23:13 +01:00
Shannon
2ea9418fd7
Merge remote-tracking branch 'origin/7.4.0' into dev-v8
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/ApplicationContext.cs
src/Umbraco.Core/Configuration/UmbracoConfig.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/DatabaseContext.cs
src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs
src/Umbraco.Core/Manifest/ManifestParser.cs
src/Umbraco.Core/Models/DataTypeDefinition.cs
src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
src/Umbraco.Core/Persistence/Factories/MemberTypeFactory.cs
src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs
src/Umbraco.Core/Persistence/Migrations/MigrationExpressionBase.cs
src/Umbraco.Core/Persistence/Migrations/MigrationResolver.cs
src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/AlterSyntaxBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterDefaultConstraintExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterTableExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteColumnExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDefaultConstraintExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteTableExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/ExecuteBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteCodeStatementExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteSqlStatementExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameColumnExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameTableExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/RenameBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Update/Expressions/UpdateDataExpression.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Update/UpdateBuilder.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.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/LanguageRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs
src/Umbraco.Core/Persistence/Repositories/TagRepository.cs
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
src/Umbraco.Core/Persistence/RepositoryFactory.cs
src/Umbraco.Core/Persistence/UmbracoDatabase.cs
src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
src/Umbraco.Core/PropertyEditors/PropertyEditor.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
src/Umbraco.Core/Services/ContentService.cs
src/Umbraco.Core/Services/ContentTypeService.cs
src/Umbraco.Core/Services/DataTypeService.cs
src/Umbraco.Core/Services/EntityService.cs
src/Umbraco.Core/Services/LocalizationService.cs
src/Umbraco.Core/Services/MacroService.cs
src/Umbraco.Core/Services/MediaService.cs
src/Umbraco.Core/Services/MemberGroupService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Core/Services/MemberTypeService.cs
src/Umbraco.Core/Services/PackagingService.cs
src/Umbraco.Core/Services/ServerRegistrationService.cs
src/Umbraco.Core/Services/ServiceContext.cs
src/Umbraco.Core/Services/TagService.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
src/Umbraco.Core/Sync/ConfigServerRegistrar.cs
src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Core/UmbracoApplicationBase.cs
src/Umbraco.Core/packages.config
src/Umbraco.Tests/BootManagers/CoreBootManagerTests.cs
src/Umbraco.Tests/Macros/MacroTests.cs
src/Umbraco.Tests/Manifest/ManifestParserTests.cs
src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
src/Umbraco.Tests/Migrations/MigrationRunnerTests.cs
src/Umbraco.Tests/Migrations/Stubs/FiveZeroMigration.cs
src/Umbraco.Tests/Migrations/Stubs/FourElevenMigration.cs
src/Umbraco.Tests/Migrations/Stubs/SixZeroMigration1.cs
src/Umbraco.Tests/Migrations/Stubs/SixZeroMigration2.cs
src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs
src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs
src/Umbraco.Tests/Mvc/UmbracoViewPageTests.cs
src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
src/Umbraco.Tests/Persistence/Mappers/PropertyGroupMapperTest.cs
src/Umbraco.Tests/Persistence/MySqlDatabaseCreationTest.cs
src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
src/Umbraco.Tests/Services/ContentServiceTests.cs
src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
src/Umbraco.Tests/TestHelpers/BaseDatabaseTest.cs
src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
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/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertImage.aspx
src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx.cs
src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs
src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
src/Umbraco.Web/PropertyEditors/FolderBrowserPropertyEditor.cs
src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
src/Umbraco.Web/Trees/MediaTreeController.cs
src/Umbraco.Web/Trees/MemberTreeController.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoApplication.cs
src/Umbraco.Web/UmbracoModule.cs
src/Umbraco.Web/WebBootManager.cs
src/Umbraco.Web/packages.config
src/Umbraco.Web/umbraco.presentation/content.cs
src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
src/Umbraco.Web/umbraco.presentation/macro.cs
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertImage.aspx
src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
src/UmbracoExamine/UmbracoContentIndexer.cs
src/UmbracoExamine/UmbracoMemberIndexer.cs
src/umbraco.MacroEngines/RazorCore/UmbracoCultureDictionary.cs
src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs
src/umbraco.MacroEngines/RazorDynamicNode/ExtensionMethods.cs
src/umbraco.MacroEngines/app.config
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
src/umbraco.businesslogic/UmbracoSettings.cs
src/umbraco.cms/businesslogic/Content.cs
src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
src/umbraco.cms/businesslogic/translation/Translation.cs
src/umbraco.cms/businesslogic/web/Document.cs
src/umbraco.cms/packages.config
src/umbraco.editorControls/DefaultPrevalueEditor.cs
src/umbraco.editorControls/MultiNodeTreePicker/MNTPResources.Designer.cs
src/umbraco.editorControls/MultiNodeTreePicker/MNTPResources.resx
src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataType.cs
src/umbraco.editorControls/app.config
src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
src/umbraco.editorControls/packages.config
src/umbraco.editorControls/textfieldmultiple/textfieldMultipleDataType.cs
src/umbraco.editorControls/umbraco.editorControls.csproj
src/umbraco.editorControls/uploadfield/uploadField.cs
src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
src/umbraco.providers/app.config
2015-12-18 11:23:58 +01:00
Sebastiaan Janssen
e293051498
Merge branch '7.4.0' into temp-U4-7366
2015-12-03 10:43:10 +01:00
Sebastiaan Janssen
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
Mads Rasmussen
fe9954b674
Fixes: U4-7447 Grid - Touch support
2015-12-01 11:23:10 +01:00
Shannon
f62581bd38
reverts more of the caps lock
2015-11-26 11:39:49 +01:00
Shannon
068c4a0b16
Fixes PR for U4-7362 Add message to login screen if Caps Lock is on
2015-11-25 11:22:12 +01:00
Mads Rasmussen
e1f3e82fbf
U4-6924 Updated ng-file-upload bower dependency to latest version, added support for accepted file types and max file size in directive. Get file types from config. Still missing max file size.
2015-09-28 11:55:12 +02:00
Stephan
9c9ba477aa
Merge dev-v7 into dev-v7-contenttypeeditor
...
Conflicts:
src/Umbraco.Core/Constants-ObjectTypes.cs
src/Umbraco.Web.UI.Client/gruntFile.js
src/Umbraco.Web.UI.Client/src/loader.dev.js
src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
src/Umbraco.Web/Umbraco.Web.csproj
2015-09-16 13:25:32 +02:00
Claus
c1352e2ad6
Fixes: COU-191 Creating a revision gives a reference not set error (7.3)
...
If the typeInstance could not be cast to LegacyDialogTask, trying to set additionalValues caused a null exception.
Inserted a null check and then cast to ITaskReturnUrl instead to get the returnUrl.
2015-08-28 13:01:23 +02:00
Shannon
85534bc3ce
Merge branch 'dev-v7' into dev-v7-contenttypeeditor
...
Conflicts:
src/Umbraco.Web.UI.Client/bower.json
src/Umbraco.Web.UI.Client/gruntFile.js
src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
src/Umbraco.Web.UI.Client/src/less/application/grid.less
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
src/Umbraco.Web/Umbraco.Web.csproj
2015-08-04 17:10:58 +02:00
Shannon
d1bed54cf1
Fixes tabdrop memory leak U4-6907 Bootstrap tab drop has memory leaks, fixes tab/header to use the correct bootstrap tab api, simplifies the header code dramatically and speeds up processing. Fixes mem leak with delayedMouseLeave.directive
2015-08-04 11:59:57 +02:00
Stephan
d83fdb48c9
Merge branch 7.2.7 into dev-v7
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/ApplicationContext.cs
src/Umbraco.Core/AsyncLock.cs
src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Logging/LogHelper.cs
src/Umbraco.Core/PluginManager.cs
src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
src/Umbraco.Core/TypeFinder.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
src/Umbraco.Tests/ServerEnvironmentHelperTests.cs
src/Umbraco.Web.UI.Client/bower.json
src/Umbraco.Web.UI.Client/gruntFile.js
src/Umbraco.Web.UI.Client/src/less/grid.less
src/Umbraco.Web.UI.Client/src/less/panel.less
src/Umbraco.Web.UI.Client/src/less/property-editors.less
src/Umbraco.Web.UI.Client/src/loader.js
src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/ClientDependency.config
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
src/Umbraco.Web/Scheduling/KeepAlive.cs
src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs
src/Umbraco.Web/Scheduling/LogScrubber.cs
src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
src/Umbraco.Web/Scheduling/ScheduledTasks.cs
src/Umbraco.Web/Scheduling/Scheduler.cs
src/Umbraco.Web/UI/JavaScript/JsInitialize.js
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/content.cs
src/umbraco.cms/Actions/Action.cs
2015-07-13 22:45:37 +02:00
Shannon
1a2849dfb0
fixes merge issues
2015-07-08 11:35:55 +02:00
Shannon
bcb5883230
Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs
...
Conflicts:
src/Umbraco.Web.UI.Client/bower.json
src/Umbraco.Web.UI.Client/gruntFile.js
2015-07-08 11:16:46 +02:00
Shannon
aad82360ad
Merge branch 'dev-v7' into dev-v7-contenttypeeditor
...
Conflicts:
src/Umbraco.Web.UI.Client/bower.json
src/Umbraco.Web.UI.Client/src/app.dev.js
src/Umbraco.Web.UI.Client/src/less/application/grid.less
src/Umbraco.Web.UI.Client/src/less/panel.less
src/Umbraco.Web.UI.Client/src/loader.js
src/Umbraco.Web/Umbraco.Web.csproj
2015-06-23 18:27:18 +02:00
Per Ploug
3212bfa4b6
New upload field + dependencies
2015-06-23 14:08:02 +02:00
Shannon
3496a064c9
Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs
2015-06-19 10:54:46 +02:00
Shannon
2ea4acbc6f
Merge branch '7.3.0' into dev-v8
...
Conflicts:
src/Umbraco.Core/Configuration/UmbracoConfig.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Manifest/ManifestBuilder.cs
src/Umbraco.Core/Manifest/ManifestParser.cs
src/Umbraco.Core/Persistence/Migrations/MigrationResolver.cs
src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionFourNineZero/RemoveUmbracoAppConstraints.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AssignMissingKeysAndIndexes.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/RemoveHelpTextColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/UpdateUniqueIdToHaveCorrectIndexType.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddIndexToUmbracoNodeTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddMissingForeignKeyForContentType.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AlterDataTypePreValueTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/RemoveCmsDocumentAliasColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/DeleteAppTables.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/EnsureAppsTreesUpdated.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/MoveMasterContentTypeData.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/NewCmsContentType2ContentTypeTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/RemoveMasterContentTypeColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/RenameCmsTabTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/RenameTabIdColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsContentTypeAllowedContentTypeTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsContentTypeTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsContentVersionTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSix/UpdateCmsPropertyTypeGroupTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixOneZero/CreateServerRegistryTable.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys2.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/ChangePasswordColumn.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/UpdateToNewMemberPropertyAliases.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
src/Umbraco.Core/Persistence/RepositoryFactory.cs
src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Core/Services/ServerRegistrationService.cs
src/Umbraco.Core/Sync/ConfigServerRegistrar.cs
src/Umbraco.Core/Sync/ServerMessengerResolver.cs
src/Umbraco.Core/Sync/ServerRegistrarResolver.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
src/Umbraco.Tests/CodeFirst/Definitions/ContentTypeDefinitionFactory.cs
src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs
src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
src/Umbraco.Tests/Plugins/TypeFinderTests.cs
src/Umbraco.Tests/Routing/DomainsAndCulturesTests.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/umbraco/Views/Default.cshtml
src/Umbraco.Web/BaseRest/BaseRestHandler.cs
src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/WebBootManager.cs
src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
src/Umbraco.Web/umbraco.presentation/content.cs
src/Umbraco.Web/umbraco.presentation/page.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/UmbracoExamine/UmbracoMemberIndexer.cs
src/umbraco.MacroEngines/app.config
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
src/umbraco.editorControls/app.config
src/umbraco.editorControls/packages.config
src/umbraco.editorControls/umbraco.editorControls.csproj
src/umbraco.providers/app.config
2015-05-05 16:11:06 +10:00
Shannon
2f9753cc12
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/umbraco.presentation/content.cs
src/umbraco.macroRenderings/app.config
2015-05-05 12:27:01 +10:00
Shannon
550d690a31
Fixes: U4-6559 ServerVariables parsing - An Item with the same key has already been added
2015-04-27 12:41:19 +10:00
Shannon
52c4d80cfc
more identity awesome
2015-04-01 13:41:33 +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
02b0e4dd6a
Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice
2015-03-18 19:06:41 +11:00
Shannon
d2083673be
Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower.
2015-03-10 13:02:34 +11:00
Shannon
88ae95150e
Fixes: U4-6342 UmbracoEnsuredPage doesn't work in 7.2.2
2015-03-05 16:36:06 +11:00
Shannon
1851303343
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/macro.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/umbraco.MacroEngines/RazorDynamicNode/ExtensionMethodFinder.cs
src/umbraco.MacroEngines/Resources/Web.config
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
src/umbraco.cms/businesslogic/Dictionary.cs
src/umbraco.editorControls/packages.config
src/umbraco.editorControls/umbraco.editorControls.csproj
2015-02-22 16:56:02 +01:00
Shannon
428df7ae4a
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Umbraco.Web.csproj
2015-02-17 15:11:10 +01:00
Shannon
cd4c738c04
Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it.
2015-02-11 18:39:53 +11:00
