26c148dccc
Merge remote-tracking branch 'origin/temp8-135-ChangeDocTypeDialog' into temp8-135-ChangeDocTypeDialog
2018-08-13 15:12:48 +01:00
8497056185
Fix up camelCasing stuff
2018-08-13 15:12:23 +01:00
5498e2c2bb
Don't show property select if there are no allowed properties
2018-08-13 15:25:09 +02:00
602a8ce08c
add property map + wire up save
2018-08-13 14:48:18 +02:00
7e82524c4e
Camel case properties to make Mads not have a OCD issue with the server responses :)
2018-08-13 12:18:42 +01:00
783973b9da
Fix up the Content Resource to send the correct params to the Controller endpoint
2018-08-13 11:53:14 +01:00
096cd1ef73
wip change doc type UI
2018-08-13 12:25:36 +02:00
07b01fa318
Updates resource with getAvailableProperties(fromAlias, toAlias) to call our new HTTP endpoint
2018-08-13 10:58:40 +01:00
0ba253c61d
New Controller endpoint for Mads to get back a JSON object of allowed properties that he can use easier in the clientside for this dialog
2018-08-13 10:40:52 +01:00
5da7f034e9
WIP - Need some help with JS
2018-08-10 13:34:42 +01:00
8eebd4ccae
WIP - UI needs finishing
...
* Adds in the GET & POST Controller methods along with new Models
* Adds new HTML view & Angular Controller
* Updates Angular Content Resource to call our new C# controller endpoints
2018-08-09 18:18:27 +01:00
c47e254efe
Remove the Legacy menu conversion on ChangeDocType action
2018-08-09 09:54:39 +01:00
3f35749619
* Remove actionNotify as notifications dialog already merged in
...
* Remove actionChangeDocType
2018-08-09 09:53:31 +01:00
e818197365
Fix comma dangle ESLint errors
2018-08-09 09:00:34 +01:00
1ffcc853e1
updates package-lock
2018-08-09 15:23:46 +10:00
284e440b7e
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/src/canvasdesigner/config/canvasdesigner.config.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/lib/spectrum.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
2018-08-09 15:22:20 +10:00
50597b5715
Merge pull request #2843 from umbraco/temp7-eslint
...
Temp7 eslint
2018-08-09 15:19:12 +10:00
9d7519d591
manually merges noscript update
2018-08-09 15:10:27 +10:00
f35110309a
fix comma-dangle error
2018-08-08 19:52:31 +02:00
c73860d144
start eslint from scratch so we slowly can add more rules for easier merging to v8
2018-08-08 19:52:00 +02:00
1842c78c5d
Fix for navigation service for hideDialog(true) which is used to hide the current dialog & show the right click context/more options menu which was failing
2018-08-08 15:26:25 +01:00
da39eb3ceb
Merge pull request #2808 from kows/hackathon-import-doc-type-to-angular
...
Rewrite importDocumenttype.aspx to Angular [v8hackathon]
2018-08-08 14:36:09 +01:00
baef12eb2a
* Rename import to importdocumentype to match up with the action alias
...
* Minor UI changes to match what we had previously & some simple validation if an incorrect file extension is chosen
2018-08-08 14:35:09 +01:00
5389a018b3
Sets back the action alias to importDocumentType - It may break more than we expected
2018-08-08 14:32:58 +01:00
00487c87fc
Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular
2018-08-08 13:23:41 +01:00
4dbcfc6907
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
2018-08-08 13:22:04 +01:00
8ba319b9d9
Fix up syntax error in JS from my merge/port upto V8 - oops :(
2018-08-08 12:53:23 +01:00
2d6ea3c57c
Merge pull request #2778 from umbraco/temp-editing-all-variants
...
WIP Editing all variants at once
2018-08-08 13:47:51 +02:00
c2433a336c
Merge branch 'temp8' into temp-editing-all-variants
2018-08-08 13:46:19 +02:00
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
3f348e00cf
Merge branch 'temp-editing-all-variants' of https://github.com/umbraco/Umbraco-CMS into temp-editing-all-variants
2018-08-08 11:58:55 +02:00
bd40428ad9
Variants in NotCreated state are now considered as dirty.
2018-08-08 11:58:35 +02:00
9dc99d5e35
fix arrow on media boxes
2018-08-08 10:36:17 +02:00
ea92608f84
prefix new directives with "umb"
2018-08-08 10:25:43 +02:00
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
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
f921e891a3
Fixes issue with IsEdited and state to make things consistent and easy
2018-08-08 16:29:07 +10:00
69acaabec1
Fixes creating doc types, some null checks missing and an issue with how umbgridselector is responsible for syncing the template alias on a new doc type
2018-08-08 15:35:02 +10:00
72b1fb1d60
fix sort issue on publish dialog
2018-08-08 13:31:35 +10:00
34e7440517
Fixes issues with data re-syncing and underlying js exceptions causing problems
2018-08-08 13:29:25 +10:00
0769b634e0
fixes status bar on info tab for content
2018-08-08 12:17:57 +10:00
9e6947f62c
Fixes issue of moving/deleting media along with other issues of us returning plain text responses with incorrect mime type results and an issue with our interceptors
2018-08-08 11:49:05 +10:00
4a43b97f64
fix media info tab
2018-08-07 20:18:34 +02:00
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
0b51cb703d
Back arrow from list view children will redirect back to parrent, changed the order content apps get added to have the ListView app added first.
2018-08-07 15:59:19 +02:00
af8dc17f5e
remove z-index from audit trail css so it doens't colide with language dropdown
2018-08-07 14:50:22 +02:00
a4155ad6d8
Update save and publish button text
2018-08-07 14:22:17 +02:00
0c727a2817
set active variant in language dropdown
2018-08-07 13:59:11 +02:00
8222234f86
Merge branch 'temp-editing-all-variants' of https://github.com/umbraco/Umbraco-CMS into temp-editing-all-variants
2018-08-07 13:43:56 +02:00
345aac8d5b
remove hacky group filter + fix arrow
2018-08-07 13:43:33 +02:00
Warren