Shannon
|
b4378ecb26
|
Merge remote-tracking branch 'origin/temp8' into temp-variant-save-dialog
|
2018-08-16 19:21:27 +10:00 |
|
Shannon
|
5168ef0f7a
|
Fixes js tests and some logic
|
2018-08-16 19:20:43 +10:00 |
|
Mads Rasmussen
|
1fadff105a
|
Merge pull request #2849 from umbraco/temp-variants-with-file-uploads
Editing variants with file uploads
|
2018-08-16 10:43:47 +02:00 |
|
Warren Buckley
|
5b4ef5b29e
|
Merge pull request #2854 from umbraco/temp8-w155
Removed double encoding
|
2018-08-15 12:45:37 +01:00 |
|
copilaurobert
|
5da220c436
|
Removed double encoding
|
2018-08-15 10:32:59 +02:00 |
|
Shannon
|
9e131aa633
|
oooooh our first ContentController test :)
|
2018-08-15 17:44:06 +10:00 |
|
Shannon
|
0910a46b8a
|
Merge remote-tracking branch 'origin/temp-variants-with-file-uploads' into temp-variant-save-dialog
|
2018-08-15 17:29:40 +10:00 |
|
Shannon
|
cf39b2a54f
|
Fixes server side check for publishing when a mandatory language isn't published
|
2018-08-15 15:23:02 +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
|
66a00546d1
|
more work with saving, publishing and validation for variants, fixes up a few old things too
|
2018-08-14 23:19:32 +10:00 |
|
Mads Rasmussen
|
66187bf01a
|
fix issue with property variant state being overwritten if document type wasn't saved
|
2018-08-14 12:32:12 +02:00 |
|
Shannon
|
9c84d5e3f9
|
more work with variants, saving, publishing and validation.
|
2018-08-14 20:21:33 +10:00 |
|
Shannon
|
758d09cd5c
|
More work on save and publish overlays
|
2018-08-14 16:29:14 +10:00 |
|
Shannon
|
30d29d9fcf
|
initial commit for save dialog
|
2018-08-13 16:45:05 +10:00 |
|
Shannon
|
e950914fc8
|
Fixes wiring up server validation when creating content
|
2018-08-13 12:11:08 +10:00 |
|
Shannon
|
5bd74f90aa
|
cleanup
|
2018-08-13 11:36:43 +10:00 |
|
Shannon
|
9d5d516064
|
Fixes up invariant property validation since we were only allowing one callback per alias, but we need to allow multiple
|
2018-08-13 11:25:55 +10:00 |
|
Warren Buckley
|
ac9be3995b
|
Merge pull request #2844 from umbraco/temp8-directive-cleanup
Temp8 directive cleanup
|
2018-08-10 13:50:13 +01:00 |
|
Mads Rasmussen
|
ec139ca16c
|
clean up that windows resizer event
|
2018-08-10 14:17:12 +02:00 |
|
Mads Rasmussen
|
23e81a67fa
|
fix indention
|
2018-08-10 14:05:15 +02:00 |
|
Mads Rasmussen
|
c7a5786521
|
remove the deprecaed note
|
2018-08-10 14:03:39 +02:00 |
|
Mads Rasmussen
|
c0ec2a5314
|
move the auto-scale directive from obsolete. It is still pretty usefull for the code editors
|
2018-08-10 14:02:59 +02:00 |
|
Shannon
|
e41aad78b0
|
Updates the logic for the normal file upload for clearing files to be the same as the image cropper which makes more sense, now the upload editor also syncs properly with invariant propertes.
|
2018-08-10 16:52:33 +10:00 |
|
Shannon
|
3932ec0640
|
Fixes how invariant property are processed during saving on the server side.
|
2018-08-10 15:39:57 +10:00 |
|
Shannon
|
d608daa87b
|
Gets new images syncing between instances on image cropper
|
2018-08-10 14:48:58 +10:00 |
|
Shannon
|
2d1bda54be
|
Fixes: Deal with invariant property value syncing, componentizes umb-image-gravity, gets the image cropper syncing data correctly, ensures resizing for image cropper is done when variants change.
|
2018-08-10 13:53:19 +10:00 |
|
Shannon
|
3395e4c150
|
Fixes allowedFileType JS problem with unit test
|
2018-08-10 10:31:04 +10:00 |
|
Mads Rasmussen
|
cd6585c9b9
|
remove detect-fold
|
2018-08-09 21:12:45 +02:00 |
|
Mads Rasmussen
|
a1c4bd6b7a
|
remove umb-content-name
|
2018-08-09 20:59:10 +02:00 |
|
Mads Rasmussen
|
ca85b0e45c
|
remove umb-header
|
2018-08-09 20:53:44 +02:00 |
|
Mads Rasmussen
|
48c5e61d88
|
remove item sorter
|
2018-08-09 20:50:52 +02:00 |
|
Mads Rasmussen
|
933bb8ad44
|
remove drag and drop less import
|
2018-08-09 20:50:30 +02:00 |
|
Mads Rasmussen
|
ab90690e17
|
remove umb-login
|
2018-08-09 20:41:26 +02:00 |
|
Mads Rasmussen
|
67e0b68b7b
|
remove umb-optionsmenu
|
2018-08-09 20:39:50 +02:00 |
|
Mads Rasmussen
|
c50f7a1284
|
remove umb-sort
|
2018-08-09 20:33:48 +02:00 |
|
Mads Rasmussen
|
5ab978ecf5
|
remove umb-photo-folder
|
2018-08-09 20:29:17 +02:00 |
|
Mads Rasmussen
|
16ceca1598
|
remove umb-tab-view
|
2018-08-09 20:23:20 +02:00 |
|
Mads Rasmussen
|
404055917f
|
remove umb-upload-dropzone
|
2018-08-09 20:22:11 +02:00 |
|
Shannon
|
2f0f43e605
|
Gets image cropper working between variants, even with invariant properties, adds unit test to ensure invariant properties in the model are the same reference
|
2018-08-10 00:39:20 +10:00 |
|
Shannon
|
9183a9987b
|
Updates imagecropper to use our new umb-property-file-upload component which now maintains file state between variant switching
|
2018-08-09 23:15:42 +10:00 |
|
Shannon
|
6a7b6f7267
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-08-09 19:38:36 +10:00 |
|
Shannon
|
f738e6d7c7
|
Fixes js tests
|
2018-08-09 19:38:20 +10:00 |
|
Shannon
|
601c30c39a
|
Fixes js tests
|
2018-08-09 19:34:32 +10:00 |
|
Warren
|
e818197365
|
Fix comma dangle ESLint errors
|
2018-08-09 09:00:34 +01: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 |
|
Shannon
|
1ffcc853e1
|
updates package-lock
|
2018-08-09 15:23:46 +10:00 |
|
Shannon
|
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 |
|
Shannon Deminick
|
50597b5715
|
Merge pull request #2843 from umbraco/temp7-eslint
Temp7 eslint
|
2018-08-09 15:19:12 +10:00 |
|
Shannon
|
9d7519d591
|
manually merges noscript update
|
2018-08-09 15:10:27 +10:00 |
|
Mads Rasmussen
|
f35110309a
|
fix comma-dangle error
|
2018-08-08 19:52:31 +02:00 |
|