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

43902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
5a4aaae7f2 Merge remote-tracking branch 'origin/release/12.3' into v12/dev 
# Conflicts:
#	version.json
 2023-12-13 09:36:44 +01:00
Bjarke Berg
4e12f1e4e6 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-13 09:36:25 +01:00
Bjarke Berg
c2c1285d17 Fix json schema 2023-12-12 15:56:54 +01:00
Zeegaan
73fab105d2 Loosen up policies so editors can get what they need 2023-12-12 15:48:37 +01:00
Bjarke Berg
0c355b0cf1 Bump version 2023-12-12 15:47:43 +01:00
Bjarke Berg
0ed0338d8f Merge remote-tracking branch 'origin/release/12.3.4' into release/12.3 2023-12-12 15:47:28 +01:00
Bjarke Berg
4a0d364d10 Post fix 2023-12-11 16:33:56 +01:00
Bjarke Berg
9f375ede65 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-11 14:37:36 +01:00
Nikolaj Geisle
237e4e56b2 Merge pull request from GHSA-v98m-398x-269r 
Co-authored-by: kjac <kja@umbraco.dk>
 2023-12-11 14:00:23 +01:00
Nikolaj Geisle
42ae37e502 Merge pull request from GHSA-cfr5-7p54-4qg8 
* Apply authorization policies to controllers

