Shannon
|
08dc94a535
|
Merge branch 'temp8' into temp-tinymce
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
|
2018-11-22 15:38:58 +11:00 |
|
Mads Rasmussen
|
219b38ff77
|
fix authorize upgrade screen
|
2018-11-20 12:33:26 +01: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
|
e6718c6989
|
more manual merging
|
2018-11-20 17:44:24 +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 |
|
Mads Rasmussen
|
29a2e4664b
|
Remove global close dialog events and add them to each component so we can clean up correctly
|
2018-11-15 10:58:47 +01: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 |
|
Anders Bjerner
|
cb636544c0
|
Spotted some minor typos
|
2018-11-13 15:06:58 +01:00 |
|
Mads Rasmussen
|
530a3e2439
|
fix up invite user functionality
|
2018-11-13 10:41:09 +01:00 |
|
Shannon
|
5827a8a3e1
|
I think i've finally got saving a schedule working with the correct validation
|
2018-11-13 14:31:37 +11:00 |
|
Shannon
|
66394926c0
|
Gets some validation messages working for sched pub
|
2018-11-13 00:46:13 +11:00 |
|
Shannon
|
4d13956372
|
better logic for validating and persisting schedules
|
2018-11-12 17:29:38 +11:00 |
|
Mads Rasmussen
|
4c3ac097ca
|
wip move login logic from dialog to its own component
|
2018-11-09 09:59:36 +01:00 |
|
Shannon
|
76f6721c80
|
Got some of the angular bits wired up
|
2018-11-09 16:12:08 +11:00 |
|
LindaSluijter
|
6a1568d562
|
Typo/spelling/grammar fixes for Dutch translation (#3576)
|
2018-11-08 16:36:40 +00:00 |
|
Mads Rasmussen
|
1d07ef7e4d
|
add preview
|
2018-11-07 18:23:43 +01:00 |
|
Mads Rasmussen
|
dca4c4e3bf
|
open the correct view based on which item you are creating and on the content of the stylesheet file
|
2018-11-07 15:11:35 +01: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 |
|
Claus
|
8f43451519
|
Merge pull request #3503 from kjac/feature-angular-stylesheets-editing-in-tabs
V8: Angular implementation of stylesheets editing
|
2018-11-06 13:52:32 +01:00 |
|
Robert
|
bdd438e307
|
Merge branch 'temp8' into temp8-3469-listview-publish
|
2018-11-06 09:57:38 +01:00 |
|
elitsa
|
acd067bb4e
|
Fixes a reflected XSS issue due to a parameter consumed directly from the request.
|
2018-11-05 10:07:50 +01:00 |
|
Kenn Jacobsen
|
d7d367aeb2
|
Move rules editing to an overlay
|
2018-11-05 08:58:30 +01:00 |
|
Mads Rasmussen
|
51e13b9f7a
|
add special keys for list view popups
|
2018-11-02 11:57:56 +01:00 |
|
Kenn Jacobsen
|
d0e6d0af2f
|
Merge branch 'temp8' into feature-angular-stylesheets-editing-in-tabs
|
2018-11-02 08:46:57 +01:00 |
|
Kenn Jacobsen
|
5001e2511d
|
Translate "create" text
|
2018-11-01 16:04:07 +01:00 |
|
Kenn Jacobsen
|
2b60769d0d
|
More localization
|
2018-11-01 13:26:08 +01:00 |
|
Kenn Jacobsen
|
fc387b9f23
|
Localize rules.html
|
2018-11-01 11:53:08 +01: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
|
6121479258
|
Merge remote-tracking branch 'origin/temp8' into temp8-3130-examine-indexing-variant-switching
# Conflicts:
# src/Umbraco.Tests/Services/ContentServiceTests.cs
|
2018-11-01 10:31:26 +11:00 |
|
Bjarne Fyrstenborg
|
b7b24a6a3d
|
#3246 - Consistency of macro page and other legacy pages (#3247)
|
2018-10-31 19:43:30 +01:00 |
|
bharanijayasuri
|
f73d55d496
|
Change to "MoveToRecycleBinDo" function of the MediaService and IMediaService (#3453)
|
2018-10-31 19:13:58 +01:00 |
|
Warren Buckley
|
c01cdf2fdb
|
Merge pull request #3479 from umbraco/temp8-IAction-cleanup
v8 IAction cleanup
|
2018-10-31 14:18:38 +00:00 |
|
Shannon
|
437bf978a1
|
Removes non paged GetChildren and GetDescendants from content service
|
2018-10-31 18:01:39 +11:00 |
|
Shannon
|
9416c5f638
|
fixes up localized text for audit trail
|
2018-10-30 14:57:54 +11:00 |
|
Shannon
|
fc39568415
|
Updated audit info to include full lang name
|
2018-10-30 14:49:25 +11:00 |
|
Shannon
|
b8a65febf4
|
Merge remote-tracking branch 'origin/temp8' into temp8-IAction-cleanup
# Conflicts:
# src/Umbraco.Tests/Composing/ActionCollectionTests.cs
# src/Umbraco.Web/Models/Trees/MenuItem.cs
# src/Umbraco.Web/_Legacy/Actions/Action.cs
# src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
# src/Umbraco.Web/_Legacy/Actions/ActionBrowse.cs
# src/Umbraco.Web/_Legacy/Actions/ActionChangeDocType.cs
# src/Umbraco.Web/_Legacy/Actions/ActionCopy.cs
# src/Umbraco.Web/_Legacy/Actions/ActionCreateBlueprintFromContent.cs
# src/Umbraco.Web/_Legacy/Actions/ActionDelete.cs
# src/Umbraco.Web/_Legacy/Actions/ActionEmptyTranscan.cs
# src/Umbraco.Web/_Legacy/Actions/ActionExport.cs
# src/Umbraco.Web/_Legacy/Actions/ActionImport.cs
# src/Umbraco.Web/_Legacy/Actions/ActionMove.cs
# src/Umbraco.Web/_Legacy/Actions/ActionNew.cs
# src/Umbraco.Web/_Legacy/Actions/ActionNotify.cs
# src/Umbraco.Web/_Legacy/Actions/ActionNull.cs
# src/Umbraco.Web/_Legacy/Actions/ActionPackage.cs
# src/Umbraco.Web/_Legacy/Actions/ActionPackageCreate.cs
# src/Umbraco.Web/_Legacy/Actions/ActionProtect.cs
# src/Umbraco.Web/_Legacy/Actions/ActionPublish.cs
# src/Umbraco.Web/_Legacy/Actions/ActionRePublish.cs
# src/Umbraco.Web/_Legacy/Actions/ActionRefresh.cs
# src/Umbraco.Web/_Legacy/Actions/ActionRestore.cs
# src/Umbraco.Web/_Legacy/Actions/ActionRights.cs
# src/Umbraco.Web/_Legacy/Actions/ActionRollback.cs
# src/Umbraco.Web/_Legacy/Actions/ActionSort.cs
# src/Umbraco.Web/_Legacy/Actions/ActionToPublish.cs
# src/Umbraco.Web/_Legacy/Actions/ActionTranslate.cs
# src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs
# src/Umbraco.Web/_Legacy/Actions/ActionUpdate.cs
# src/Umbraco.Web/_Legacy/Actions/ContextMenuSeperator.cs
# src/Umbraco.Web/_Legacy/Actions/IAction.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
|
2018-10-29 23:35:24 +11:00 |
|
Shannon
|
bae9bb6108
|
Initial cleanup of IActions, menu items, etc...
|
2018-10-29 17:27:33 +11:00 |
|
Kenn Jacobsen
|
1842aa4f11
|
Merge branch 'temp8' into feature-angular-stylesheets-editing
|
2018-10-28 12:12:34 +01:00 |
|
Kenn Jacobsen
|
68f05e05d1
|
Initial create and edit
|
2018-10-27 21:18:03 +02:00 |
|
Mads Rasmussen
|
bce2c43fdd
|
small fixes to alignment and copy
|
2018-10-26 11:21:56 +02:00 |
|
Mads Rasmussen
|
5356d0a0ab
|
Merge branch 'temp-3433' of git://github.com/dawoe/Umbraco-CMS into dawoe-temp-3433
|
2018-10-26 10:35:24 +02:00 |
|
Shannon
|
83f73c085f
|
Fixes unpublish, allows to be permission assigned and checks this permission when trying to perform that action
|
2018-10-26 16:40:28 +11:00 |
|
Shannon
|
555a275e13
|
fixes build
|
2018-10-26 13:21:30 +11:00 |
|
Dave Woestenborghs
|
2fbe2bb3da
|
#3433 added short cut for toglle allow culture variants to short cuts overview
|
2018-10-25 12:54:17 +02:00 |
|
Dave Woestenborghs
|
3c217adc2e
|
#3433 added language keys for text of culture variant permissions
|
2018-10-25 12:49:32 +02:00 |
|
Shannon
|
ca6fd56f09
|
Gets send to publish emails working for variants
|
2018-10-25 17:21:10 +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 |
|
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 |
|
Shannon
|
adae4325c9
|
Removes old legacy files
|
2018-10-24 19:07:35 +11:00 |
|