Kenn Jacobsen
|
97f9151473
|
Add "Move" option for deleted items in the content tree (#3772)
|
2018-12-19 18:19:51 +01:00 |
|
Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
Shannon
|
9e7384a330
|
Merge branch 'temp8' into temp8-3096-angular-bulk-publish
# Conflicts:
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
|
2018-11-20 19:37:39 +11:00 |
|
Shannon
|
99d9c49c9f
|
Gets sln building and manually merges the entity/media service changes
|
2018-11-19 17:54:36 +11:00 |
|
Shannon
|
c3736ce7ab
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# .github/README.md
# build.bat
# src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs
# src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
# src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
# src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
# src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IMediaService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Core/Services/NotificationService.cs
# src/Umbraco.Web.UI.Client/bower.json
# 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/directives/validation/valtab.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
# src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
# src/Umbraco.Web.UI.Client/src/less/main.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/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/content/copy.html
# src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
# src/Umbraco.Web.UI.Client/src/views/content/move.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.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/mediatypes/copy.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.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.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
# src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
# 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/es.xml
# src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/HttpRequestExtensions.cs
# src/Umbraco.Web/Models/ContentEditing/Tab.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Web/Templates/TemplateRenderer.cs
# src/Umbraco.Web/Trees/ApplicationTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/_Legacy/Controls/TabView.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/Actions/Action.cs
# src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2018-11-19 15:32:26 +11: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
|
1429053681
|
Slight refactor and cleanup
|
2018-11-01 13:12:47 +11:00 |
|
Warren Buckley
|
b2c3944074
|
Remove a block of commented out code - that was forgotten
|
2018-10-31 13:47:07 +00:00 |
|
Shannon
|
77f4f0bbad
|
Refactors how the 'OpensDialog' gets assigned to menu items, fixes permission check on rollback
|
2018-10-30 00:34:43 +11:00 |
|
Shannon
|
cb9843b023
|
Removes IActions that shouldn't be IActions
|
2018-10-29 23:23:21 +11:00 |
|
Shannon
|
bae9bb6108
|
Initial cleanup of IActions, menu items, etc...
|
2018-10-29 17:27:33 +11:00 |
|
Stephan
|
c0a1e7f2f6
|
Merge branch temp8 into temp8-dirty-tracking-on-variants
|
2018-10-23 17:43:52 +02:00 |
|
Warren Buckley
|
2ec6216932
|
Merge pull request #3400 from umbraco/temp8-247-hostnames-dialog
Temp8 247 hostnames dialog
|
2018-10-23 11:28:08 +01:00 |
|
Stephan
|
9699e6cb71
|
Merge branch 'temp8' into temp8-dirty-tracking-on-variants
|
2018-10-23 10:51:28 +02:00 |
|
Warren Buckley
|
6b7dd261ab
|
Add to the tree metadata (So the UI of the tree node can be aware if it allows variants)
|
2018-10-22 09:30:39 +01:00 |
|
Shannon
|
8dfb0dc35c
|
more send to translate cleanup
|
2018-10-19 13:25:06 +11:00 |
|
Mads Rasmussen
|
fd6f9fc83b
|
remove rollback context menu item
|
2018-10-16 15:11:47 +02:00 |
|
Shannon
|
b48202197f
|
Merge remote-tracking branch 'origin/temp8' into temp8-I3089
# Conflicts:
# src/Umbraco.Web/Trees/DataTypeTreeController.cs
|
2018-10-08 09:54:12 +02:00 |
|
elitsa
|
0cc5a01069
|
packages section is there with translations sections and correct trees
|
2018-10-05 11:09:33 +02:00 |
|
Warren Buckley
|
1ae1a462d4
|
Tempolarily removes the right click context menu item for 'Change DocType'
|
2018-10-01 12:15:06 +01:00 |
|
Shannon Deminick
|
2db32ef347
|
Merge pull request #3052 from umbraco/temp8-IDocumentEntity-updates
IDocumentEntity updates
|
2018-09-27 19:41:53 +10:00 |
|
Shannon
|
83501ba1eb
|
Gets tree node states showing correctly for variants.
|
2018-09-27 19:30:31 +10:00 |
|
Mads Rasmussen
|
a00b510563
|
load angular dialog
|
2018-09-24 13:43:20 +02:00 |
|
Shannon
|
a39e77d1cf
|
Gets culture publishing info in IDocumentEntitySlim and has the tree showing the correct publish state, but missing 'edited' flag since i think that requires yet-another-query
|
2018-09-21 15:49:37 +10:00 |
|
Shannon
|
5324e0fc59
|
Fixes initial tree loading to ensure it gets passed the right culture params, puts any non-translated variant name in brackets in the tree
|
2018-08-17 00:50:05 +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 |
|
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 |
|
Warren
|
6967ed1846
|
Adds in Sort Angular dialog from Mads & removes some of the old sort dialog parts
|
2018-08-02 13:52:13 +01:00 |
|
Warren
|
c91776dd5e
|
Sets the Assign Domain Content tree menu item to not use the legacy conversion - will load a view from /umbraco/views/content/assignDomain.html based on convention routing
|
2018-08-02 10:27:37 +01:00 |
|
Warren
|
3fadfaf632
|
Kaboom - now the View Audit Trial Context menu item & its dialog is gone. As you can see this on the content node under info
|
2018-08-02 09:55:48 +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 |
|
Shannon Deminick
|
7132ccdd99
|
Merge pull request #2760 from umbraco/temp8-variants
Variants Refactoring [v8]
|
2018-07-10 13:05:13 +10:00 |
|
Stephan
|
02de09eaf7
|
Explain last merge
|
2018-07-09 18:26:15 +02:00 |
|
Stephan
|
ecf9a928d7
|
Refactor variations
|
2018-07-03 13:05:21 +02:00 |
|
Marcin Zajkowski
|
0e9b7bfccc
|
Republish action removed from the default content tree
|
2018-06-29 19:55:50 +02:00 |
|
Stephan
|
7a615133ff
|
Renormalize
|
2018-06-29 19:52:40 +02:00 |
|
Sebastiaan Janssen
|
359201955a
|
Merge pull request #2629 from umbraco/temp-U4-11339
Fixes - User permissions does not work in listview in 7.10.4
|
2018-06-20 15:39:56 +02:00 |
|
Ed Parry
|
0e4bcc96e7
|
U4-9367 Refined context menu for content in the recycle bin (#2687)
|
2018-06-13 21:38:03 +02:00 |
|
Stephan
|
ac04abe59b
|
Fix ContentTreeController
|
2018-05-30 10:00:16 +02:00 |
|
Robert
|
5cd80daa3f
|
Child nodes of a list view should now render when set as a start node
|
2018-05-15 11:21:37 +02:00 |
|
Shannon
|
68f0a64136
|
Fixes auth with AllowsCultureVariation and LanguageController post methods, fixes merge issues with navigation.controller
|
2018-05-10 19:16:46 +10:00 |
|
Shannon
|
4ce6f5c3b0
|
Fixes how the name is ensured on the content tree so that the media tree doesn't break.
|
2018-05-10 18:20:33 +10:00 |
|
Shannon
|
5a991c9424
|
Fixes Publishing/Unpublishing variants and it's nuances
|
2018-05-07 23:22:52 +10:00 |
|
Shannon
|
be4ea93d12
|
U4-11289 Tracking the currently selected language in the main tree
|
2018-05-01 18:17:07 +10:00 |
|
Shannon
|
d45112f2ab
|
Gets the content tree controller to return the names for items per language (with mock data), wires up the navigation.controller to re-build the tree for the new language
|
2018-04-17 01:37:35 +10:00 |
|
Shannon
|
a92361bd00
|
Tree refactor, cleanup legacy support, remove odd jquery callback object, removes unused files, removes publish dialog
|
2018-04-16 23:07:00 +10:00 |
|
Stephan
|
d23933a5b1
|
DataType refactoring preparation - Entity refactoring
|
2018-01-15 13:28:35 +01:00 |
|
Stephan
|
ef11fda272
|
More content refactoring (tests)
|
2017-11-15 08:53:20 +01:00 |
|
Stephan
|
5ba2ffcbf3
|
CrLfTab
|
2017-09-23 10:08:18 +02:00 |
|
Stephan
|
1341a37f2b
|
Cleanup Constants.ObjectTypes
|
2017-09-19 18:19:05 +02:00 |
|