James Coxhead
10f6f8df90
Show relations in edit view
2018-11-15 22:22:15 +00:00
James Coxhead
06d19f2735
Load relation type edit view
2018-10-28 19:04:00 +00:00
James Coxhead
083de95311
Stubbed out relation type controller and resource
2018-10-27 23:37:08 +01:00
Stephan
c0a1e7f2f6
Merge branch temp8 into temp8-dirty-tracking-on-variants
2018-10-23 17:43:52 +02:00
Shannon
ce6b4f4a51
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
...
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
2018-10-23 22:16:48 +11:00
Shannon
fa64f4a6a8
Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file
2018-10-23 21:38:24 +11:00
Stephan
9699e6cb71
Merge branch 'temp8' into temp8-dirty-tracking-on-variants
2018-10-23 10:51:28 +02:00
Shannon
cd2cf26274
Fixes build errors after merge
2018-10-22 16:13:53 +11:00
Shannon
8dfb0dc35c
more send to translate cleanup
2018-10-19 13:25:06 +11:00
Warren Buckley
6850599ce9
Remove the emtpy folders from CSProj in the legacy umbraco.presentation folder
2018-10-18 15:04:40 +01:00
Warren Buckley
1efe90ba1d
More rollback .aspx dialogs removed
2018-10-18 14:54:29 +01:00
Warren Buckley
c05495f358
WIP: Adds a new API endpoint in the editor/webapi for ContenController to list rollback versions available for a culture
2018-10-17 12:15:57 +01:00
Shannon
10873c1dfc
Cleans up all old tree classes. woohoo!
2018-10-16 17:41:02 +11:00
Shannon
831657537f
tree webforms cleanup
2018-10-16 16:56:28 +11:00
elitsa
85309e8ce5
Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089
2018-10-08 10:23:53 +02:00
elitsa
4bde59ed66
Translation clean up
2018-10-08 10:13:36 +02:00
Stephan
2020c680d6
Merge branch temp8 into temp8-11502
2018-10-03 15:08:12 +02:00
Shannon
651b4a348a
gets unpublish working
2018-10-03 14:27:48 +02:00
Shannon
edc9744397
manual merge pass #1
2018-10-02 11:14:04 +02:00
Shannon
7349b545b0
manually merging new media detectors
2018-10-02 09:38:27 +02:00
Stephan
8a29745b98
Merge branch temp8 into temp8-11502
2018-10-01 14:45:33 +02:00
Shannon
549d8d83ce
reverts changes that shouldn't have been made, will manually merge these ones
2018-10-01 14:39:28 +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
Matthew-Wise
a33ccd15c6
Convertion of assigndomain2.aspx to angular ( #2897 )
2018-09-30 16:02:09 +02:00
Sebastiaan Janssen
197361721f
Merge branch 'umbplfest-hackathon-remove-obsolete' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-umbplfest-hackathon-remove-obsolete
2018-09-25 21:49:30 +02:00
Sebastiaan Janssen
dd7a4d262e
Merge pull request #3019 from ed-parry/v8hackathon-remove-pageid-references
...
Replaced references of PageID with the UmbracoContext calls. [v8hackathon]
2018-09-25 21:45:06 +02:00
Sebastiaan Janssen
6dfb0f0711
Removes some unused code which relate to the pageID too
2018-09-25 21:37:00 +02:00
Sebastiaan Janssen
7c437998ec
Merge pull request #2842 from leekelleher/U4-11555
...
[v8] U4-11555 - Remove App_Browsers folder
2018-09-25 16:06:54 +02:00
Stephan
d6775aa79a
Implement content apps code config and manifest
2018-09-21 08:09:53 +02:00
Anthony
1ab324ebb9
umbPLfest hackathon - Remove obsolete methods
2018-09-20 13:14:16 +01:00
Sebastiaan Janssen
8bf8e0a741
Updates CDF
2018-09-20 08:48:46 +02:00
Shannon
82b2778a59
Merge branch 'temp8' into temp8-p188
2018-09-19 16:16:03 +10:00
Stephan
95361da1f8
Cleanup/fix content variants mapping
2018-09-17 13:19:29 +02:00
Shannon
e771e781dd
finally it actually previews
2018-09-14 00:14:03 +10:00
Stephan
a5aa38c7ca
Merge branch temp8 into temp8-11502
2018-09-12 12:01:49 +02:00
Shannon
59f9354ff4
Merge remote-tracking branch 'origin/temp8' into temp8-get-preview-working
2018-09-10 15:04:37 +10:00
Shannon
e6ef924b1b
init commit to getting preview working
2018-09-10 11:34:31 +10:00
Stephan
69e8b11a79
Fix tests
2018-09-07 11:43:57 +02:00
Stephan
7a1744a38b
Merge branch temp8 into temp8-11502
2018-09-06 16:07:32 +02:00
Stephan
c42f3a1158
Merge branch temp8 into temp8-11502
2018-08-31 08:43:11 +02:00
Shannon
029eff1f8a
Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core.
2018-08-29 01:15:46 +10:00
Shannon Deminick
a151829b26
Merge pull request #2845 from umbraco/temp8-serilog
...
Bye bye Log4Net, Hello Serilog
2018-08-28 20:31:12 +10:00
Stephan
a2e80f27f3
Merge branch temp8 into temp8-11502
2018-08-27 09:57:41 +02:00
Shannon
c164a4789b
Fixes Slider
2018-08-22 14:13:33 +10: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
Warren
054308b44e
Merge remote-tracking branch 'origin/temp8-directive-cleanup' into temp8-serilog
2018-08-10 15:37:50 +01:00
Warren
00487c87fc
Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular
2018-08-08 13:23:41 +01:00
Robert
c2433a336c
Merge branch 'temp8' into temp-editing-all-variants
2018-08-08 13:46:19 +02:00
Warren
44e76adbd1
Merge branch 'hackathon-import-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-import-doc-type-to-angular
...
# Conflicts:
# src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
2018-08-08 12:01:15 +01:00
leekelleher
0869a9be69
Removed Form.browser
...
ref: http://issues.umbraco.org/issue/U4-11555
Also removed the referenced classes...
- FormRewriterControlAdapter
- UrlRewriterFormWriter
- LegacyRequestInitializer
These were being used to rewrite the `action` value on rendered `<form runat=server>` tags, (a la WebForms).
2018-08-08 11:32:19 +01:00
