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

30691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
b2ee35b3b0 Potentially fixes the last security warnings on GitHub 2019-09-25 20:38:43 +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
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
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
Warren Buckley
906e59c68b Merge branch 'v8/dev' into v8/bugfix/AB2734-Image-Deletion-Bug 2019-09-24 09:13:23 +01:00
Warren Buckley
7404ccf024 C# change to append/perist the width & height into the pasted/dragged image to the image src url for ImageProcessor resizing 2019-09-23 14:47:41 +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
Warren Buckley
1b4fdf1757 Update FindAndPersistPastedTempImages method to deal with duplicate images in the same RTE to only upload it once 2019-09-20 12:51:06 +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
stevemegson
2adb6636bd V7: Error upgrading due to SecurityStamp being null (#6343) 
* Allow login with a null SecurityStamp when upgrading

* Added migration to fill in missing SecurityStamp

* Make sure we initialize UmbracoContext as it is needed in some tests that use UmbracoBackOfficeIdentity.AddUserDataClaims

* Moved check for null SecurityStamp

* Generate new SecurityStamp in C#

* Bump version to 7.15.4
 2019-09-20 13:09:26 +02:00
stevemegson
98e39ed3ef V7: Error upgrading due to SecurityStamp being null (#6343) 
* Allow login with a null SecurityStamp when upgrading

* Added migration to fill in missing SecurityStamp

* Make sure we initialize UmbracoContext as it is needed in some tests that use UmbracoBackOfficeIdentity.AddUserDataClaims

* Moved check for null SecurityStamp

* Generate new SecurityStamp in C#

* Bump version to 7.15.4
 2019-09-20 11:38:44 +02:00
Niels Lyngsø
4259c9bf1d less flickering on init of TinyMCE 2019-09-20 11:08:21 +02:00