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

30765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ec0c79a38c Merge branch 'v8/dev' into v8/feature/2438AB-RTE-Image-Config-MediaFolder 2019-09-12 09:18:55 +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
Bjarke Berg
5b791a1787 Merge pull request #6246 from umbraco/v8/feature/2349AB-RTE-Image-Upload 
AB 2439 -  Create API controller for uploading images for RTE
 2019-09-12 08:23:39 +02: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
Warren Buckley
39fd953ca8 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 10:03:19 +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
Niels Lyngsø
fdeaaad738 allow mediapicker to only pick folders 2019-09-11 10:12:01 +02: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
Sebastiaan Janssen
83ad1fd910 Apply only the wanted change from V7/bug/6283 save member resets password #6284 2019-09-10 17:13:31 +02:00
Elitsa Marinovska
c8c60b7518 Reverting unintended merge 
Revert "V7/bug/6283 save member resets password"
 2019-09-10 13:56:07 +02:00
Elitsa Marinovska
f0fb371b2c Revert "V7/bug/6283 save member resets password" 2019-09-10 13:54:35 +02:00
Elitsa Marinovska
979d25dd07 Merge pull request #6284 from umbraco/v7/bug/6283-save-member-resets-password 
V7/bug/6283 save member resets password
 2019-09-10 13:10:11 +02:00
Warren Buckley
cfe196a45d Fix up C# unit tests - VS19 failed to tell me about these failing to build :S 2019-09-10 11:47:52 +01:00
Warren Buckley
83d568dd5a Fix up unit test 2019-09-10 11:32:02 +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
d5331d85af Removing the localStorage key cleanup - seems to be a timing issue if you drag the image into a middle of a word 2019-09-10 10:48:28 +01:00
elitsa
8bc2cc7d4c Merge branch 'v7/dev' into v7/bug/6283-save-member-resets-password 2019-09-10 10:50:18 +02:00