Sebastiaan Janssen
|
b865c6b476
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# 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/HtmlHelperRenderExtensions.cs
|
2019-01-13 23:22:10 +01:00 |
|
christophnz
|
282ac2b9c5
|
Added 2 HtmlHelper extension methods for rendering RelatedLinks, including Unit tests
|
2019-01-13 15:17:13 +01:00 |
|
Stephan
|
19ae9f5dee
|
Refactor configuration for DI
|
2019-01-07 19:40:07 +01:00 |
|
Stephan
|
edfc3996d6
|
Adjustments for Forms and Deploy
|
2019-01-04 16:42:55 +01:00 |
|
Stephan
|
bb9846a6ca
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-21 10:58:38 +01:00 |
|
Stephan
|
b0eb0d1205
|
Fix tests
|
2018-12-20 15:36:12 +01:00 |
|
Shannon
|
a19a58796f
|
Changes IUrlProvider to return UrlInfo
|
2018-12-18 22:02:39 +11:00 |
|
Stephan
|
adced099be
|
Move UmbracoConfig singleton to Current
|
2018-12-12 23:31:16 +01:00 |
|
Stephan
|
3e082f1a94
|
Restructure registration of essential services, validate
|
2018-12-12 14:28:57 +01:00 |
|
Stephan
|
7f8eeeab83
|
Merge branch temp8 into temp8-di2690
|
2018-12-07 16:12:08 +01:00 |
|
Stephan
|
0d83da9327
|
Fix some tests
|
2018-12-07 15:59:57 +01:00 |
|
Stephan
|
d1ab980048
|
Cleanup
|
2018-12-07 13:44:41 +01:00 |
|
Stephan
|
710ec704b3
|
Merge branch temp8 into temp8-di2690
|
2018-12-07 09:52:46 +01:00 |
|
Shannon
|
11d8d17156
|
Fixes build with ctor change to UmbracoHelper
|
2018-12-05 17:00:51 +11:00 |
|
Stephan
|
c6891c6c70
|
RegisterUnique
|
2018-11-29 10:35:16 +01:00 |
|
Stephan
|
f9a19ada04
|
IContainer.die.die.die
|
2018-11-28 12:59:40 +01:00 |
|
Stephan
|
49a0b68b28
|
IContainer is IRegister+IFactory
|
2018-11-28 11:05:41 +01:00 |
|
Stephan
|
c23c7749b4
|
Composition fixes
|
2018-11-27 14:04:08 +01:00 |
|
Stephan
|
6ffc340725
|
Merge branch temp8 into temp8-di2690
|
2018-11-23 14:58:08 +01:00 |
|
Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
Shannon
|
496ecf5c9a
|
Cleans up how the content path permissions are checked, integrates the bulk publishing into the controller, adds security check to ensure the user can publish the whole branch, updates the UI messaging so they are grouped by publish statuses and deals with multiple publish status (i.e. in bulk), fixes some content tree issues
|
2018-11-15 15:24:09 +11:00 |
|
Shannon
|
bae9bb6108
|
Initial cleanup of IActions, menu items, etc...
|
2018-10-29 17:27:33 +11:00 |
|
Stephan
|
a4c81b269f
|
Merge branch temp8 into temp8-di2690
|
2018-10-26 15:10:20 +02:00 |
|
Warren Buckley
|
972dc56d9a
|
More dupe using's declared & tidied up - total number of warnings now at 48
|
2018-10-25 21:58:39 +01:00 |
|
Stephan
|
8af1da3661
|
Merge branch temp8 into temp8-di2690
|
2018-10-25 10:59:49 +02:00 |
|
Stephan
|
d71c879374
|
Merge branch temp8 into temp8-di2690
|
2018-10-23 18:01:52 +02:00 |
|
Stephan
|
c0a1e7f2f6
|
Merge branch temp8 into temp8-dirty-tracking-on-variants
|
2018-10-23 17:43:52 +02:00 |
|
Shannon
|
c6a67f79ac
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Models/IContentTypeBase.cs
# src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/bower.json
# src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
# src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/buttons.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/modals.less
# src/Umbraco.Web.UI.Client/src/less/panel.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
# src/Umbraco.Web.UI.Client/src/views/users/user.html
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
# src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
# src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
# src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
# src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebServices/SaveFileController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
|
2018-10-22 16:03:01 +11:00 |
|
Shannon
|
abeb4e04e5
|
Enhance implementation of ObservableDictionary so we can re-use this in more places, changes CultureNameCollection to ObservableDictionary, fixes issue with dirty tracking changed property type collections ... this was working by pure fluke before! Fixes more tests.
|
2018-10-19 15:41:28 +11:00 |
|
Sebastiaan Janssen
|
ee4a252b07
|
Revert "Fixed udi's rendered in rte content (#2531)"
This reverts commit b0374695b1.
|
2018-10-09 21:19:55 +02:00 |
|
Stephan
|
66d931490e
|
Merge branch temp8 into temp8-di2690
|
2018-10-08 19:22:20 +02:00 |
|
Shannon
|
0c5cf5256b
|
manual merge pass #2
|
2018-10-02 12:57:19 +02:00 |
|
Shannon
|
b96ba05d22
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.nuspec
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/Constants-System.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/Media/Exif/ImageFile.cs
# src/Umbraco.Core/Models/Property.cs
# src/Umbraco.Core/Models/PropertyTagBehavior.cs
# src/Umbraco.Core/Models/PropertyTags.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Security/AuthenticationExtensions.cs
# src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
# src/Umbraco.Core/Services/Implement/PackagingService.cs
# src/Umbraco.Core/Services/ServerRegistrationService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests/ApplicationUrlHelperTests.cs
# src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/user.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/card.less
# src/Umbraco.Web.UI.Client/src/less/navs.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/less/tree.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/infiniteeditors/mediapicker/mediapicker.controller.js
# 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/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/CanvasDesignerController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/LogController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
# src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
# src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/MasterControllerFactory.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
# src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
# src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
# src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/LogScrubber.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/ScheduledTasks.cs
# src/Umbraco.Web/Scheduling/Scheduler.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/Trees/DataTypeTreeController.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/_Legacy/Packager/Installer.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/umbraco.businesslogic/IO/IOHelper.cs
# src/umbraco.cms/packages.config
# src/umbraco.cms/umbraco.cms.csproj
# src/umbraco.controls/packages.config
# src/umbraco.controls/umbraco.controls.csproj
# src/umbraco.editorControls/packages.config
# src/umbraco.editorControls/umbraco.editorControls.csproj
|
2018-10-01 14:32:46 +02:00 |
|
Dave Woestenborghs
|
b0374695b1
|
Fixed udi's rendered in rte content (#2531)
|
2018-09-26 21:51:20 +02:00 |
|
Stephan
|
4b31a98812
|
Fix test broken by e771e78
|
2018-09-20 11:27:44 +02:00 |
|
Shannon
|
e771e781dd
|
finally it actually previews
|
2018-09-14 00:14:03 +10:00 |
|
Stephan
|
7e68f4724f
|
Fix merge
|
2018-09-07 09:32:42 +02:00 |
|
Stephan
|
725fe61f91
|
Merge branch temp8 into temp8-di2690
|
2018-09-06 16:22:13 +02:00 |
|
Mads Rasmussen
|
33df7647d2
|
Merge pull request #2900 from umbraco/temp8-validation-quirks
v8 validation quirks
|
2018-09-06 15:00:05 +02:00 |
|
Stephan
|
d9d51584ea
|
Fix merge
|
2018-09-06 14:10:26 +02:00 |
|
Shannon
|
729177ffef
|
Fixes issue with not showing validation errors in the dialogs when creating content and saving/publishing when the names haven't been filled out, adds unit tests to support.
|
2018-09-06 20:33:32 +10:00 |
|
Shannon
|
20c0185ddf
|
Adds unit tests for content controller
|
2018-09-06 17:37:47 +10:00 |
|
Stephan
|
6692f3e7b7
|
Post-merge fixes
|
2018-08-29 19:02:35 +02:00 |
|
Stephan
|
e8dfca5635
|
Merge branch temp8 into temp8-di2690
|
2018-08-27 10:19:41 +02:00 |
|
Shannon
|
54af649b78
|
Cleans up some models, adds another unit test, fixes the Info tab state updating when a content item is changed.
|
2018-08-16 23:30:33 +10:00 |
|
Shannon
|
9e131aa633
|
oooooh our first ContentController test :)
|
2018-08-15 17:44:06 +10:00 |
|
Stephan
|
865d3f6e30
|
Cleanup and Fix DI
|
2018-07-30 16:16:10 +02:00 |
|
Stephan
|
97da0829a2
|
Refactor collection builders for IContainer
|
2018-07-20 16:36:46 +02:00 |
|
Stephan
|
5836cd05cb
|
Abstract container (in progress)
|
2018-07-20 15:45:01 +02:00 |
|
Shannon
|
18cd9ea1e8
|
WIP refactor commit for getting all variants at once saving, this requires pulling apart a lot of the models and corresponding binders and validators.
|
2018-07-19 19:32:07 +10:00 |
|