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

26911 Commits

Author SHA1 Message Date
Bjarke Berg
bbb1328f2c Merge branch 'v8/8.2-rc' into v8/8.2 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2019-10-08 11:41:14 +02:00
Bjarke Berg
70d162efb3 Merge remote-tracking branch 'origin/v8/8.2-rc' into v8/8.2-rc 2019-10-08 11:18:11 +02:00
Bjarke Berg
9d5f7a8a96 Removed rc from version 2019-10-08 11:17:54 +02:00
Bjarke Berg
3e79f43ebe Merge remote-tracking branch 'origin/v8/8.2' into v8/bugfix/GridPropertyEditor-NullReference 2019-10-08 09:02:47 +02:00
Claus
1bc0c8bca2 Merge pull request #6556 from umbraco/v8/bugfix/AB2996-Fix-MediaFolderPickerPreValueEditor 
Only allow one media folder to be picked for RTE paste/drag image upload location
 2019-10-07 16:07:25 +02:00
Bjarke Berg
ccd4392c2a Merge pull request #6568 from umbraco/v8/bugfix/AB2997-RTE-img-button-throws-tempimg-correct-base 
Allow pasted & dragged images that are not yet saved to allow ALT text to be edited
 2019-10-07 15:00:36 +02:00
Bjarke Berg
1ad3103d94 https://github.com/umbraco/Umbraco-CMS/issues/6516 - Revert uncommenting stuff, without knowing why the code was their. 2019-10-07 13:21:31 +02:00
Shannon
03a4affbde Fixes order of parsing RTEs 2019-10-03 10:12:41 +02:00
Niels Lyngsø
05ff51575b Wait for image to load, for measuring size. Removed the 500ms timeout that was prone to error if image was'nt loaded within time. 2019-10-03 10:08:07 +02:00
Warren Buckley
76dd7a667a Remove console.logs 2019-10-03 10:08:07 +02:00
Warren Buckley
0e16d9cd33 WIP: Try and support images in the RTE that are pasted/dragged in and are NOT in media yet to be able to update the ALT text 2019-10-03 10:08:07 +02:00
Warren Buckley
033780cb90 We only want to allow you to pick one folder in the media library for this prevalue editor 2019-10-02 13:50:00 +01:00
Shannon
6d9af75fbe Fixes the media refs within the RTE in the Grid 2019-10-02 13:49:50 +02:00
Niels Lyngsø
5669528253 fixing icon issue in PreValueEditor 2019-10-02 12:06:21 +02:00
Niels Lyngsø
72952db3b2 fixing toolbar issues when sticky and RTE width in grid. 2019-10-02 12:05:26 +02:00
Shannon
4918fa0868 added timeout 2019-10-02 12:05:11 +02:00
Shannon
d0a1f96990 Merge branch 'v8/8.2-rc' into v8/8.2 2019-10-02 10:46:17 +02:00
Shannon
aed32afd0f Revert copy-paste property editors, will move to a diff branch 2019-10-02 10:41:00 +02:00
Shannon
76410632b6 Changes how soft redirecting works 2019-10-01 18:30:09 +02:00
Shannon Deminick
293d50f400 Merge pull request #6051 from MicroTekAppDev/temp8-5484 
Fix for #5484 - V8 : Back office freeze when opening multiple content nodes
 2019-10-01 18:16:04 +02:00
Warren Buckley
e9b0d32401 Merge pull request #6497 from umbraco/v8/bugfix/0000-TinyMCE-CSS-corrections-for-grid 
fixing toolbar issues when sticky and RTE width in grid.
 2019-10-01 13:35:38 +01:00
Niels Lyngsø
c2b6e49ad3 fixing icon issue in PreValueEditor 2019-10-01 13:35:27 +02:00
Niels Lyngsø
6cfe689a69 fixing toolbar issues when sticky and RTE width in grid. 2019-10-01 12:17:23 +02:00
Niels Lyngsø
742bce039d added timeout 2019-10-01 10:25:50 +02:00
Shannon
d677ea618c Fixes null reference caused in GridPropertyValueEditor when the value is empty 2019-10-01 09:48:46 +02:00
Sebastiaan Janssen
1512800639 Bump to RC version 2019-09-30 13:48:43 +02:00
Sebastiaan Janssen
df6e29a249 Uses just the fix from #6414 - to show a preview of svg files after selection in the media picker 2019-09-29 14:55:39 +02:00
Sebastiaan Janssen
e37434d816 Don't keep appending the content name on each change of the language dropdown 
(cherry picked from 02c3a5a5b2797d59b229d1fbcc8ab6524f247e55 and 7de7e59f55)
 2019-09-29 11:54:27 +02:00
