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

30738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bjarke Berg
a87b72cd05 Merge pull request #6554 from umbraco/v8/bugfix/grid-editor-media-refs 
Fixes the media refs within the RTE in the Grid
 2019-10-03 10:40:38 +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
aed32afd0f Revert copy-paste property editors, will move to a diff branch 2019-10-02 10:41:00 +02:00
Sebastiaan Janssen
1512800639 Bump to RC version 2019-09-30 13:48:43 +02:00
Shannon Deminick
cf36268f9f Merge pull request #6338 from umbraco/v8/bug/6162-angular-filter-fix 
Fixes v8: Correct label filter is applied when copying NC
 2019-09-27 09:54:10 +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
Bjarke Berg
36319efc90 Merge pull request #6438 from umbraco/v8/bugfix/macro-still-selectable 
Fixes selecting Macro Content in RTE to be non editable once node is saved
 2019-09-26 13:04:21 +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
Bjarke Berg
0b7c926db3 Merge pull request #6435 from umbraco/v8/bugfix/fix-rte-upload 
Fix RTE Upload (Due to merge conflict & refactor) 🙈
 2019-09-26 11:26:23 +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
Niels Lyngsø
f142e429e3 Merge remote-tracking branch 'origin/v8/8.2' into v8/feature/0000-RTE-initialization-polish 2019-09-26 10:04:07 +02:00
Bjarke Berg
d1dc2541c7 Merge pull request #6422 from umbraco/v8/bugfix/6419-panic-no-children 
Fixes #6419 regression issue in nucache causing a panic exception
 2019-09-26 08:44:45 +02:00
kfc
40dd68e4bb Use unique IDs for all password fields in umb-login 2019-09-26 00:04:11 +02:00
Shannon
7d47432e96 Ensure we don't add duplicate keys 2019-09-25 21:37:22 +02:00
Sebastiaan Janssen
b2ee35b3b0 Potentially fixes the last security warnings on GitHub 2019-09-25 20:38:43 +02:00
Niels Lyngsø
351323ea20 Fixed toolbar to go on multiple lines in narrow spaces 2019-09-25 15:55:50 +02:00
Shannon
f6f8e3cbd5 Merge branch 'temp-5362' of https://github.com/dave0504/Umbraco-CMS into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/ContentService.cs
 2019-09-25 15:54:07 +02:00
Niels Lyngsø
d963c70580 using a timeout to ensure that placeholder element has been appended to document 2019-09-25 15:38:05 +02:00
Shannon
afb992dd60 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Properties/Settings.Designer.cs
#	src/Umbraco.Web/Properties/Settings.settings
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-09-25 14:48:29 +02:00
Shannon
18cd508804 Merge remote-tracking branch 'origin/v7/7.15' into v7/dev 2019-09-25 14:22:56 +02:00