yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,530 Commits 4 Branches 7 Tags
49bca0fa439b502589720089bdb78e7aaae22640
Commit Graph

9878 Commits

Author SHA1 Message Date
Bjarke Berg
49bca0fa43 Merge pull request #6325 from umbraco/v8/feature/2438AB-RTE-Image-Config-MediaFolder 
V8: AB 2438 - RTE Pasted/Dragged Images Media Folder Config
 2019-09-17 11:16:26 +02:00
Warren Buckley
519fcab087 Use the recrusive feature bool of Directory.Delete to delete the file at the same time :) 2019-09-17 09:25:26 +01:00
Warren Buckley
11194314fb Be less verbose and assign in one line 2019-09-17 09:22:09 +01:00
Shannon Deminick
aca648d84f Merge pull request #6354 from zpqrtbnk/v8/bugfix/nucache-content-store 
Bugfix NuCache ContentStore
 2019-09-17 13:08:59 +10:00
Stephan
b51fb2da9d Fix NuCache ContentStore 2019-09-16 17:27:03 +02:00
Kenn Jacobsen
6467aae206 Support "allow items of type" for all types in MNTP (#6177) 2019-09-16 16:32:29 +02:00
Warren Buckley
0d49288875 Update src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-16 09:34:49 +01:00
Warren Buckley
14e33e0cb5 Update src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-16 09:33:42 +01: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
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
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
Warren Buckley
a5c5a12a00 Remove dupe Authz attribute 2019-09-12 12:07:57 +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
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
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
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
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
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
Warren Buckley
28a0e0aa6f Pass through a GUID that a media picker / new folder picker will use 2019-09-11 10:02:59 +01:00
Warren Buckley
6de4bbbae6 Adds new config option to RTE & Grid Property Editors - for now uses MediaPicker until we have a FolderPicker Angular PreValue view/editor 2019-09-11 09:03:10 +01:00
Warren Buckley
e8ccfd52af Merge remote-tracking branch 'origin/v8/dev' into v8/feature/2349AB-RTE-Image-Upload 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2019-09-10 10:58:24 +01:00
Warren Buckley
6669b54a70 Move the logic for finding temp images for persisting into a shared class so Grid & RTE can both use it 2019-09-10 10:50:36 +01:00
Warren Buckley
5e394cb62b Refactor we do not instantly persist the uploaded file to a media item in Umbraco - what if the user undo's or removes it from content we will bloat the media section 
* Adds a data-tmpimg attribute to the <img> in the markup, which we scan for when persisting to the DB in the RTE PropertyValueEditor to then perist media items
* TODO: Find a way to get TinyMCE to NOT send a base64 down the wire as the saved content/HTML
 2019-09-09 16:04:52 +01:00
Niels Lyngsø
02534c4ac5 Merge pull request #5706 from kjac/v8-feature-copy-property 
V8: Copy on property level
 2019-09-09 15:13:10 +02:00
Bjarke Berg
d05e79ca15 Merge branch 'v8/dev' into v8/bugfix/5925-nucache-startup 2019-09-09 13:54:27 +02:00
Rasmus John Pedersen
8f32fce781 Update Headless assembly names 2019-09-09 11:53:12 +02:00
Kenn Jacobsen
2cbed6c6b0 Merged with v8/dev 2019-09-09 11:22:39 +02:00
Kenn Jacobsen
604bb6b526 Don't allow selecting non-element types when composing element types 2019-09-05 17:57:40 +02:00
Poornima Nayar
088abae314 Maxlength attribute on macro name 2019-09-05 16:19:46 +02:00
leekelleher
83588b2dc8 ContentTypeService GetAllElementTypes method 
Added an extension method to get all the Element Types from
the ContentTypeService.

Refactored NestedContent's controller accordingly.
 2019-09-05 15:36:14 +02:00
Sebastiaan Janssen
47f365e415 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-09-05 13:03:23 +02:00
Sebastiaan Janssen
5bbe1fadda Fixes #6021 - Error on save and publish for existing node after content creation in eventhandler 2019-09-05 10:31:08 +02:00
Mads Krohn
0e8b4b8342 Correctly html encode text (#6235) 
(cherry picked from commit 1bf85ab1db)
 2019-09-02 08:48:48 +02:00
Mads Krohn
1bf85ab1db Correctly html encode text (#6235) 2019-09-02 08:46:33 +02:00
christophnz
1d94c4b9bb Fixed returntype of IPublishedContent.Siblings<T> to be IEnumerable<T> rather than IEnumerable<IPublishedContent> 2019-08-30 14:27:13 +02:00
Warren Buckley
1ec88a6647 Add new API controller for uploading images dragged/pasted into a TinyMCE editor 2019-08-29 14:06:29 +01:00
Andy Butland
d77559d52b Added metadata indicating if document published for content picker display 2019-08-29 14:28:45 +02:00
Andy Butland
8fdc14f360 Added metadata indicating if document published for content picker display 2019-08-29 14:27:31 +02:00
Kenn Jacobsen
27c8c7abf1 Don't use a hardcoded "image" type in media picker value conversion 
(cherry picked from commit 3457018fb4)
 2019-08-29 14:21:07 +02:00
Kenn Jacobsen
3457018fb4 Don't use a hardcoded "image" type in media picker value conversion 2019-08-29 14:20:03 +02:00
stevemegson
742105594e V8: Indexing of grid values containing JSON (#6201) 
(cherry picked from commit b254b4fcda)
 2019-08-29 14:07:48 +02:00
stevemegson
b254b4fcda V8: Indexing of grid values containing JSON (#6201) 2019-08-29 14:06:59 +02:00