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

1418 Commits

Author SHA1 Message Date
Bjarke Berg
ed73b82fd0 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	tests/Umbraco.Tests.Integration/NewBackoffice/OpenAPIContractTest.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentServiceTests.cs
 2023-09-20 09:51:56 +02:00
Bjarke Berg
4dd3c295e0 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-09-20 09:43:41 +02:00
Bjarke Berg
1a4f3981eb Merge remote-tracking branch 'origin/v10/dev' into v10/dev 2023-09-20 09:42:28 +02:00
Bjarke Berg
7765f98ee1 Added random delay in forgot password to lessen the risk the response times can be use to determine whether the mail exist or not. 2023-09-20 09:02:32 +02:00
Nikolaj Geisle
6b72880c0b fix: ensured that allowed user name characters are supported in backoffice users as well (#14810) (#14825) 
Co-authored-by: Arkadiusz Biel <bielu@bielu.com.pl>
 2023-09-19 09:01:35 +02:00
Bjarke Berg
4964066b59 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	version.json
 2023-08-28 11:39:20 +02:00
Nikolaj
85f81ed44c Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-08-22 10:24:26 +02:00
Kenn Jacobsen
0dc18982ee Do not allow content type property aliases that conflict with IPublishedElement (#14683) 2023-08-21 13:17:15 +02:00
Sven Geusens
311d322129 Add code infrastructure to validate file content (#14657) 
* Implemented modular architecture for filestream security sanitization with an svg-html example

* 31440: Refactoring, applied to more entry points and removed test analyzer

* 31440 Added Unittests for FileStreamSecurityValidator

* PR fixes and better unittest mock names

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
 2023-08-21 13:08:26 +02:00
Sebastiaan Janssen
e7f940b358 Merge branch 'v12/dev' into contrib 2023-08-10 09:01:26 +02:00
Sven Geusens
2b3f048db7 Revert "Implemented modular architecture for filestream security sanitization with an svg-html example" 
This reverts commit 18ee016ae9.
 2023-08-08 16:26:59 +02:00
Sven Geusens
18ee016ae9 Implemented modular architecture for filestream security sanitization with an svg-html example 2023-08-08 14:49:18 +02:00
Bjarke Berg
7cf4826e2f Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-08-08 11:26:01 +02:00
Rasmus Söderström
7d253d3454 Fix for #14565 - Empty DocType folders hidden (#14581) 2023-08-07 08:48:14 +02:00
Bjarke Berg
b10b77bb08 Allow newlines in invite email and escape other html (#14618) 2023-08-07 08:19:43 +02:00
Sebastiaan Janssen
772fa5e23b Revert "Fix for escaping markdown characters in property descriptions (#12345)" 
This reverts commit 4aa1597138.
 2023-08-02 15:15:11 +02:00
Bjarke Berg
f384e0c30c Allow newlines in invite email and escape other html (#14618) 2023-08-02 14:17:39 +02:00
Miguel Pinto
96f8f70ed5 Fixed incorrect assignment of Last Login Date after a user accepts an invite and sets the password (#14619) 2023-07-31 22:14:20 +02:00
Callum Whyte
b2831dcd5e Sort content template tree items alphabetically, exclude element types (#14454) 2023-07-31 21:44:02 +02:00
Dhanesh Kumar Mj
2282099577 considering id, key & name as filter params for content listview (#14514) 2023-07-31 15:42:21 +02:00
Johan Runsten
71d990504e Fix incorrect redirectUrl check with external authentication (#14198) (#14423) 
* Fix check local redirect url

* Removed line break

* Small adjustment

---------

Co-authored-by: Laura Neto <12862535+lauraneto@users.noreply.github.com>
 2023-07-29 17:47:43 +02:00
Rasmus Söderström
a936fe09ab Fix for #14565 - Empty DocType folders hidden (#14581) 2023-07-20 12:36:29 +01:00
Sebastiaan Janssen
dad49b846f Merge branch 'v12/dev' into contrib 2023-07-18 11:18:26 +02:00
nikolajlauridsen
78e1da3231 Merge branch 'release/10.6' into v10/dev 2023-07-13 10:55:36 +02:00
nikolajlauridsen
e317aa29f7 Merge branch 'release/11.4' into v11/dev 2023-07-13 10:48:03 +02:00
nikolajlauridsen
4c39734b51 Merge branch 'release/12.0' into v12/dev 
# Conflicts:
#	version.json
 2023-07-13 10:38:03 +02:00
Nikolaj Geisle
20a4e475c8 Merge pull request from GHSA-h8wc-r4jh-mg7m 
* Don't login after install

* Fail the install if database is not created

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
 2023-07-13 06:18:34 +02:00
Nikolaj Geisle
1f26f2c6f3 Merge pull request from GHSA-h8wc-r4jh-mg7m 
* Don't login after install

* Fail the install if database is not created

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
 2023-07-13 06:10:51 +02:00
Nikolaj Geisle
82eae48d09 Merge pull request from GHSA-h8wc-r4jh-mg7m 
* Don't login after install

* Fail the install if database is not created

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
 2023-07-13 06:03:39 +02:00
Nikolaj Geisle
d116366b28 V12: Deprecate XPath (#14372) 
* Deprecate all outward facing methods that uses XPath

* Add more obsolete messages

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-07-07 11:12:04 +02:00
Bjarke Berg
16c78b76dd Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
 2023-07-07 08:37:20 +02:00
Bjarke Berg
02e87233c1 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2023-07-07 08:34:15 +02:00
Bjarke Berg
41805af0d9 Updated the package validation baseline version to 12.0.0 (#14389) 
* Updated the package validation baseline version to 12 RC1

* Update PackageValidationBaselineVersion to 12.0.0 and remove CompatibilitySuppressions.xml files

* Clean up project files

---------

Co-authored-by: Ronald Barendse <ronald@barend.se>
 2023-07-06 07:51:49 +02:00
Andreas Zerbst
c61e6c4901 Revert "Ensure package view path is generated with consideration the current section (#14268)" (#14508) 
This reverts commit 5382820e58.
 2023-07-05 13:38:02 +02:00
Paul Seal
b8415ed7f0 Update the tour text to the correct text and to save confusion 
(cherry picked from commit 5073a26e7f)
 2023-07-04 10:00:09 +02:00
Russell
aa4a1b3498 Fix for User null from IP address "::1" has logged out (#14322) 
(cherry picked from commit dd59ef17f5)
 2023-07-04 09:51:59 +02:00
Nathan Woulfe
5382820e58 Ensure package view path is generated with consideration the current section (#14268) 
* check section when determining package template path

* return sectionAlias as packageFolder and the route segment won't always match

* fix test

* adds PluginController attribute to StylesheetsTreeController
fixes actionUrl generation to ensure valid URL
find controller by fullname to avoid incorrect controller selection when multiple exist with same name

* Fix frontend breaking changes

* Adding missing PluginController attribute for ScriptsTreeController

---------

Co-authored-by: Elitsa <elm@umbraco.dk>
 2023-07-03 15:17:24 +03:00
Kenn Jacobsen
fad710364c Add additional preview URLs option (#14479) 2023-06-30 08:26:31 +03:00
Elitsa Marinovska
e86fb0eeb6 Adding null check and descriptive error (#14469) 2023-06-27 13:35:01 +02:00
Elitsa Marinovska
fe1080dd64 Check the cases where there might be a custom image type, instead of an the default Umbraco image type (#14463) 2023-06-27 10:33:46 +02:00
Sebastiaan Janssen
f91fde2462 Fixes #14269 - semaphore released too many times as it always happens in the finally, which is 1 too many times when the upload was a success 2023-06-20 14:02:53 +02:00
Paul Seal
5073a26e7f Update the tour text to the correct text and to save confusion 2023-06-16 10:46:06 +02:00
Jesse
4aa1597138 Fix for escaping markdown characters in property descriptions (#12345) 
* Added secure to the UMB-XSRF-V cookie when global https is true.

* tweaked markdown handling

* added in link handling tweak for simpleMarkdown filter

* tweaked simple markdown filter to modify all links instead of just the first one

* moved transformation of markdown content in description into C# code

* Format of white space

* Reverted unecessary change.

* Removed unwanted framework version lines

* Reduce nesting of if statements.

* Changed to .Contains for readability.

---------

Co-authored-by: Corey Philipp <CPhilipp@dewpoint.com>
Co-authored-by: jaandrews <jaandrews88@gmail.com>
Co-authored-by: Emma Garland <emma.garland@rocksolidknowledge.com>
 2023-06-08 10:11:18 +01:00
Sebastiaan Janssen
8447350915 Merge branch 'v12/dev' into contrib 2023-06-08 10:24:39 +02:00
Bjarke Berg
96dc594269 Merge remote-tracking branch 'origin/v11/dev' into release/12.0 
# Conflicts:
#	tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
#	version.json
 2023-06-08 08:37:30 +02:00
Chad
e784cfa960 Improve logging performance by checking Trace/Debug log level is enabled (#12793) 2023-06-07 11:47:05 +02:00
Bjarne Fyrstenborg
676efb9f89 Show summary of Examine search results (#14300) 2023-05-31 17:25:24 +02:00
Russell
dd59ef17f5 Fix for User null from IP address "::1" has logged out (#14322) 2023-05-31 12:46:02 +02:00
Bjarke Berg
82746518d4 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
#	version.json
 2023-05-31 09:11:24 +02:00
Bjarke Berg
2407d42de6 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Core/Constants-Telemetry.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
 2023-05-31 08:48:28 +02:00