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

9578 Commits

Author SHA1 Message Date
Warren Buckley
7e7d1eea6c Merge pull request #6415 from umbraco/0000-RTE-turn-off-agressive-paste-tidying 
RTE turn off agressive paste tidying
 2019-09-24 16:54:13 +01:00
Niels Lyngsø
493d7010ba Reverting to use element ID to initialisation 2019-09-24 17:10:20 +02:00
Warren Buckley
6c0d06c77c Merge branch 'v8/dev' into v8/feature/0000-RTE-initialization-polish 2019-09-24 14:22:10 +01:00
Warren Buckley
5d36423087 After merge - makes sure to resize the deleted & then re-added same image using the same sizing function 2019-09-24 13:47:04 +01:00
Warren Buckley
0aab19f201 Merge branch 'v8/dev' into v8/bugfix/AB2734-Image-Deletion-Bug 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2019-09-24 13:46:02 +01:00
Niels Lyngsø
84bee5023f Merge commit '0fbabd088f3b83db00f76802221a57fec64f8895' into v8/feature/0000-RTE-initialization-polish 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2019-09-24 13:31:58 +02:00
Niels Lyngsø
eedff5d9d1 getting rid of comments 2019-09-24 13:29:48 +02:00
Niels Lyngsø
bbb369cbfb lets keep this 2019-09-24 13:29:02 +02:00
Niels Lyngsø
8782935edb no need for this anymore 2019-09-24 13:28:18 +02:00
Warren Buckley
e3b4283ced Update src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-24 12:11:14 +01:00
Warren Buckley
ab7d380ecc Update src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-24 12:11:01 +01:00
Warren Buckley
e0218dc96e Update src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-24 12:10:55 +01:00
Warren Buckley
f43a6a9004 Fix unit test 2019-09-24 12:00:39 +01:00
Warren Buckley
7728559ce4 Rather than tryinbg to find off an inserted img in the DOM use the localStorage 
Uses the Angular localStorage lib that falls back to cookies as opposed to native browser localStorage
Clears out tinymce__ localstorage keys when we save the node to ensure we dont have loads stored for the user
 2019-09-24 11:47:33 +01:00
Niels Lyngsø
5212514818 lets allow classes and h1,h2,h3,h4,h5,h6 no matter the configuration. 2019-09-24 11:12:13 +02:00
Niels Lyngsø
aef4bfaac4 we do not use this value jet. 2019-09-24 11:11:48 +02:00
Warren Buckley
906e59c68b Merge branch 'v8/dev' into v8/bugfix/AB2734-Image-Deletion-Bug 2019-09-24 09:13:23 +01:00
Warren Buckley
92a5182427 Moves the image resize on insert into a function that media insert & drag/pasted images uses 2019-09-23 14:42:28 +01:00
CatButtes
44e2c2d93c Set add language button to correct colour 
Fix Issue #6380
 2019-09-20 18:06:19 +02:00
Lynne Finnigan
327764d366 Change link text for installing starter kit thumbnail & update styles 2019-09-20 17:53:13 +02:00
Søren Kottal
362fb7722d Open composition doctypes in infinite editor (#6387) 2019-09-20 15:34:53 +02:00
Kenn Jacobsen
705713b497 V8: Add clientside mandatory validation to textarea (#6390) 2019-09-20 14:10:48 +02:00
Kenn Jacobsen
10aac80ada V8: Add clientside mandatory validation to Multiple Textstring… (#6391) 2019-09-20 14:09:38 +02:00
Warren Buckley
fdfaf06717 By removing the blobCache code - reintroduced a bug where if the same image was put into the RTE the data-tmpimg attribute is not applied to the duplicate image which this fixes 2019-09-20 12:53:30 +01:00
Warren Buckley
92d10db2ab Removing the code to remove the item from blobCache - fixes Shan's reported bug 2019-09-20 12:52:21 +01:00
Kenn Jacobsen
71f4a79959 Fix mandatory validation for Member and Member Group pickers (#6393) 2019-09-20 13:49:27 +02:00
Kenn Jacobsen
0c67603745 Make mandatory validation work for Media Picker (#6394) 2019-09-20 13:48:31 +02:00
Kenn Jacobsen
1d6dbbebe3 Make mandatory validation work for Markdown Editor 2019-09-20 13:47:27 +02:00
Lynne Finnigan
77e41489c1 Changed 'customize' anchor tag to a button element 2019-09-20 13:18:29 +02:00
Niels Lyngsø
4259c9bf1d less flickering on init of TinyMCE 2019-09-20 11:08:21 +02:00
Niels Lyngsø
12fd9baf3b clean up init + move editor.uploadImages to service instead of specific implementation 2019-09-20 09:08:28 +02:00
Shannon
a5aa63d951 Merge branch 'v8/dev' into v8/bugfix/AB2727-RTEUploadImage-Prevent-Node-Save 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
 2019-09-20 11:06:18 +10:00
Shannon
a0c0f61ef4 fix js unit test 2019-09-20 11:03:45 +10:00
Kenn Jacobsen
97ac31a858 Fix preview with multiple cultures + highlight the current culture 2019-09-19 15:27:40 +02:00
stevemegson
e9bd67b695 V8: Tours - fix scrolling highlighted element into view (#6356) 2019-09-19 15:20:16 +02:00
Steve Megson
7c2643d57a Reload after rollback 2019-09-19 14:59:25 +02:00
Sebastiaan Janssen
5fdae055d5 Fix bad merge 2019-09-19 13:13:21 +02:00
Warren Buckley
66d804d3db Merge pull request #6372 from umbraco/v8/feature/0000-RTE-paste-from-word 
Improve content pasted from MS Word
 2019-09-19 12:02:40 +01:00
martin j griffiths
b4495d0ae5 Update rte.controller.js 
Fix issue where an embedded macro prevents editor from returning to pristine/valid after a publish
 2019-09-19 11:50:47 +02:00
Warren Buckley
8708a0ae97 Wrap in safeApply 2019-09-19 10:38:33 +01:00
Niels Lyngsø
59c5f4cd7c further comment 2019-09-19 11:36:41 +02:00
Niels Lyngsø
a3de75f4c0 added comments + better naming 2019-09-19 11:34:45 +02:00
Niels Lyngsø
f28d52898d no need for this one 2019-09-19 11:15:32 +02:00
Kenn Jacobsen
f7d9c0b108 V8: Fix clientside mandatory validation for checkbox list (#5780) 2019-09-19 11:04:02 +02:00
Warren Buckley
e92823f756 Remove the un-needed notificiation 2019-09-19 10:00:42 +01:00
Malthe Petersen
a420c145ae 5989 - fixed focalpoint for infinite media picker (#5991) 2019-09-19 10:23:55 +02:00
Kenn Jacobsen
5caaec2af8 V8: Set the form as dirty when adding/removing colors to/from Umbraco.ColorPicker (#5998) 2019-09-19 10:10:09 +02:00
Niels Lyngsø
bb99891c2f a few extra element types to allow 2019-09-19 09:29:53 +02:00
Niels Lyngsø
380d876f7e remove test of umb-paste-plugin 2019-09-19 09:19:20 +02:00
Niels Lyngsø
f8b2489288 clean out image tests 2019-09-19 09:18:11 +02:00