Commit Graph

28629 Commits

Author SHA1 Message Date
Niels Lyngsø fa3f5287c1 making our own paste plugin to be able to handle images in pasted content from MS Word 2019-09-13 13:44:54 +02:00
Niels Lyngsø f59cf544a5 make gulp able to watch libs 2019-09-13 13:43:48 +02:00
Warren Buckley 63914aec4f Couple of fixes 2019-09-13 11:10:47 +01:00
Warren Buckley df6da16161 Merge branch 'v8/dev' into v8/feature/2438AB-RTE-Image-Config-MediaFolder
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
2019-09-13 09:51:53 +01:00
Rasmus John Pedersen e2ba9e1eb4 Remove limit of dashboard tabs and fix when expand menu is shown 2019-09-13 10:31:44 +02:00
Stephan e5634d13f1 Lazily create content and models in NuCache 2019-09-13 09:55:53 +02:00
Shannon Deminick 3be464726b Merge pull request #6332 from umbraco/v8/feature/2349AB-RTE-Image-Upload
AB 2439 - Create API controller for uploading images for RTE (Final Fixes)
2019-09-12 23:55:59 +10:00
Warren Buckley c4026fb92f Inject all the things - aka make sure Shan doesn't poke with a sharp pointy stick for using Current 2019-09-12 14:54:21 +01:00
Shannon aa9ece94b7 naming convention and null check 2019-09-12 23:37:17 +10:00
Warren Buckley 0d0abca255 Move the general cleanup of the App_Data/TEMP/FileUploads folder for one day+ old files 2019-09-12 14:35:45 +01:00
Warren Buckley f6e9fb2845 Adds same code loop as FileUploadCleanupFilterAttribute to delete files 2019-09-12 14:27:22 +01:00
Shannon 6ade20717f Merge branch 'v8/bugfix/background-pure-live-rebuild-AB1833' of https://github.com/umbraco/Umbraco-CMS into v8/bugfix/background-pure-live-rebuild-AB1833 2019-09-12 23:15:16 +10:00
Shannon c7c2f64b62 removes comments 2019-09-12 23:15:03 +10:00
Shannon Deminick d7b950fe06 Update src/Umbraco.Web/RoutableDocumentFilter.cs
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
2019-09-12 23:14:18 +10:00
Shannon Deminick 2c27a631c9 Update src/Umbraco.Web/RoutableDocumentFilter.cs
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
2019-09-12 23:14:10 +10:00
Warren Buckley 056e057cbb Merge pull request #6327 from umbraco/v8/feature/6326-RTE-Image-size-as-attribute
store img size as html attributes
2019-09-12 12:51:05 +01:00
Niels Lyngsø 31d09c5e04 paste tidying 2019-09-12 13:47:29 +02:00
Warren Buckley a5c5a12a00 Remove dupe Authz attribute 2019-09-12 12:07:57 +01:00
Warren Buckley ba319609f2 Fix up tests - thanks again VS for not notifying me that the Build fails when I build the entire SLN 2019-09-12 09:40:21 +01:00
Warren Buckley 632808acdb * Inbject UmbracoContextAccessor & null check it for the user id
* Remove unused & sort usings
2019-09-12 09:04:23 +01:00
Steve Megson ffcc84b1fb Data type configuration serialization 2019-09-12 08:57:05 +01:00
Warren Buckley 4ccebbc209 Reopen branch/PR for fixes
* Reorder usings
* Add an error response & log the reason if we can't move a file about
* Add UmbracoApplicationAuthorize attribute for security so not any user can upload images
2019-09-12 08:49:40 +01:00
Steve Megson b0deb4ceab AddTypedLabels - find standard label properties based on alias rather than ID 2019-09-12 08:45:52 +01:00
Stephan cbf6801d5a Merge branch v8/dev into v8/feature/mb-embed 2019-09-12 09:33:10 +02:00
Shannon 8a60c95a36 Fixes default weighting for Umbraco.Web handlers and adds unit test 2019-09-12 17:04:29 +10:00
Shannon 81b277314c better logging 2019-09-12 16:21:17 +10:00
Warren Buckley 698dcc0fef Merge branch 'v8/feature/2349AB-RTE-Image-Upload' into v8/feature/2438AB-RTE-Image-Config-MediaFolder 2019-09-11 14:25:46 +01:00
Warren Buckley 54a3bd07d7 Logic to use -1 Media root folder if no media folder is picked on the configuration of the RTE or the Grid 2019-09-11 14:24:52 +01:00
Bjarke Berg 401e362298 Remove the image from tinyMce cache, otherwise we can't handle if we upload the exactly same image twice 2019-09-11 15:20:19 +02:00
Shannon 942c6c75c5 fixes tests 2019-09-11 23:01:11 +10:00
Niels Lyngsø 1c651b4e59 store img size as html attributes 2019-09-11 14:31:03 +02:00
Shannon 19716e3c96 fixing tests 2019-09-11 21:47:43 +10:00
Warren Buckley a6f68ceaa7 Merge branch 'v8/feature/2438AB-RTE-Image-Config-MediaFolder' of https://github.com/umbraco/Umbraco-CMS into v8/feature/2438AB-RTE-Image-Config-MediaFolder 2019-09-11 12:21:46 +01:00
Warren Buckley 496ae724b4 Merge branch 'v8/feature/2349AB-RTE-Image-Upload' into v8/feature/2438AB-RTE-Image-Config-MediaFolder
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
2019-09-11 12:20:27 +01:00
Niels Lyngsø 247a40d46b Merge branch 'v8/feature/2438AB-RTE-Image-Config-MediaFolder' of https://github.com/umbraco/Umbraco-CMS into v8/feature/2438AB-RTE-Image-Config-MediaFolder 2019-09-11 13:18:44 +02:00
Niels Lyngsø 3c137668e0 created prevalueeditor mediafolderpicker 2019-09-11 13:18:40 +02:00
Niels Lyngsø 9b4ccc78d4 corrected misspelling 2019-09-11 13:18:14 +02:00
Niels Lyngsø bb6c4ace90 ensure that we handle string values 2019-09-11 13:18:04 +02:00
Niels Lyngsø fd3fb4c937 grey out not selectable media items in media grid. 2019-09-11 13:17:40 +02:00
Niels Lyngsø 0b55468e5c make sure to check string boolean, since it arrives as string because of AngularJS 2019-09-11 13:17:26 +02:00
Warren Buckley 39050d06f9 Use a guid instead of user id & unix time offset for unique folder path 2019-09-11 11:16:47 +01:00
Warren Buckley f07be7df1c Usa a CONST for the data attribute 2019-09-11 11:13:46 +01:00
Warren Buckley 9bbc66d10d Some rename of variables for readability 2019-09-11 11:06:38 +01:00
Warren Buckley 104d414887 Fix some trailing typo stuff 2019-09-11 11:00:23 +01:00
Warren Buckley a47811f210 Update src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
2019-09-11 10:55:12 +01:00
Warren Buckley 9f4697c5b3 Update src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
2019-09-11 10:54:47 +01:00
Warren Buckley 9167cad9fc Update copy 2019-09-11 10:36:30 +01:00
Niels Lyngsø 734794019d Merge branch 'v8/feature/2438AB-RTE-Image-Config-MediaFolder' of https://github.com/umbraco/Umbraco-CMS into v8/feature/2438AB-RTE-Image-Config-MediaFolder 2019-09-11 11:07:35 +02:00
Niels Lyngsø 313260a6ca remove double end tag 2019-09-11 11:07:15 +02:00
Warren Buckley f735c3eae3 Updates view for Config to new PreValue editor that Niels L is working on 2019-09-11 10:05:20 +01:00