Rasmus John Pedersen
|
f00a230d12
|
Merge branch 'v8/dev' into v8/feature/4940-save-media-reference-instead-of-media-url
|
2019-05-01 08:55:55 +02:00 |
|
Rasmus John Pedersen
|
d0701ae34e
|
Add media url provider support
|
2019-04-16 15:36:21 +02:00 |
|
Rasmus John Pedersen
|
8e5d33b15e
|
Resolve media urls when parsing localLink
|
2019-04-09 15:35:37 +02:00 |
|
Stephan
|
7e67bbea13
|
Do not inject IEnumerable but Collection in UmbracoContextFactory
|
2019-03-11 15:37:07 +01:00 |
|
Stephan
|
64154da4e4
|
Get LocalTempPath in GlobalSettings
|
2019-02-15 09:45:51 +01:00 |
|
Stephan
|
186e8fc58b
|
Introduce IUmbracoContextFactory
|
2019-02-14 12:11:06 +01:00 |
|
Shannon
|
1c8b4412e3
|
Removes scheduled tasks
|
2019-01-31 00:57:10 +11:00 |
|
Chris Houston
|
193e24afd2
|
Fixing all the TODO, FIXME & HACK comments so they all follow the same layout.
|
2019-01-27 11:16:00 +01:00 |
|
Stephan
|
0bee01e0ee
|
Great AppCaches renaming
|
2019-01-17 11:01:23 +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 |
|
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
|
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
|
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
|
5836cd05cb
|
Abstract container (in progress)
|
2018-07-20 15:45:01 +02:00 |
|
Stephan
|
68d9b19f65
|
Merge branch temp8 into temp8-di
|
2018-07-12 19:24:24 +02:00 |
|
Stephan
|
f678c72c4d
|
DisabledCacheHelper, LightInjectContainer
|
2018-07-06 18:52:23 +02:00 |
|
Stephan
|
ecf9a928d7
|
Refactor variations
|
2018-07-03 13:05:21 +02:00 |
|
Lars-Erik Aabech
|
e3d77fb012
|
Current.Container abstracted. Builds, but fails for collection builder tests.
|
2018-06-16 13:13:29 +02:00 |
|
Stephan
|
ff7c74ec8a
|
Rename accessors
|
2018-04-30 21:29:49 +02:00 |
|
Stephan
|
038fc87a40
|
Cleanup, fix tests
|
2018-04-30 15:11:01 +02:00 |
|
Stephan
|
bcd0c95ec1
|
Refactor getting urls
|
2018-04-30 09:14:14 +02:00 |
|
Stephan
|
908589277a
|
U4-11227 - default variations and fallback (wip)
|
2018-04-30 09:13:21 +02:00 |
|
Shannon
|
ad6a745681
|
Changes CultureInfo to string where required, fixes tests
|
2018-04-27 11:08:20 +10:00 |
|
Shannon
|
9044c9328d
|
Gets inbound routing working, reduces the amount of non injected dependencies, reduces the amount of DomainHelper instances
|
2018-04-24 13:07:18 +10:00 |
|
Shannon
|
48641166b9
|
WIP - gets 'inbound' routing working to generate culture specific URLs
|
2018-04-24 01:31:01 +10:00 |
|
Shannon
|
c90d6be8ab
|
U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI
|
2018-04-06 13:51:54 +10:00 |
|
Stephan
|
0d22478186
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 17:59:53 +02:00 |
|
Stephan
|
d23933a5b1
|
DataType refactoring preparation - Entity refactoring
|
2018-01-15 13:28:35 +01:00 |
|
Stephan
|
bbff74fa51
|
UnitOfWork RIP, troubleshoot and fix, tests
|
2017-12-18 17:02:15 +01:00 |
|
Shannon
|
cfd3cc5187
|
OK... maybe that is now required
|
2017-11-08 19:47:47 +11:00 |
|
Shannon
|
977b30c51a
|
Revert "more test hacks" which in theory shouldn't be required for 7.7+
|
2017-11-08 19:23:34 +11:00 |
|
Shannon
|
637abc384b
|
more test hacks
|
2017-11-08 18:46:08 +11:00 |
|
Stephan
|
ec6ba01cbf
|
So long Facade
|
2017-10-31 12:48:24 +01:00 |
|
Stephan
|
c76403077f
|
Normalize cr/lf/tab
|
2017-07-20 11:21:28 +02:00 |
|