This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 3dabcf127b0e522f00d83aa9b06be6cf1cf5d389
Merge: b5e07903f b9c797e1b
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Mon Jan 1 10:54:55 2024 +0100

    Merge pull request #812 from apache/feature/WW-5362-remove-type
    
    [WW-5362] Removes type attribute out of <s:script/> tag

 .../src/main/webapp/WEB-INF/decorators/main.jsp      |  2 +-
 .../webapp/WEB-INF/validation/ajaxFormSubmit.jsp     |  2 +-
 assembly/src/main/resources/template.vm              |  8 ++++----
 .../admin/src/main/resources/osgi/admin/shell.ftl    | 12 ++++++------
 .../src/main/resources/osgi/admin/viewBundle.ftl     | 14 +++++++-------
 .../src/main/resources/osgi/admin/viewBundles.ftl    | 10 +++++-----
 .../apache/struts2/interceptor/debugging/browser.ftl | 20 ++++++++++----------
 .../apache/struts2/interceptor/debugging/console.ftl |  2 +-
 .../resources/template/css_xhtml/form-validate.ftl   |  2 +-
 core/src/main/resources/template/simple/combobox.ftl |  2 +-
 .../main/resources/template/simple/doubleselect.ftl  |  2 +-
 .../template/simple/form-close-tooltips.ftl          |  2 +-
 .../main/resources/template/simple/form-close.ftl    |  2 +-
 core/src/main/resources/template/simple/head.ftl     |  2 +-
 .../template/simple/inputtransferselect.ftl          |  2 +-
 .../template/simple/optiontransferselect.ftl         |  2 +-
 .../main/resources/template/simple/updownselect.ftl  |  2 +-
 .../resources/template/xhtml/form-close-validate.ftl |  2 +-
 .../src/main/resources/template/xhtml/form-close.ftl |  2 +-
 .../main/resources/template/xhtml/form-validate.ftl  |  2 +-
 core/src/site/confluence/ww-template-autoexport.html |  2 +-
 .../org/apache/struts2/views/jsp/ui/ComboBox-1.txt   |  2 +-
 .../org/apache/struts2/views/jsp/ui/ComboBox-2.txt   |  2 +-
 .../org/apache/struts2/views/jsp/ui/ComboBox-3.txt   |  2 +-
 .../org/apache/struts2/views/jsp/ui/ComboBox-4.txt   |  2 +-
 .../apache/struts2/views/jsp/ui/DoubleSelect-1.txt   |  2 +-
 .../apache/struts2/views/jsp/ui/DoubleSelect-2.txt   |  2 +-
 .../apache/struts2/views/jsp/ui/DoubleSelect-3.txt   |  2 +-
 .../apache/struts2/views/jsp/ui/DoubleSelect-4.txt   |  2 +-
 .../apache/struts2/views/jsp/ui/DoubleSelect-5.txt   |  2 +-
 .../apache/struts2/views/jsp/ui/DoubleSelect-6.txt   |  2 +-
 .../org/apache/struts2/views/jsp/ui/Formtag-11.txt   |  6 +++---
 .../org/apache/struts2/views/jsp/ui/Formtag-12.txt   |  2 +-
 .../org/apache/struts2/views/jsp/ui/Formtag-2.txt    |  8 ++++----
 .../org/apache/struts2/views/jsp/ui/Formtag-22.txt   |  8 ++++----
 .../org/apache/struts2/views/jsp/ui/Formtag-24.txt   |  8 ++++----
 .../org/apache/struts2/views/jsp/ui/Formtag-6.txt    |  6 +++---
 .../apache/struts2/views/jsp/ui/HeadTagTest-1.txt    |  2 +-
 .../struts2/views/jsp/ui/inputtransferselect-1.txt   |  2 +-
 .../struts2/views/jsp/ui/inputtransferselect-2.txt   |  2 +-
 .../struts2/views/jsp/ui/optiontransferselect-1.txt  | 16 ++++++++--------
 .../struts2/views/jsp/ui/optiontransferselect-2.txt  | 10 +++++-----
 .../struts2/views/jsp/ui/optiontransferselect-3.txt  | 10 +++++-----
 .../struts2/views/jsp/ui/optiontransferselect-4.txt  | 12 ++++++------
 .../struts2/views/jsp/ui/optiontransferselect-5.txt  | 12 ++++++------
 .../struts2/views/jsp/ui/optiontransferselect-6.txt  | 10 +++++-----
 .../struts2/views/jsp/ui/optiontransferselect-7.txt  | 10 +++++-----
 .../struts2/views/jsp/ui/optiontransferselect-8.txt  |  2 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-1.txt    |  2 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-2.txt    |  2 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-3.txt    |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-1.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-10.txt      | 10 +++++-----
 .../struts2/views/jsp/ui/updownselecttag-11.txt      |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-2.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-3.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-4.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-5.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-6.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-7.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-8.txt       |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-9.txt       |  2 +-
 62 files changed, 139 insertions(+), 139 deletions(-)

Reply via email to