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

30724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BatJan
885f0f0cae Lower the z-index so it does not clash with the publishing menu 2019-09-26 16:47:16 +02:00
Martin Jensen
99dcbd3272 Removing unnecessary delete confirmation (#6448) 2019-09-26 16:27:24 +02:00
BatJan
9c366fe42b Provide text alternatives for non-visual context 
Co-authored-by: webdokkeren <thormadsenholm@gmail.com>
 2019-09-26 16:11:03 +02:00
Andrei Ilie Pîrvan
b188bfa059 fix issue #6248 2019-09-26 15:34:51 +02:00
Bjarke Berg
6a7b9fa6f7 Merge branch 'v8/8.2' into v8/dev 2019-09-26 15:30:51 +02: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
6793167865 fixes brackets 2019-09-26 14:25:06 +02:00
Sebastiaan Janssen
5831cd9159 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2019-09-26 13:45:50 +02:00
Benjamin Howarth
16837d018a #2996 changed formatting to none for both data transfer & persistence 2019-09-26 13:33:41 +02:00
Benjamin Howarth
d3c4aace16 #2996 added GlobalSettings.DebugMode switch for JSON formatting indentation. 2019-09-26 13:33:41 +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
4904060d7f Merge remote-tracking branch 'origin/v8/8.2' into v8/dev 2019-09-26 13:04:54 +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
6c1df64eee Merge branch 'v8/8.2' into v8/dev 2019-09-26 11:47:38 +02: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
Sebastiaan Janssen
8ec73b1810 Merge branch 'v8/8.2' into v8/dev 2019-09-26 11:31:30 +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
Nathan Woulfe
713cf2312f adding visibility:hidden to the un-hovered list fixes the problem. have also tidied up the css a bit to remove duplicate class references 2019-09-26 11:28:23 +02:00
Tobias Klika
c652e47c3e overlay "target"-positioning updates correctly on content changes and container resize 2019-09-26 11:26:29 +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
Bjarke Berg
1a9ed95235 Bumb version to 8.3 2019-09-26 10:05:41 +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
Shannon
ebf55f0031 merge issue from previous branch 2019-09-25 14:18:39 +02:00
Shannon
9f83f57edc Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2019-09-25 14:13:51 +02:00
Shannon
263072d5cd Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-09-25 14:13:33 +02:00
Shannon
1caf7f4587 Fixes regression issue in nucache causing a panic exception 2019-09-25 13:51:19 +02:00
Bjarke Berg
be6b11d6a4 Merge pull request #6392 from umbraco/v8/feature/0000-RTE-initialization-polish 
V8/feature/0000 rte initialization polish
 2019-09-25 13:19:33 +02:00
Sebastiaan Janssen
fb4c89b1eb Don't re-add package-lock.json when it gets regenerated 2019-09-25 11:59:41 +02:00
Sebastiaan Janssen
a341bc19fb Remove package lock from the docs build to prevent more githubs security warnings 
Regenerate package lock in Web.UI.Client to remove old docs references that no longer need to be there
 2019-09-25 11:57:10 +02:00
Bjarke Berg
6e71286ad5 Merge branch 'v8/dev' into v8/feature/0000-RTE-initialization-polish 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2019-09-25 11:07:46 +02:00
Niels Lyngsø
aafa314f0e Separate gulp script for docs (#6409) 2019-09-25 10:52:33 +02:00
Bjarke Berg
f2d8d3f44f Merge pull request #6396 from umbraco/v8/bugfix/AB2734-Image-Deletion-Bug 
Bug: RTE Image deletion error for images that has not been saved as media items
 2019-09-25 08:36:27 +02:00
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