Shannon
|
84aa861a5b
|
Merge remote-tracking branch 'origin/v7/dev' into v8/dev - Iniital commit (broken)
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-DataTypes.cs
# src/Umbraco.Core/Models/DataTypeDefinition.cs
# src/Umbraco.Core/Models/DataTypeExtensions.cs
# src/Umbraco.Core/Models/IDataTypeDefinition.cs
# src/Umbraco.Core/Models/UmbracoEntity.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
# src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/DataTypeService.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/Services/IDataTypeService.cs
# src/Umbraco.Core/Services/IEntityService.cs
# src/Umbraco.Core/Services/IRelationService.cs
# src/Umbraco.Core/Services/Implement/RelationService.cs
# src/Umbraco.Tests/Models/UmbracoEntityTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Tests/Services/EntityServiceTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
# src/Umbraco.Web.UI.Client/src/common/services/search.service.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebBootManager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
# src/umbraco.cms/businesslogic/web/Access.cs
|
2019-06-28 13:03:36 +10:00 |
|
Shannon
|
7aa413d558
|
Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing)
# Conflicts:
# build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Constants-Applications.cs
# src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
# src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
# src/Umbraco.Core/Services/ConsentService.cs
# src/Umbraco.Core/Services/IRelationService.cs
# src/Umbraco.Core/Services/RelationService.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Services/ConsentServiceTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
# src/Umbraco.Web.UI.Client/src/less/application/grid.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/less/main.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
# src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
# src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.config
# src/Umbraco.Web.UI/config/trees.Release.config
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
# src/Umbraco.Web.UI/umbraco/config/create/UI.xml
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/MacroController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Models/RegisterModel.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
|
2018-07-11 15:58:48 +10:00 |
|
Sebastiaan Janssen
|
10484a2240
|
Fix unit tests after moving the Dictionary tree
|
2018-06-13 21:16:44 +02:00 |
|
Shannon
|
890b5f30a1
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepositoriesSection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepository.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesCollection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryConfigExtensions.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
# src/Umbraco.Core/Services/PackagingService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementDefaultTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
# src/umbraco.cms/umbraco.cms.csproj
|
2018-04-30 23:25:07 +10:00 |
|
Sebastiaan Janssen
|
6d6be4e6a4
|
Fixes last failing test
|
2018-04-19 20:29:46 +02:00 |
|
Shannon
|
e8fd7e2373
|
Fixes for U4-10900 Individual member data export functionality
|
2018-02-26 15:02:47 +11:00 |
|
Sebastiaan Jansssen
|
92c0cfb9df
|
Additional action needs to be counted in the test
|
2018-02-23 10:58:33 +01:00 |
|
Stephan
|
47d7677948
|
Refactor editing, all tests green
|
2018-02-16 12:00:45 +01:00 |
|
Stephan
|
cfd2ba3b5a
|
Refactor editing
|
2018-02-15 14:53:29 +01:00 |
|
Shannon
|
b42f75df17
|
fixes tests
|
2018-02-13 19:29:19 +11:00 |
|
Stephan
|
e1208e5019
|
U4-10794 - use string ids, not udis
|
2018-01-29 11:30:01 +01:00 |
|
Shannon
|
4a0cf81d7d
|
fixes test
|
2018-01-15 18:19:23 +11:00 |
|
Stephan
|
b5856803e1
|
DataType refactoring preparation - Entity refactoring
|
2018-01-10 12:48:51 +01:00 |
|
Stephan
|
bbff74fa51
|
UnitOfWork RIP, troubleshoot and fix, tests
|
2017-12-18 17:02:15 +01:00 |
|
Stephan
|
5ba2ffcbf3
|
CrLfTab
|
2017-09-23 10:08:18 +02:00 |
|
Stephan
|
dca3b74542
|
Refactor and fix tests
|
2017-09-20 20:06:46 +02:00 |
|
Stephan
|
9ed6576908
|
Port 7.7 - WIP
|
2017-09-19 15:51:47 +02:00 |
|
Sebastiaan Janssen
|
5451d28fe4
|
Update unit tests to account for the new AuditMapper
|
2017-09-14 21:29:24 +02:00 |
|
Stephan
|
1c96df83cd
|
Port 7.7 - WIP
|
2017-09-08 19:39:13 +02:00 |
|
Shannon
|
513aa0b95d
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-08-28 22:41:14 +10:00 |
|
Shannon
|
f7097d571c
|
U4-10301 Change the PluginManager hash to use more reliable and consistent hashes
|
2017-08-17 11:38:57 +10:00 |
|
Shannon
|
bcf4a84725
|
fixes more tests, gotta be close now
|
2017-07-31 19:47:02 +10:00 |
|
Stephan
|
a0fe56ee7c
|
Rename UmbracoExamine to Umbraco.Examine
|
2017-07-27 12:01:38 +02:00 |
|
Stephan
|
c76403077f
|
Normalize cr/lf/tab
|
2017-07-20 11:21:28 +02:00 |
|
Shannon
|
94b0cb04da
|
fix tests
|
2017-07-03 17:58:04 +10:00 |
|
Stephan
|
45438c032e
|
Upgrade to NUnit 3
|
2017-06-28 12:33:48 +02:00 |
|
Stephan
|
faec8f7d94
|
Fixing tests - all green or ignored
|
2017-06-27 16:09:33 +02:00 |
|
Stephan
|
e87be7ad9d
|
Fixing tests - and all sorts of issues
|
2017-06-23 18:58:08 +02:00 |
|
Stephan
|
08ce8bc4dc
|
Remove legacy projects
|
2017-06-20 12:12:29 +02:00 |
|
Shannon
|
7d1aedc0d3
|
fixes unit tests
|
2017-06-05 10:17:18 +02:00 |
|
Stephan
|
1f5c47f029
|
Move Plugins to Composing
|
2017-05-30 15:56:30 +02:00 |
|
Stephan
|
b251d23a57
|
Refactor DI and type loading
|
2017-05-30 15:33:57 +02:00 |
|
Shannon
|
0e6f2b542e
|
Merge branch 'dev-v7.6' into temp-faster-startup-less-scanning
# Conflicts:
# src/Umbraco.Core/PluginManager.cs
|
2017-04-03 16:57:57 +10:00 |
|
Stephan
|
824cf30e2e
|
PluginManager TLC from v7
|
2017-03-05 11:59:11 +01:00 |
|
Stephan
|
3b3eda5bfc
|
PluginManager TLC
|
2017-03-05 11:28:22 +01:00 |
|
Stephan
|
becc07c2bd
|
More PluginManager cleanup
|
2017-03-03 13:26:20 +01:00 |
|
Shannon
|
9f9b4d2e84
|
Changes all relevant scannable plugin types to implement a base marker interface so we only scan one time
|
2017-02-28 23:12:48 +01:00 |
|
Warren Buckley
|
f3e78e990f
|
Fix up failing unit test for the number of Trees found - this has gone down due this test is for implementing interface ITree which is the legacy type of Trees, where the new PartialViews & PartialView Macros now use TreeController
|
2017-01-20 09:52:23 +00:00 |
|
Stephan
|
2967add41a
|
Keep structuring tests
|
2016-11-07 19:12:09 +01:00 |
|
Stephan
|
5c2232aa3b
|
Refactor logging and profiling, boot reporting
|
2016-09-19 16:33:47 +02:00 |
|
Stephan
|
091816a2ea
|
RIP IApplicationEventHandler
|
2016-09-19 16:33:45 +02:00 |
|
Stephan
|
0597eea72b
|
Resvolution - Components, Runtime & Booting
|
2016-09-19 16:33:43 +02:00 |
|
Stephan
|
dbdff2e2c4
|
Resvolution - PluginManager
|
2016-09-19 16:30:25 +02:00 |
|
Stephan
|
a66cf484e8
|
Fix more tests after merge
|
2016-07-18 10:37:37 +02:00 |
|
Sebastiaan Janssen
|
54009a04c3
|
Makes sense, recent commit removed one of these classes
|
2016-06-21 17:58:04 +02:00 |
|
Sebastiaan Janssen
|
85b00f60ab
|
Update broken unit test
|
2016-06-14 14:38:19 +02:00 |
|
Stephan
|
4870c228dc
|
Fix tests
|
2016-05-20 11:24:30 +02:00 |
|
Stephan
|
b3a83e274f
|
Fix tests
|
2016-05-19 18:42:07 +02:00 |
|
Shannon
|
f9ba3fe76f
|
Merge branch 'dev-v8' into dev-v8-ExamineV2
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Plugins/PluginManager.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Services/MediaServiceTests.cs
# src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
# src/Umbraco.Web.UI/config/ClientDependency.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/UmbracoExamine/UmbracoContentIndexer.cs
|
2016-05-19 16:32:22 +02:00 |
|
Shannon
|
8127731f72
|
Namespace and file cleanup - Profiling --> Logging, root cache stuff moved to Cache, XmlHelper --> Xml, TypeFinder, etc.. --> Plugins
|
2016-05-18 23:34:56 +02:00 |
|