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

11639 Commits

Author SHA1 Message Date
Bjarke Berg
fd974a416c Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
 2022-12-14 08:51:45 +01:00
Bjarke Berg
2d564a11b9 Maintenance page when in upgrade state (#13551) 
* Added functionality to show maintenance page and fixed issues with showing custom api controllers and 404 page, when umbraco had been in install or upgrade state

* Fixed Tests

* Fixed typo

* Fixed issue with login screen redirecting to website when in upgrade state, instead of backoffice
 2022-12-14 08:14:19 +01:00
BatJan
faa256dd92 Change prevalue order 
(cherry picked from commit 8fe699f26b)
 2022-12-13 13:27:14 +01:00
Bjarke Berg
76c99772a0 Merge pull request #13571 from umbraco/v11/feature/loggingsettingsextensions 
Change `GetAbsoluteLoggingPath` to extension method
 2022-12-13 10:28:27 +01:00
Ronald Barendse
a49151f552 Change GetAbsoluteLoggingPath to extension method 2022-12-13 09:11:59 +01:00
Sebastiaan Janssen
5c993ea3c6 Merge branch 'v11/dev' into v11/contrib 2022-12-12 13:59:03 +01:00
Matthew Wise
ec56778c9f standarising ActionLetter and ActionName for IAction 2022-12-10 01:59:45 +01:00
Bjarne Fyrstenborg
2d2d8df82e Show published in tracked references 2022-12-09 01:00:07 +01:00
sofietoft
151708c4b5 Updated docs links to point to new platform (#13426) 
* Updated docs links to point to new platform

* Update settingsdashboardintro.html

Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
 2022-12-08 14:50:41 +01:00
sofietoft
311c11074f Updated docs links to point to new platform (#13426) 
* Updated docs links to point to new platform

* Update settingsdashboardintro.html

Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
 2022-12-08 14:50:04 +01:00
Bjarke Berg
b491b8c7a3 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/JsonSchema/AppSettings.cs
#	src/Umbraco.Core/Configuration/Models/MarketplaceSettings.cs
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
 2022-12-07 10:57:32 +01:00
Jacob Overgaard
793272bda1 V10: Umbraco Marketplace (#13511) 
* v11: Umbraco Marketplace replaces packages repo (#13371)

* add lang keys for marketplace

* remove old 'repo' page and deprecate related services

* add new view for Umbraco Marketplace

* optimise margin/padding for other tabs

* mark Our Repository constants as obsolete

* improve css path to iframe slightly with more aliases and classnames

* remove style qs

* update URL of Marketplace

* add ng-controller with utitlities for future PostMessage API

* rename marketplace loaded function

* remove iframe postmessage logic for time being

* add handling of dynamic querystring params

* assume url does not change

* Added support for additional parameters for marketplace

* Update src/JsonSchema/AppSettings.cs

Fix styling issue

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Update src/Umbraco.Core/Configuration/Models/MarketplaceSettings.cs

Fix styling issue

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Update src/Umbraco.Core/Configuration/Models/MarketplaceSettings.cs

Make comment more descriptive

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Update src/Umbraco.Core/Constants-Marketplace.cs

Fix styling issue

Co-authored-by: Ronald Barendse <ronald@barend.se>

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Ronald Barendse <ronald@barend.se>

* Info panes not loading prerequisites (#13486)

* load relations immediately on init and remove call to non-existing function `appTabChange` on destroy

* load relations immediately on init and remove now not-used eventsService

* update marketplace url to its final, live url

* re-add files to prevent breaking change

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Ronald Barendse <ronald@barend.se>
 2022-12-07 10:44:34 +01:00
Bjarke Berg
2b6205a88c Remove duplicated lines in translations 2022-12-07 07:22:59 +01:00
Bjarke Berg
962c1a1a5b Merge branch 'v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentries.component.js
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts
 2022-12-06 12:53:37 +01:00
Jason Elkin
96918a9f1f Improve system information/telemetry (#13159) 
* Differentiate between IIS and IIS Express in system information telemetry

* Add runtime mode to system information telemetry
 2022-12-02 09:03:23 +01:00
Corné Hoskam
9099bf44ac Added various Block Grid translations (NL) - Pt 2. (#13508) 
* Added various translations

* Added another translation

* Change request

* Added various other area translations

* Resolve conflict

* Forgot one!

* Update nl.xml
 2022-12-01 14:26:58 +01:00
Erik-Jan Westendorp
4f129baebd Use constants instead of hardcoded strings 2022-11-30 16:13:47 +01:00
Lotte Pitcher
da9eae1252 Remove reference to installing a local package via backoffice (#13330) 2022-11-30 16:08:54 +01:00
Lotte Pitcher
af4333b8e4 Fixing some comments errors to reduce CodeQL warnings (#13327) 2022-11-30 16:01:36 +01:00
CyberReiter
02dcf98e3d make use of spans in UriExtensions to make them faster 2022-11-30 15:56:47 +01:00
Marc Goodson
2461b7d805 Adjust the wording of some of the helper text around the new Block Grid editor (#13484) 2022-11-30 15:36:23 +01:00
Bjarke Berg
6c13c87f15 Nuget updates (#13478) 
* Updated nuget packages

* Remove npoco update

Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
 2022-11-29 14:16:49 +01:00
Callum Whyte
5ef43cb4f0 Rename StaticServiceProvider namespace Umbraco.Cms.Core.DependencyInjection (#13239) 2022-11-29 12:22:57 +01:00
Bjarke Berg
a76d68bd37 Merge remote-tracking branch 'origin/release/11.0' into v11/dev 
# Conflicts:
#	version.json
 2022-11-29 08:19:27 +01:00
Bjarke Berg
bfe9579a0c V11: Allow changing logging directory from configuration (#13485) 
* Allow changing logging directory from configuration

* Clean up

* Missing return statement

* Apply suggestions from code review

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

* Update src/Umbraco.Core/Constants-SystemDirectories.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
 2022-11-29 07:27:59 +01:00
Roy Berris
1ed24e78c8 Notification documentation (#13207) 2022-11-28 23:26:59 +01:00
Erik-Jan Westendorp
65dd52ad05 Add AddManifestFilter extension method to UmbracoBuilder.CollectionBuilders.cs (#13161) 2022-11-28 23:14:24 +01:00
Jan Skovgaard
97fa4d76dc Accessibility: Fix - Missing table description: A data table is present with no description associated to it (#13117) 2022-11-28 22:54:54 +01:00
patrickdemooij9
475cea40a1 Use span in StripFileExtension to speed up and use less memory (#13101) 2022-11-28 22:12:30 +01:00
Niels Lyngsø
ed67cd887f Change login image to new SVG. (#13493) 2022-11-28 19:56:04 +01:00
Niels Lyngsø
188fa237cd Change login image to new SVG. (#13493) 2022-11-28 19:55:15 +01:00
Ronald Barendse
e45ed3d7f1 Revert breaking changes adding IContextCache to deploy connectors (#13489) 
* Remove breaking changes in Deploy connector interfaces

* Add extension methods for calling the new interface methods in a backwards-compatible way
 2022-11-28 19:16:19 +01:00
Corné Hoskam
493e93cc89 Added various Block Grid translations (EN & NL) (#13488) 
* Added various translations

* Added another translation

* Change request
 2022-11-28 14:58:10 +01:00
Corné Hoskam
a4e67bf444 Added various Block Grid translations (EN & NL) (#13488) 
* Added various translations

* Added another translation

* Change request
 2022-11-28 14:54:03 +01:00
Sebastiaan Janssen
8c2329f2b2 Merge branch 'v11/dev' into v11/contrib 
# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html
 2022-11-28 13:50:44 +01:00
Elitsa Marinovska
af6b8fc5cb Enabling an Umbraco admin user to disable 2FA for a member (#13369) 
* Fix Invalid authentication code bug

* Add translation keys for 2fa

* Display toggle for 2FA on member

* Add TwoFactorEnabled prop when saving member

* Handle disabling of 2FA

* Fix tests

* Changing obsolete msg
 2022-11-28 13:42:38 +01:00
Mole
c9a97984f4 Ensure that all automatic relation types are updated (#13470) 2022-11-28 12:51:48 +01:00
Mole
06924ed0f4 Ensure that all automatic relation types are updated (#13470) 2022-11-28 12:49:14 +01:00
Rasmus John Pedersen
c88ac85861 Add support for tags in block editors and nested content (#13412) 
* feat: add tags extension points and remove hardcoded tags handling

* feat: allow tags editor in nested content and block editors

* Update src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

* Update src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
 2022-11-28 11:20:46 +01:00
Jacob Overgaard
1a0983f0c7 update marketplace url to its final, live url 2022-11-28 11:15:48 +01:00
Owain Jones
079b2b7452 Updated welsh translations file 2022-11-25 02:16:37 +01:00
Paul Seal
d86d29807d created an add current domain button to the cultures and hostnames sc… (#13436) 
* created an add current domain button to the cultures and hostnames screen

* removed unwanted space
 2022-11-25 02:07:03 +01:00
Bjarne Fyrstenborg
3a01176ae4 Delete references using custom relation types (#13389) 
undefined
 2022-11-23 15:48:03 +01:00
Bjarne Fyrstenborg
a500ef9497 Delete references using custom relation types (#13389) 
undefined
 2022-11-23 15:43:51 +01:00
Kenn Jacobsen
63fa6f392c Rollback improvements (#13452) 
* Rollback improvements - hide draft version, allow rolling back to last published version

* UX improvements to rollback, revert some overly complex logic in favor of better UX

* Ensure title update when changing rollback version

* Clean up

* Fix rollback playwright text
 2022-11-23 10:04:21 +01:00
sofietoft
f83c946c96 Updated docs links to point to new platform (#13426) 
* Updated docs links to point to new platform

* Update settingsdashboardintro.html

Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
 2022-11-22 15:37:15 +01:00
nikolajlauridsen
d188ff9730 Merge branch 'release/11.0' into v11/merge_release_into_dev 
# Conflicts:
#	src/JsonSchema/AppSettings.cs
#	src/Umbraco.Core/Configuration/Models/MarketplaceSettings.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentries.component.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css
#	version.json
 2022-11-22 15:30:45 +01:00
Ronald Barendse
2e54579a2f Simplify JSON schema, generation, copying and updating (#13427) 
* Simplify JSON schema and only generate appsettings-schema.Umbraco.Cms.json

* Use Umbraco.JsonSchema.Extensions to dynamically add JSON schema references

* Move DependentUpon items to shared MSBuild props

* Update LangVersion to latest

* Update Umbraco.GitVersioning.Extensions to 0.2.0

* Remove JSON schemas on clean

* Remove Umbraco.JsonSchema.Core project

* Fix JSON schema nullability

* Ignore additional JSON schema files in template

* Update CompatibilitySuppressions.xml

* Remove GlobalSettings.UmbracoPath from JSON schema again

* Remove RemoveUmbracoJsonSchemaFiles target

* Update Umbraco.JsonSchema.Extensions to 0.2.0 and add weights

* Flatten generated JSON schema hierarchy

* Remove LicensesSettings from CMS codebase

* Change AdditionalParameters to IDictionary
 2022-11-22 12:48:11 +01:00
Niels Lyngsø
85842bde9f remove the hidding of catelouge appearance as its not located under advance (#13456) 2022-11-22 10:55:14 +01:00
Niels Lyngsø
f13a9d419d remove the hidding of catelouge appearance as its not located under advance (#13456) 2022-11-22 10:54:43 +01:00