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

30709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lyngsø
df858d47c2 fixing the looks for Grid 2019-09-26 15:40:51 +02:00
Niels Lyngsø
1a85c4a635 overwrite TinyMCE skin to match Umbraco Visuals 2019-09-26 15:05:02 +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
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
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
Bjarke Berg
51c0550c6d Merge pull request #6412 from umbraco/v8/bugfix/AB2737-restrain-image-for-dragged-pasted-images 
Drag/Drop & Pasted images in RTE aren't resized to configured max image width setting
 2019-09-24 13:47:02 +02: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
Elitsa Marinovska
0fbabd088f Merge pull request #6013 from stevemegson/v8/temp-packaging 
V8: Data type serialization in packages
 2019-09-24 13:25:07 +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
elitsa
1aa6c17c7e Merge branch 'v8/dev' into v8/temp-packaging 2019-09-24 12:41:12 +02: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