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 |
|
Stephan
|
8a29745b98
|
Merge branch temp8 into temp8-11502
|
2018-10-01 14:45:33 +02:00 |
|
Matthew-Wise
|
a33ccd15c6
|
Convertion of assigndomain2.aspx to angular (#2897)
|
2018-09-30 16:02:09 +02:00 |
|
Stephan
|
d6775aa79a
|
Implement content apps code config and manifest
|
2018-09-21 08:09:53 +02:00 |
|
Mads Rasmussen
|
daa8b90372
|
Merge pull request #2982 from umbraco/temp8-get-preview-working
v8 - Gets previewing working with variants
|
2018-09-14 13:41:18 +02:00 |
|
Shannon
|
ec71814ec2
|
Fixes up nullable State, fixes up tracking global query strings in case they are removed by other routes
|
2018-09-14 11:31:43 +10:00 |
|
Shannon
|
8c90b7fa28
|
Cleans up code, fixes tests, adds comments
|
2018-09-14 10:08:09 +10:00 |
|
Shannon
|
e771e781dd
|
finally it actually previews
|
2018-09-14 00:14:03 +10:00 |
|
Warren Buckley
|
46ff45c2f0
|
Makes State a ContentSavedState enum nullable - otherwise media items was getting a default enum of not created
|
2018-09-12 15:34:48 +01:00 |
|
Warren Buckley
|
551e8120c9
|
Adds state property to ContentItemBase (Not sure if this will blow things up or if I need to use a diff model for ListView children now)
Adds/copies the same logic from ContentSavedStateResolver.cs
|
2018-09-12 12:08:51 +01:00 |
|
Stephan
|
7a1744a38b
|
Merge branch temp8 into temp8-11502
|
2018-09-06 16:07:32 +02:00 |
|
Shannon
|
3f4e6dfce8
|
Gets success notifications showing in the save/publish dialogs
|
2018-09-04 16:16:11 +10:00 |
|
Stephan
|
a2e80f27f3
|
Merge branch temp8 into temp8-11502
|
2018-08-27 09:57: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
|
2a15feec40
|
Fixes state issue to ensure that non-created variants show up as not-created
|
2018-08-15 15:13:27 +10:00 |
|
Shannon
|
9c84d5e3f9
|
more work with variants, saving, publishing and validation.
|
2018-08-14 20:21:33 +10:00 |
|
Shannon
|
d237fd7e26
|
Merge branch 'temp8' into temp-variants-with-file-uploads
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
|
2018-08-09 15:27:21 +10:00 |
|
Robert
|
c2433a336c
|
Merge branch 'temp8' into temp-editing-all-variants
|
2018-08-08 13:46:19 +02:00 |
|
Warren
|
fc7c2523c2
|
Merge branch 'dev-v7' into temp8 (The small fixes that Shan suggested)
# Conflicts:
# src/Umbraco.Web/Editors/ContentController.cs
|
2018-08-08 09:21:58 +01:00 |
|
Warren
|
7397541259
|
Minor fixes to notification dialog after some feedback from Shan when merging this up into V8
|
2018-08-08 09:04:09 +01:00 |
|
Shannon
|
f921e891a3
|
Fixes issue with IsEdited and state to make things consistent and easy
|
2018-08-08 16:29:07 +10:00 |
|
Warren
|
6372d393ee
|
Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this !
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array
# Conflicts:
# 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/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
# 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/dialogs/notifications.aspx
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
|
2018-08-07 15:48:21 +01:00 |
|
Shannon
|
08fe947575
|
Gets the image cropper posting files correctly
|
2018-08-07 18:37:55 +10:00 |
|
Shannon
|
cd89d016d1
|
Adds culture to the properties and removes reliance on tabbed-content directive for culture, adds a new directive for file uploads for properties that is more like the image cropper and maintains state when switching between variants.
|
2018-08-07 17:10:02 +10:00 |
|
Mike
|
2b6c6b3022
|
http://issues.umbraco.org/issue/U4-10801
Fixes label ui issue on template editor ui.
Updated notification settings ui to use angular instead of web forms.
|
2018-08-06 19:52:29 +01:00 |
|
Shannon
|
a0f7dbbc60
|
Only update variant info if it is dirty
|
2018-08-06 18:05:04 +10:00 |
|
Shannon
|
1f25847cd7
|
Gets contextual culture server validation working
|
2018-08-02 20:00:35 +10:00 |
|
Shannon
|
6a94694f16
|
Got models pulled apart and simplified, much less inheritance and easier to follow, start wiring up the model binding logic for content along with validation for each variant
|
2018-08-01 16:46:13 +10:00 |
|
Shannon
|
c073ab2731
|
WIP still pulling apart models, binders, validators
|
2018-08-01 15:40:54 +10:00 |
|
Stephan
|
0928fc099d
|
Merge branch temp8 into temp8-11502
|
2018-07-31 15:34:42 +02:00 |
|
Shannon
|
122c18e6d7
|
Merge branch 'temp8' into temp-editing-all-variants
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
|
2018-07-31 15:56:04 +10:00 |
|
Sebastiaan Janssen
|
86acf0c1ad
|
Revert "enable use of radiobuttonlist pre editor"
This reverts commit 80412f56ee.
|
2018-07-30 15:46:34 +02:00 |
|
Shannon
|
a83ea47c25
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
# src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/variables.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.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/tags/tags.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
# src/Umbraco.Web.UI/Views/Web.config
# src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
# 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/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/umbraco.MacroEngines/Resources/Web.config
# src/umbraco.cms/Actions/ActionRestore.cs
# src/umbraco.editorControls/yesno/YesNoDataType.cs
|
2018-07-30 21:31:35 +10:00 |
|
Stephan
|
eadd79771d
|
Merge branch temp8 into temp8-6231
|
2018-07-26 10:42:35 +02:00 |
|
Sébastien Sougnez
|
ff8ea3ec6b
|
Link to template from "document types" or "content" screen (#2784)
|
2018-07-25 08:36:09 +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 |
|
Stephan
|
b1ef9c5aa8
|
U4-11502 misc fixes
|
2018-07-18 12:27:14 +02:00 |
|
Stephan
|
b5dc538905
|
Merge branch 'u4-11502' of https://github.com/AndyButland/Umbraco-CMS into temp8-11502
|
2018-07-18 11:13:22 +02:00 |
|
Shannon
|
e9752cd5e1
|
Gets all list views working correctly with content apps, fixes various issues, cleans up a bunch of code and reduces amount of service locator.
|
2018-07-17 14:23:07 +10:00 |
|
Shannon
|
c8e65f085b
|
Gets content apps working nicer so we can have a proper view model that is discoverable, updates list views to use the new way, removes strange hack of copying a list view from a tab that doesn't exist.
|
2018-07-16 22:32:46 +10:00 |
|
Shannon
|
9a2aa8fff0
|
Fixes up tests
|
2018-07-16 20:24:49 +10:00 |
|
Shannon
|
072c1a6764
|
WIP - editing all variants at once, this is getting things wired up to display a content item, lots of TODOs added, models and mappings refactored, content apps put in c# model, etc...
|
2018-07-13 12:45:04 +10:00 |
|
AndyButland
|
91a0ee2c93
|
Refactored to object graph reference of fallback language to just use id
|
2018-07-12 20:52:02 +01: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 |
|
AndyButland
|
592de8bebc
|
Model, retrieval, mapping and display for fall back language editing
|
2018-07-08 16:14:47 +02:00 |
|
Dan Patching
|
80412f56ee
|
enable use of radiobuttonlist pre editor
|
2018-07-08 14:15:27 +01:00 |
|
Stephan
|
fdfdd541e3
|
Content Url and Audit (in progress)
|
2018-07-06 12:20:10 +02:00 |
|
Stephan
|
7a615133ff
|
Renormalize
|
2018-06-29 19:52:40 +02:00 |
|
Robert
|
385f1d6689
|
Merge pull request #2604 from umbraco/temp-U4-11276
Implements doc type collections | connects #73
|
2018-06-26 23:58:35 -07:00 |
|