Claus
|
ca0cd8711e
|
minor fixes.
|
2018-12-10 14:11:02 +01:00 |
|
Claus
|
cfd6a08366
|
Merge branch '3436-relations-editor' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-3436-relations-editor
|
2018-12-10 13:27:34 +01:00 |
|
Stephan
|
fb4717d31e
|
Merge branch 'temp8-3527-indexes-via-code' into temp8
|
2018-12-07 09:27:38 +01:00 |
|
Shannon
|
07f15ec7b3
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
# src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.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/ru.xml
# src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.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/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs
# src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/businesslogic/language/Language.cs
|
2018-12-06 17:13:23 +11:00 |
|
Shannon
|
d549cb8e3d
|
Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code
|
2018-12-05 17:36:50 +11:00 |
|
Shannon
|
56d1a317c0
|
Gets searching working in the dashboard, updates to latest examine
|
2018-12-04 14:25:37 +11:00 |
|
Shannon
|
f8d203abff
|
Updates latest examine + api updates + fixes tests, gets different validation working (valid, failed, filtered)
|
2018-12-03 22:10:56 +11:00 |
|
James Coxhead
|
df961d9199
|
Merge branch 'temp8' into 3436-relations-editor
# Conflicts:
# src/Umbraco.Web/Trees/RelationTypeTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
|
2018-12-02 23:31:54 +00:00 |
|
James Coxhead
|
4617c0c24f
|
Tidy up - remove obsoleted classes
|
2018-12-02 18:17:20 +00:00 |
|
James Coxhead
|
a6ab471505
|
Added delete endpoint. Updated tree controller to use Angular delete view
|
2018-11-30 14:09:48 +00:00 |
|
Kenn Jacobsen
|
8e423d9c75
|
Sort the dictionary items alphabetically
|
2018-11-27 22:43:19 +01:00 |
|
Kenn Jacobsen
|
269f12edbf
|
Remove the default action from tree menus if it isn't allowed
|
2018-11-27 22:35:38 +01:00 |
|
Kenn Jacobsen
|
fe26239f73
|
Fix the sort order of dictionary items in both the tree and list view
|
2018-11-27 22:20:54 +01:00 |
|
James Coxhead
|
5872b6de22
|
Prototyped create view
|
2018-11-22 14:19:40 +00: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 |
|
James Coxhead
|
10f6f8df90
|
Show relations in edit view
|
2018-11-15 22:22:15 +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 |
|
Claus
|
f764b46b8e
|
Merge pull request #3429 from umbraco/temp8-231-send-to-publish-with-variants
v8 - send to publish with variants
|
2018-11-06 14:19:28 +01:00 |
|
Warren Buckley
|
1ef487b7da
|
Removing last of log entries that do string concat or interpolation & updates to use MessageTemplate format instead
|
2018-11-06 10:25:35 +00:00 |
|
elitsa
|
2b33c5cfd7
|
Fix for chekcing the children belonging to MemberType tree.
|
2018-11-05 10:46:50 +01:00 |
|
elitsa
|
666a78f803
|
Fix for getting the right collection.
|
2018-11-05 10:36:17 +01:00 |
|
elitsa
|
b9e30604a4
|
Fix for chekcing the children belonging to Templates tree.
|
2018-11-04 22:54:25 +01:00 |
|
elitsa
|
2f3483453c
|
Merge remote-tracking branch 'origin/temp8' into temp8-258-empty-trees-arrow
|
2018-11-04 22:44:20 +01:00 |
|
Shannon Deminick
|
0d06828b76
|
Merge pull request #3460 from umbraco/temp-3457-entityrepository
EntityRepository is fetching all property data for media
|
2018-11-01 14:58:38 +11:00 |
|
Shannon
|
c5181607de
|
Merge branch 'temp8' into temp8-231-send-to-publish-with-variants
# Conflicts:
# src/Umbraco.Web/Components/NotificationsComponent.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/NotificationServiceExtensions.cs
# src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
|
2018-11-01 14:02:43 +11:00 |
|
Shannon
|
83f1bbf6bd
|
Merge remote-tracking branch 'origin/temp8' into temp8-231-send-to-publish-with-variants
# Conflicts:
# src/Umbraco.Core/Services/Implement/ContentService.cs
|
2018-11-01 13:37:18 +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 |
|
elitsa
|
4d594e17aa
|
Adding a check to verify if there are any children which will resolve the problem with showing a right-pointing arrow in front of empty trees in the Settings section.
|
2018-10-31 13:40:23 +01:00 |
|
Dave Woestenborghs
|
44b837a9ec
|
#3373 fixes error when going to forms section when forms is not installed
|
2018-10-30 17:30:34 +01: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 |
|
James Coxhead
|
06d19f2735
|
Load relation type edit view
|
2018-10-28 19:04:00 +00:00 |
|
Claus
|
c4ee9abe68
|
adds internal methods for getting media entities through the entity repository/service without fetching all property data.
ensures the trees use this method to avoid fetching property data in the media tree.
|
2018-10-27 12:51:05 +02:00 |
|
Shannon
|
3d29c0381e
|
small refactor of trees for single page apps sections and some cleanup, puts the back button for dictionary back in with the correct route
|
2018-10-26 14:18:42 +11:00 |
|
Shannon Deminick
|
336f29fa3b
|
Merge pull request #3420 from dawoe/temp-3419
V8- #3419 - Fix dictionary tree
|
2018-10-26 13:39:42 +11:00 |
|
Dave Woestenborghs
|
3a0981e02b
|
#3419 fix error in backend for sections with no tree (forms when not installed)
|
2018-10-25 09:06:53 +02:00 |
|
Dave Woestenborghs
|
25a90ffbf5
|
#3419 added extra parameter to createSingleRoot node method so it will always show a single tree. If a single tree doesn't have children it does not show
|
2018-10-25 08:54:17 +02:00 |
|
Dave Woestenborghs
|
d5cc658811
|
#3419 added check on tree items count back
|
2018-10-24 18:28:52 +02:00 |
|
Dave Woestenborghs
|
96c0b701a0
|
#3419 added always show root item to tree attribute
|
2018-10-24 18:27:00 +02:00 |
|
Shannon
|
9df4a8091e
|
Merge remote-tracking branch 'origin/temp8' into temp8-231-send-to-publish-with-variants
|
2018-10-25 01:15:44 +11:00 |
|
Shannon Deminick
|
3652a96687
|
Merge pull request #3352 from umbraco/temp8-dirty-tracking-on-variants
v8 - allows audit trail/logging of changed cultures
|
2018-10-25 01:11:53 +11:00 |
|
Dave Woestenborghs
|
d23f5f8124
|
#3419 remove check on number of trees so dictoinary tree shows in the translation section and doesn't return a error when it's moved to the settings section
|
2018-10-24 15:31:45 +02:00 |
|
Shannon
|
81c7a1de78
|
Cleans up the notification system, removes coupling on System.Web, simplifies the whole thing, removes old legacy files, adds sort event, moves sort notification to be event based and not part of the controller
|
2018-10-24 23:55:55 +11:00 |
|
Claus
|
715083ef93
|
Merge pull request #3398 from umbraco/temp8-258-empty-trees-arrow
Fixing right-pointing arrow for empty trees.
|
2018-10-24 09:47:14 +02:00 |
|
Stephan
|
c0a1e7f2f6
|
Merge branch temp8 into temp8-dirty-tracking-on-variants
|
2018-10-23 17:43:52 +02:00 |
|