Niels Lyngsø
759c8b8b98 updated comment 2019-09-26 16:26:07 +02:00
Niels Lyngsø
3d9c2fee7c new Angular Truncate Filter, that supports Legacy version from Umbraco Forms, plus updated code for even prettier truncated content. 2019-09-26 16:26:07 +02:00
Niels Lyngsø
2c18a125c6 Revert "Renamed angular filter so it doesn't collide with the "truncate" one in Forms." 
This reverts commit f1cb89b249bdea3faf4b6d6ccf248f64b2056040.
 2019-09-26 16:26:07 +02:00
elitsa
93df9c4dfd Renamed angular filter so it doesn't collide with the "truncate" one in Forms. 2019-09-26 16:26:07 +02:00
Shannon Deminick
8a2661c966 Merge pull request #6446 from umbraco/v8/bugfix/AB2881-RTE-preventdrag-for-unallowed-configs 
Fixes #6424 - Prevent drag & drop of images if button to insert media is not enabled
 2019-09-26 16:15:27 +02:00
Warren Buckley
a59fffd891 Keep it DRY 2019-09-26 15:10:23 +01:00
Bjarke Berg
768c9e99fb Merge pull request #6442 from umbraco/v8/bugfix/0000-TinyMCE-toolbar-visual-correction 
TinyMCE looking more Umbraco alike
 2019-09-26 15:43:10 +02:00
Niels Lyngsø
df858d47c2 fixing the looks for Grid 2019-09-26 15:40:51 +02:00
Shannon Deminick
fb9b1e0c7f Merge pull request #6447 from umbraco/v8/bugfix/lucene-index-diagnostics 
Automatically assign LuceneIndexDiagnostics instead of GenericIndexDiagnostics for LuceneIndexes
 2019-09-26 15:35:07 +02:00
Warren Buckley
87df6c74c9 * Ensure you can only drag and drop or paste images in when the insert image/media button is enabled in thr RTE toolbar/config 
* If disallowed then we add a new native browser event for dragover etc to prevent dropping & showing the no/stop sign icon
 2019-09-26 14:31:20 +01:00
Bjarke Berg
e90a10ba95 Merge pull request #6443 from umbraco/v8/bugfix/0000-TinyMCE-toolbar-width-fix 
lets not set a specific width, but do it by CSS.
 2019-09-26 15:28:40 +02:00
Shannon
7e3cce91eb Automatically assign LuceneIndexDiagnostics instead of GenericIndexDiagnostics for LuceneIndexes 2019-09-26 15:27:59 +02:00
Niels Lyngsø
1a85c4a635 overwrite TinyMCE skin to match Umbraco Visuals 2019-09-26 15:05:02 +02:00
Shannon
6793167865 fixes brackets 2019-09-26 14:25:06 +02:00
Niels Lyngsø
1fc1de9c73 lets not set a specific width, but do it by CSS. 2019-09-26 13:13:38 +02:00
Warren Buckley
f3496d894b Adds contenteditable=false attribute as for whatever reason the CSS class of .mceNonEditable is not working when a macro is saved & loaded in a content node 2019-09-26 11:36:43 +01:00
Bjarke Berg
198aee27ce Merge pull request #6432 from umbraco/v8/bugfix/non-unique-ids 
Use unique IDs for all password fields in umb-login
 2019-09-26 11:46:16 +02:00
Bjarke Berg
39ad226007 Merge pull request #6434 from umbraco/v8/feature/0000-RTE-initialization-polish 
RTE initialization fix
 2019-09-26 11:28:26 +02:00
Niels Lyngsø
cb44138920 using angular promise instead 2019-09-26 11:23:19 +02:00
Warren Buckley
b81b92ac64 Fixes up image upload bug - as this got refactored to an event. editor is now args.editor 
* Also adds in the code that was in the initEvent function that got missed in merge/refactor
* Fix to use localStorageService & not native browser one
 2019-09-26 10:19:23 +01:00
Warren Buckley
36914a1d71 Remove the old initEvents that is no longer used 2019-09-26 10:17:26 +01:00
Niels Lyngsø
1bc7728b69 Test for Bjarke 2019-09-26 10:39:20 +02:00