* Return bad request if we urltracking is disabled

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-11 13:59:59 +01:00
Nikolaj Geisle
3331788c5c Merge pull request from GHSA-8qp8-9rpw-j46c 
* Ensure that missing access rules do not break the site (#15081)

(cherry picked from commit 6777145079)

* Added Exception handling and replicated error and info message

* Update auth.resource.js

Fixed the message

* Changed Delay introduction to early phase to avoid repeating code.

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: jey <jey@umbraco.dk>
Co-authored-by: Jey <cyaqublu@gmail.com>
 2023-12-11 13:59:35 +01:00
Nikolaj Geisle
50a107f885 Merge pull request from GHSA-6324-52pr-h4p5 
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-11 13:59:03 +01:00
Zeegaan
3a697d90fc Suppress flow when queueing background threads 2023-12-11 12:44:06 +01:00
Kenn Jacobsen
d752853d89 Fix disposed DbContext issue (#15090) (#15410) 2023-12-10 19:18:32 +01:00
Bjarke Berg
cf2ec50d15 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 
# Conflicts:
#	version.json
 2023-12-08 13:34:41 +01:00
Sebastiaan Janssen
a31d4746b3 Merge branch 'contrib' into v12/dev 2023-12-06 10:00:22 +01:00
Richard Ockerby
17eda54bfb Don't overwrite default values in the block list editor if they don't exist in the data model (for new creations) 2023-12-05 21:22:45 +01:00
Jacob Overgaard
d3f0506f0b Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-12-05 12:58:36 +01:00
Jacob Overgaard
051dfd1fff Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-12-05 12:57:47 +01:00
Jacob Overgaard
37e4d80ce8 Update nightly build (#15359) 
* cherry-pick templateParameters from v14/dev

* add isNightly parameter

* remove v9

* add parameter check for myget isNightly
 2023-12-05 12:45:23 +01:00
Sebastiaan Janssen
14a64857df Merge branch 'contrib' of https://github.com/umbraco/Umbraco-CMS into contrib 2023-12-05 12:41:21 +01:00
Jacob Overgaard
79af9e8e2b Update nightly build (#15359) 
* cherry-pick templateParameters from v14/dev

* add isNightly parameter

* remove v9

* add parameter check for myget isNightly
 2023-12-05 12:38:14 +01:00
Sebastiaan Janssen
319d98ef23 Merge branch 'v12/dev' into contrib 2023-12-05 12:36:34 +01:00
Sebastiaan Janssen
941705b03d Revert "Grant all users access to the content recycle bin (#14977)" 
This reverts commit ed006931a4.
 2023-12-04 14:34:47 +01:00
Andreas Zerbst
2a56d4e376 V12 Integration test for InternalIndex and ExternalIndex Search (#15167) 
* Added the possibility for us to search through the external index

* Added ForceInstantExecution

* Added InternalIndex integration tests

* Added External Index integration tests

* Removed comments

* Remove unused internal field

* Add mechanism to wait for index rebuilding

* Remove some of the usages of sleep

* Remove sleeps

* Added comments from review

* Added a method for getting the IndexPath

---------

Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
 2023-12-04 10:00:26 +01:00
Bjarne Fyrstenborg
c6d01178c0 Update z-index of block actions (#15329) 2023-12-01 13:51:42 +00:00
Vitor Rodrigues
7f4378066d Expose the Delivery API CLR type (#15150) 
* Expose the Delivery API CLR type

* Updated field naming and warnings

Addresses PR feedback

* Added default implementation to prevent breaking change
 2023-12-01 13:43:39 +01:00
Vitor Rodrigues
d315a1082e Fixed potential NuCache file lock causing unusable website (#14940) 
* Fixed potential NuCache file lock causing unusable website

* Remove unnecessary volatile read
 2023-12-01 13:05:50 +01:00
Bjarne Fyrstenborg
da6aaa07db Don't change format in convertToLocalMomentTime (#15223) 
(cherry picked from commit 963e57723a)
 2023-12-01 10:03:23 +01:00
Bjarne Fyrstenborg
0a718b0585 Fix log message in Verify2FACode 2023-11-30 20:03:20 +01:00
Bjarne Fyrstenborg
8c23075ec5 Adjust content type picker to support different content types (#15080) 2023-11-30 19:38:56 +01:00
Bjarne Fyrstenborg
86d98658f1 Make Block List configuration consistent with Block Grid (#15087) 2023-11-30 19:29:06 +01:00
Søren Mastrup
e947daff45 Added password toggle to Umbraco installer form 2023-11-30 19:27:55 +01:00
Bjarne Fyrstenborg
ee8339d563 Add contentTypeEditor to editorService (#15034) 2023-11-30 19:25:03 +01:00
Jan Skovgaard
7e26d09f77 Bugfix: #14481 - Landmark roles missing (#14980) 2023-11-30 19:21:48 +01:00
Matthew Wise
eaf07d2189 Added logging around adding a property value during examine indexing 2023-11-30 19:16:58 +01:00
Kevin Fu
1d5a684fd5 fixed #14832 user without HasAccessToSensitiveData change sensitive data: IsApproved IsApproved IsTwoFactorEnabled 2023-11-30 19:15:05 +01:00
Amalie Wowern
c893027f7c Added ReSharperTestRunner to KnownAssemblyExclusionFilter 2023-11-30 19:08:17 +01:00
Bjarke Berg
320310fbc0 Added "pr: none" to nightly trigger (#15044) 2023-11-30 11:43:05 +01:00
Kenn Jacobsen
528b7d346a Rollback some #14816 changes to fix 2FA (#15317) 2023-11-30 11:32:49 +01:00
Kenn Jacobsen
016709eecd Add query string info to links in API output (#15327) 2023-11-30 10:36:53 +01:00
Jannik Anker
6b599b641c Prevent RTE in fullscreen being partially covered by the left menu column (should fix #14890) (#15002) 
* Should fix #14890

* Set z-index of #leftcolumn to 0 when Tiny MCE is in fullscreen mode

---------

Co-authored-by: Jannik Anker <jaa@kfforsikring.dk>
Co-authored-by: Jason Elkin <jason@bumpdigital.co.uk>
 2023-11-29 14:59:20 +01:00
leekelleher
b74aadff97 Block editors - replaces hardcoded -20 with current node ID 2023-11-29 14:40:37 +01:00
Kenn Jacobsen
0a852aeb07 Don't expect specific .NET feature versions - utilize rollForward instead. (#15303) 2023-11-28 13:02:52 +01:00
Bjarke Berg
1176f04caf Updated pacakge-lock files 2023-11-28 09:45:07 +01:00
Bjarke Berg
280518c9d6 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj
#	src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs
#	src/Umbraco.Web.UI.Client/.nvmrc
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
 2023-11-28 09:39:31 +01:00
Sven Geusens
87380902f0 Bump version 2023-11-28 09:35:34 +01:00
Sven Geusens
c73b7f42d9 Move localdb file management of PublishedSnapshotService into itself. (#15085) 
* Move localdb file management of PublishedSnapshotService into itself.

Added a way for the PublishedSnapshot service to clean up it's local files so (for example) Upgrade migrations have a reliable way of removing known invalid cache files without running into locking issues

* Small rename to differentiate existing method from simple getter

* Fix breaking change

Long live default implementations 🎉

* Another breaking change fix

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
 2023-11-28 09:31:11 +01:00
Bjarke Berg
008d797a66 Added <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> 2023-11-27 19:54:03 +01:00
Bjarke Berg
ab781560bc Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
 2023-11-27 19:47:24 +01:00