Sipke Schoorstra
cf4335e5ba
#6193 : IHtmlFilter and TokenFilter improvements and bugfixes ( #6938 )
...
* IHtmlFilter and TokenFilter improvements and bugfixes.
This changeset unifies the two separate TokenFilter implementations (one for BodyPart, TextField, etc and another one for certain elements such as Html).
It also fixes a bug with the TokenFilter when executing for HtmlWidget, where the wrong content item is being recorded by the handler (the original implementation).
Thirdly, it removes awkward code repetition by moving filter execution into a dedicated HtmlFilterRunner service.
* Renaming IHtmlFilterRunner to IHtmlFilterProcessor (and its references)
* Applying IHtmlFilterProcessor to HtmlMenuItems too + code styling in BodyPartDriver
* Fixing FeedControllerTests.CorePartValuesAreExtracted
* Code styling
---------
Co-authored-by: Jean-Thierry Kéchichian <jean-thierry.kechichian@wanadoo.fr>
Co-authored-by: Sipke Schoorstra <sipke@ideliverable.com>
Co-authored-by: Benedek Farkas <benedek.farkas@lombiq.com>
2024-04-19 11:20:32 +02:00
Benedek Farkas
9b0d78b4f6
#8786 : Updating Microsoft.IdentityModel.* packages from 5.2.4 to 5.7.0 ( #8787 )
...
* Updating Microsoft.IdentityModel.* packages from 5.2.4 to 5.7.0
* Updating OpenId packages from 4.0.0 to 4.2.2 to mach the version of Microsoft.Owin
* Fixing assembly binding redirects in Orchard.Web/Web.config
* OpenId: Updating Microsoft.IdentityModel.Tokens.* packages to version 5.7.0.0 to match Microsoft.IdentityModel.Tokens
* OpenId: Updating Microsoft.IdentityModel.Protocols packages to 5.7.0.0 too
* The return of System.Net.Http assembly binding redirects
2024-04-18 21:35:39 +02:00
Benedek Farkas
38d35efd4d
Merge branch '1.10.x' into dev
...
# Conflicts:
# src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
2024-04-17 17:46:14 +02:00
Benedek Farkas
3a6810ec67
8225: Adding a checkbox to StringFilterForm to control whether an empty value should cause the filter to be skipped ( #8781 )
...
* Adding a checkbox to StringFilterForm to control whether an empty value should cause the filter to be skipped
* Removing StringOperator.ContainsAnyIfProvided as its now obsolete due to the IgnoreFilterIfValueIsEmpty checkbox setting
* Code styling in StringFilterForm
* Adding missing T-string
* Adding migration step to upgrade from using the ContainsAnyIfProvided operator in StringFilterForm
2024-04-17 11:52:51 +02:00
Benedek Farkas
3f1bf7fcbe
Merge branch '1.10.x' into 'dev' through the 'issue/8773' integration branch
2024-04-17 10:53:06 +02:00
Benedek Farkas
70e13666f7
Merge branch '1.10.x' into issue/8773
...
# Conflicts:
# .github/workflows/compile.yml
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/console-shim.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/jstree.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-admin-common.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-admin-settings.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-autorefresh.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-asset-video.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-asset.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-cloudvideopart-direct.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-cloudvideopart-proxied.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-cloudvideopart.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-metadata-cloudvideopart.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-data.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-alt.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-html5.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-smp.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-main.js
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-admin-asset.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-admin-selecttask.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-admin-settings.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-edit-assets.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-edit-cloudvideopart.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-edit-jobs.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-progress.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-tabs.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/cloudmedia-videoplayer.css
# src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Styles/menu.cloudmedia-mediaproviders.css
# src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js
# src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Lib.js
# src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Lib.min.js
# src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/DynamicForms-Admin.css
# src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/DynamicForms.css
# src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
# src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
# src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
# src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
# src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
# src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-af.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-am.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ar-DZ.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ar-EG.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ar.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-az.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-bg.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-bs.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ca.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-cs.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-da.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-de-CH.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-de.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-el.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-en-AU.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-en-GB.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-en-NZ.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-eo.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-es-AR.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-es-PE.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-es.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-et.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-eu.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-fa.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-fi.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-fo.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-fr-CH.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-fr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-gl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-gu.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-he.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-hi-IN.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-hr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-hu.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-hy.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-id.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-is.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-it.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ja.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ka.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-km.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ko.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-lt.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-lv.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-me-ME.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-me.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-mk.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ml.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ms.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-mt.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-nl-BE.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-nl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-no.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-pl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-pt-BR.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-rm.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ro.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ru.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-sk.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-sl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-sq.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-sr-SR.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-sr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-sv.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ta.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-th.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-tr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-tt.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-uk.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-ur.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-vi.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-zh-CN.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-zh-HK.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars-zh-TW.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.all.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.coptic.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.ethiopian-am.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.ethiopian.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.hebrew-he.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.hebrew.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.islamic-ar.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.islamic-fa.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.islamic.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.julian.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.lang.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.mayan.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.min.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.nepali-ne.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.nepali.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.persian-fa.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.persian.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-af.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-am.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ar-DZ.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ar-EG.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ar.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-az.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-bg.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-bs.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ca.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-cs.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-da.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-de-CH.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-de.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-el.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-en-AU.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-en-GB.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-en-NZ.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-eo.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-es-AR.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-es-PE.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-es.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-et.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-eu.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-fa.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-fi.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-fo.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-fr-CH.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-fr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-gl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-gu.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-he.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-hi-IN.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-hr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-hu.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-hy.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-id.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-is.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-it.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ja.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ka.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-km.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ko.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-lt.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-lv.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-me-ME.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-me.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-mk.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ml.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ms.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-mt.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-nl-BE.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-nl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-no.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-pl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-pt-BR.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-rm.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ro.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ru.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-sk.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-sl.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-sq.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-sr-SR.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-sr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-sv.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ta.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-th.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-tr.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-tt.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-uk.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-ur.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-vi.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-zh-CN.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-zh-HK.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker-zh-TW.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker.ext.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker.full.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.picker.lang.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.plus.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.taiwan-zh-TW.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.taiwan.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.thai-th.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.thai.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.ummalqura-ar.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.ummalqura.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.validation.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/TimeEntry/jquery.timeentry.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/angular-resource.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/angular-sanitize.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/angular-sortable.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/angular.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/bootstrap.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.blockui.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.colorbox.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.cookie.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.fileupload-full.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.plugin.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/jquery.utils.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/knockout.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/moment.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/underscore.js
# src/Orchard.Web/Modules/Orchard.Resources/Scripts/uri.js
# src/Orchard.Web/Modules/Orchard.Resources/Styles/Calendars/jquery.calendars.picker.full.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/TimeEntry/jquery.timeentry.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/bootstrap.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/bootstrap.min.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/font-awesome.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/font-awesome.min.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/jquery-datetime-editor.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/jquery-ui.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/jquery-ui.min.css
# src/Orchard.Web/Modules/Orchard.Resources/Styles/jquery.colorbox.css
2024-04-17 10:37:23 +02:00
Benedek Farkas
7b07ab9b3b
Merge branch 'dev' into issue/8773
2024-04-17 10:26:53 +02:00
Thierry Fleury
04e9c73391
8012: Add Excel Export functionality to DynamicForms ( #8016 )
...
* Add Excel Export functionality to DynamicForms.
* Using the net46-targeted DLL of DocumentFormat.OpenXml instead of net40
* Updating DocumentFormat.OpenXml to latest (3.0.2) version
* Code styling
---------
Co-authored-by: Benedek Farkas <benedek.farkas@lombiq.com>
2024-04-16 16:59:14 +02:00
Benedek Farkas
530d2a9221
8773: Recompiling client-side assets on 1.10.x ( #8779 )
...
* Updating rebuilt client-side assets that only changed in terms of sourceMappingURL
* Updating rebuilt client-side assets that changed functionally
* Fixing/simplifying Layout editor toolbox stickyness and height restriction to viewport
* Compile workflow: Upgrading actions/checkout and microsoft/setup-msbuild actions to their latest versions
* Compile workflow: Adding steps to validate that the client-side assets are up-to-date
* Compile workflow: Temporarily disabling MSBuild steps
* Moving client-side assets build to a separate job in the compile workflow
* Updating client-side compilation job
* Temporarily disabling the .NET build
* Separating package install from asset rebuild
* Adding debug command
* Fixing working directory
* Debugging
* Attempting to get rid of false positives due to line ending changes
* Removing debug code
* Checking asset validation by modifying Orchard.Resources/Assets/Less/Bootstrap/variables.less, but not its derivatives
* Revert "Checking asset validation by modifying Orchard.Resources/Assets/Less/Bootstrap/variables.less, but not its derivatives"
This reverts commit 3fc9b8362b2a8fef7793
2024-04-16 16:55:04 +02:00
Andrea Piovanelli
8b9b5fb2ee
Minor syntax fix on TaxonomyFieldList.cshtml ( #8780 )
...
* Update TaxonomyFieldList.cshtml
Missing closing brackets after providing data for the ajax call
* As requested, added an empty line at the end of file
2024-04-11 21:43:58 +02:00
Hazzamanic
8086c01fb8
7919: The Alias UI links for sites using UrlPrefix are broken ( #7930 )
...
* AliasUI: removing UrlPrefix addition to url. Fixing issue in Href() that strips first / in urls for sites using UrlPrefix
* Simplifying fix for WebViewPage.Href for tenants with URL prefix
* Code styling WebViewPage
---------
Co-authored-by: Benedek Farkas <benedek.farkas@lombiq.com>
2024-04-11 21:41:34 +02:00
Andrea Piovanelli
e243e8e547
Incorrect NOLOCK position in queries where there is no table alias ( #8783 )
...
"WITH(NOLOCK)" is positioned before the where clause if there is no alias for the table.
2024-04-11 20:27:03 +02:00
Benedek Farkas
441c6da145
Fixing that Core/Navigation/Controllers/AdminController changes from 1.10.x were partially incompatible with dev
...
preventing the editor from saving MenuItem changes
2024-04-09 15:38:03 +02:00
Benedek Farkas
7f2e467ab8
Upgrade: Adding System.Net.Http assembly binding redirect
2024-04-05 16:43:35 +02:00
Benedek Farkas
f30a472cb3
Removing SharpZipLib package and references as its no longer used
2024-04-04 21:21:53 +02:00
Benedek Farkas
3ce50256f9
Updating Microsoft.CodeDom.Providers.DotNetCompilerPlatform to version 4.1.0 in dev-only extensions too
...
Continuation of https://github.com/OrchardCMS/Orchard/pull/8777
2024-04-04 21:16:46 +02:00
Benedek Farkas
39ea4c7f79
Merge branch '1.10.x' into issue/8773
...
# Conflicts:
# .gitignore
# ClickToBuild.cmd
# lib/nuget/nuget.exe
# src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
# src/Orchard.Azure/Orchard.Azure.Web/Web.config
# src/Orchard.Web/Core/Orchard.Core.csproj
# src/Orchard.Web/Modules/Lucene/Lucene.csproj
# src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
# src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
# src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
# src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
# src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
# src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
# src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
# src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
2024-04-04 20:53:50 +02:00
Benedek Farkas
832a0c8515
Merge branch 'dev' into issue/8773
2024-04-04 20:43:19 +02:00
Benedek Farkas
fb1aa73475
8776: Upgrade Microsoft.CodeDom.Providers.DotNetCompilerPlatform to latest version ( #8777 )
...
* Upgrading projects, code generation templates and Specflow app to use Microsoft.CodeDom.Providers.DotNetCompilerPlatform 4.1.0 (latest)
* Updating csprojs not to define LangVersion separately in Release and Debug mode, setting it to "default" instead of "latest"
* Restricting C# language version to 7.3
* Downgrading SmtpMessageChannel.cs to C# 7.3
* Setting MvcBuildViews = false in the remaining csprojs that reference DotNetCompilerPlatform, like the others
* Setting RoslynCopyToOutDir = false in each csproj that references DotNetCompilerPlatform
See https://github.com/aspnet/RoslynCodeDomProvider?tab=readme-ov-file#build-time-options
- We only need Orchard.Web to include the Roslyn tools in its bin folder, the other csprojs only need the DLL reference
- We could simply remove the targets import in these csprojs, but it will be re-added when the package is updated, so this is cleaner/easier
* We don't actually need <MvcBuildViews>false</MvcBuildViews> in csprojs
* Orchard.Web: Copying Roslyn files to the output folder using the provided target (CopyRoslynCompilerFilesToOutputDirectory) instead of our custom one
* Orchard.proj: Factoring out a part of the Compile target into the DevCompile target and removing BuildViews target
- For a simple local build (just to validate that the solution builds), we don't actually need that second build that copies files to the output folder.
- CI builds (Test, Spec, etc.) that operate on the build output folder are unaffected, because Compile calls DevCompile
- The BuildViews target is not really necessary, just call any other target (Compile, DevCompile, Spec, etc.) with "/p:MvcBuildViews=true"
* Removing incorrect comment about Razor IntelliSense
* Removing VBCodeProvider configuration from Web.config files
* Getting rid of Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets imports and associated configuration except in Orchard.Web.csproj
* Adding VB compiler configuration to src/Orchard.Web/Web.config, because it would be readded on rebuild by the imported target anyway
2024-04-04 16:35:29 +02:00
Matteo Piovanelli
151bb12ce6
Minor fixes for localizations ( #8726 )
...
* wip fixing Fields/TaxonomyFieldList.cshtml
* restored selector for expando label/handle
* cleanup
* fixed comparison to find parent blog
# Conflicts:
# src/Orchard.Web/Modules/Orchard.Blogs/BlogsLocalizationExtensions/Handlers/BlogPostPartHandler.cs
* fixed initialization of localizedtaxonomyfields
* Checks culture equality based on strings instead of culture records
* If term is culture neutral it is added to the applied terms list without looking for its localization.
# Conflicts:
# src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/LocalizedTaxonomyController.cs
* Added AdminLocalizedTaxonomyController to properly managed localized taxonomies back office calls.
# Conflicts:
# src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/LocalizedTaxonomyController.cs
# src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyFieldList.cshtml
* Added selectedValues parameter to controller call
---------
Co-authored-by: HermesSbicego-Laser <hermes.sbicego@laser-group.com>
Co-authored-by: Andrea Piovanelli <andrea.piovanelli@laser-group.com>
2024-04-02 08:56:47 +02:00
Benedek Farkas
5aaf46bcde
Setting MSBuild log verbosity to minimal in the compile workflow
2024-03-18 12:03:36 +01:00
Benedek Farkas
9b57673e9a
Resetting the branch to a803d7bc2d by reverting the recent commits related to System.Net.Http.dll
2024-03-18 11:58:25 +01:00
Benedek Farkas
005338403d
gitignore: Fixing the pattern that ignores ".vs" folders at any level and moving VS-related patterns to the correct location
2024-03-16 18:44:56 +01:00
dmhiggins23
1900b35cd5
Updated ClickToBuild.cmd to support VS2019 (v16) and VS2022 (v17) ( #8764 )
...
Removed support for eariler MSBuild versions (they cannot compile SmtpMessageChannel.cs)
Updated lib/nuget/nuget.exe to latest version (6.9.1.3) (required for package restoration)
Modified Obsolete attribute in SmtpSettingsPart.cs so the solution builds with VS2019
2024-03-15 10:18:40 +01:00
Matteo Piovanelli
4a05e77775
Memorize results of queries to prevent repeated execution within a request ( #8775 )
2024-03-15 09:05:48 +01:00
Andrea Piovanelli
2d7ce45d1e
TermsPart.Record usage made before the delegate to avoid accessing a scope which is already disposed. ( #8766 )
2024-03-15 08:55:07 +01:00
Benedek Farkas
5f34102f70
Uploading MSBuild log as artifact
2024-03-11 17:29:05 +01:00
Benedek Farkas
068b616b8a
Maybe we don't need the System.Net.Http assembly reference in the Orchard.Email web.config anymore?
2024-03-11 15:43:29 +01:00
Benedek Farkas
d2f4d7ec53
Attempting to free Orchard from the DLL-hell
2024-03-11 15:31:48 +01:00
Benedek Farkas
eaa432260e
Fixing System.Net.Http publicKeyToken in assembly binding redirect
2024-03-11 15:04:36 +01:00
Benedek Farkas
2fd4d28c8b
Attempting to fix Razor compilation warning (error) regarding System.Net.Http
2024-03-11 15:02:53 +01:00
Benedek Farkas
a803d7bc2d
Revert "Temporary email test setup"
...
This reverts commit 5e928e7980
2024-03-11 14:43:50 +01:00
Benedek Farkas
8449eade95
SmtpMessageChannel: Fixing that the "reply to" address should fall back to site settings if not provided in the current email
2024-03-11 14:28:13 +01:00
Benedek Farkas
44dcc86386
SmtpMessageChannel: Simplifying the processing of the "from" address
2024-03-11 14:25:59 +01:00
Benedek Farkas
b5ad09e6db
Making SmtpMessageChannel.ParseRecipients more fault-tolerant to simplify its usage
2024-03-11 14:22:10 +01:00
Benedek Farkas
5e928e7980
Temporary email test setup
2024-03-11 12:07:40 +01:00
Benedek Farkas
041a3613bc
Merge branch 'dev' into issue/8773
2024-03-10 22:40:23 +01:00
Benedek Farkas
2d0630da69
Fixing that some Workflows activities were not rendered correctly in the workflow editor
...
They were just rendered as a small, empty rectangle:
- Unassign Role activity styling was syntactically incorrect
- Send Email and Is In Role activity styling file name did not match what the Workflows ResourceManifest expects
2024-03-10 22:39:57 +01:00
Benedek Farkas
8dec61baab
Updating jQueryUI to version 1.13.2 (July 14, 2022) to mitigate some incompatibilities with jQuery
2024-03-10 21:52:24 +01:00
Benedek Farkas
d80513aba0
Merge branch 'issue/8773-1.10.x' into issue/8773
2024-03-10 19:23:02 +01:00
Benedek Farkas
391c032bf3
Gulpfile: Updating TS compilation options to fix TS6131 error
...
"Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'"
Also recompiling client-side assets, but the changes are not the result of the compiler option change, they were just outdated
2024-03-10 19:15:08 +01:00
Benedek Farkas
c420676ba0
Fixing/simplifying Layout editor toolbox stickyness and height restriction to viewport
2024-03-10 00:13:47 +01:00
Benedek Farkas
13bbb43e35
Updating rebuilt client-side assets that changed functionally
2024-03-09 12:55:32 +01:00
Benedek Farkas
7226b06142
Updating rebuilt client-side assets that only changed in terms of sourceMappingURL
2024-03-09 12:55:00 +01:00
Benedek Farkas
bfe5671e9d
Adding verbosity = minimal to msbuild commands in the specflow workflow too
2024-03-09 11:22:17 +01:00
Benedek Farkas
f667d00843
Adding verbosity = minimal to msbuild commands in the compile workflow
2024-03-09 11:13:19 +01:00
Benedek Farkas
358744e8c0
Fixing merge error in Orchard.Projections/Migrations.cs
2024-03-08 19:34:09 +01:00
Benedek Farkas
f2f3a25afa
Fixing build warning
2024-03-08 19:00:52 +01:00
Benedek Farkas
049cc6a371
Re-applying logic to ask for an email read notification from 7c725bf2ec
2024-03-08 18:51:03 +01:00
Benedek Farkas
c8c5196b18
Re-applying logic to send attachments from 46c3fe6e79
2024-03-08 18:50:07 +01:00
