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

30455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Warren Buckley
9d8e4fd66f Fixes the issue with the image being stored as a base64 inline image, which can be HUGE & make POST request slow to save the content node 2019-09-09 18:50:49 +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
Warren Buckley
7d2c92b651 A new temp location for RTE uploads 2019-09-09 15:54:03 +01:00
Shannon
e593857b61 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2019-09-09 23:31:22 +10:00
Shannon
4869298b03 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
 2019-09-09 23:31:07 +10: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
c121fa323d Merge pull request #6131 from umbraco/v8/bugfix/5925-nucache-startup 
Adds POC for fast building of in-memory nucache from persisted files
 2019-09-09 15:02:49 +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
Nathan Woulfe
1723c39e00 fix tray colour, add some structure to CSS 
(cherry picked from commit daadfe6e6c)
 2019-09-06 08:41:34 +02:00
Nathan Woulfe
daadfe6e6c fix tray colour, add some structure to CSS 2019-09-06 08:39:57 +02:00
Kenn Jacobsen
089e450e09 Make sure media picker items are sortable (#6037) 
(cherry picked from commit 6da0caa902)
 2019-09-05 18:09:23 +02:00
Kenn Jacobsen
6da0caa902 Make sure media picker items are sortable (#6037) 2019-09-05 18:08:00 +02:00
Kenn Jacobsen
3294137006 V8: Make the color picker mandatory validation work (#5765) 
(cherry picked from commit 8aca254ed0)
 2019-09-05 18:01:59 +02:00
Kenn Jacobsen
8aca254ed0 V8: Make the color picker mandatory validation work (#5765) 2019-09-05 18:01:07 +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
a7f1001c53 Some cleanup to the published status dashboard 2019-09-05 17:54:24 +02:00
Bjarne Fyrstenborg
1b0113d3aa v8: Edit embed in grid (#4899) 2019-09-05 17:53:04 +02:00
Bjarne Fyrstenborg
73a61e65de v8: Use umbCheckbox in packager (#6258) 2019-09-05 17:40:28 +02:00
Nathan Woulfe
0534dba12b 5732 grid reorder on scroll listview bugfix (#5918) 2019-09-05 17:13:41 +02:00
Kenn Jacobsen
30cf2fd4b2 Include sort and filter in list view back link 2019-09-05 16:54:46 +02:00
Sebastiaan Janssen
c7ea93199f Merge pull request #6222 from patrickdemooij9/temp-5724 
5724: Unable to add multiple property groups
(cherry picked from commit 3163b5f2fe)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
 2019-09-05 16:49:08 +02:00
Sebastiaan Janssen
3163b5f2fe Merge pull request #6222 from patrickdemooij9/temp-5724 
5724: Unable to add multiple property groups
 2019-09-05 16:45:33 +02:00
Stephan
280f4e7cbe Fix member properties [#6227] 2019-09-05 16:34:17 +02:00
Poornima Nayar
d044dd07c3 Show a friendly exception message when the media name exceeds 255 characters 
(cherry picked from commit e0d4168f3f)
 2019-09-05 16:26:46 +02:00
Poornima Nayar
e0d4168f3f Show a friendly exception message when the media name exceeds 255 characters 2019-09-05 16:26:24 +02:00
Poornima Nayar
890281b271 better exception message on content type save 
(cherry picked from commit 7d3655c78c)
 2019-09-05 16:22:35 +02:00
Poornima Nayar
cafd07fd01 Better exception message on media type save 
(cherry picked from commit d2efcc822d)
 2019-09-05 16:22:27 +02:00
Poornima Nayar
2024681a26 Friendly exception message when datatype with name more than 255 characters is saved 
(cherry picked from commit 79f8dc200a)
 2019-09-05 16:22:17 +02:00
Poornima Nayar
7d3655c78c better exception message on content type save 2019-09-05 16:22:07 +02:00
Poornima Nayar
d2efcc822d Better exception message on media type save 2019-09-05 16:21:38 +02:00
Poornima Nayar
79f8dc200a Friendly exception message when datatype with name more than 255 characters is saved 2019-09-05 16:21:21 +02:00
Poornima Nayar
b7e75daa75 Maxlength attribute on macro name 
(cherry picked from commit 088abae314)
 2019-09-05 16:20:36 +02:00
Poornima Nayar
088abae314 Maxlength attribute on macro name 2019-09-05 16:19:46 +02:00
Poornima Nayar
c594377c05 fix the left margin which causes a space in the help drawer article titles and tour titles 
(cherry picked from commit 0e3f324cb0)
 2019-09-05 16:15:14 +02:00
Poornima Nayar
0e3f324cb0 fix the left margin which causes a space in the help drawer article titles and tour titles 2019-09-05 16:14:37 +02:00
Bjarne Fyrstenborg
0465169727 v8: Fix SVG image preview (#5883) 
(cherry picked from commit 7664d2df18)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
 2019-09-05 16:09:16 +02:00
Bjarne Fyrstenborg
7664d2df18 v8: Fix SVG image preview (#5883) 2019-09-05 16:06:59 +02:00
Bjarne Fyrstenborg
105dd989de Add margin before value in listview grid layout 
(cherry picked from commit 495ad4c06b)
 2019-09-05 15:53:53 +02:00
Bjarne Fyrstenborg
495ad4c06b Add margin before value in listview grid layout 2019-09-05 15:53:01 +02:00