Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maintenance #25

Merged
merged 3 commits into from
Jul 5, 2024
Merged

Maintenance #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe69f41
Update test environment
iMattPro Jul 5, 2024
1264300
Fix phpBB requirements
iMattPro Jul 5, 2024
723e707
Use AJAX for moving rows up and down
iMattPro Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
basic-checks:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -33,14 +33,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

# START MySQL and MariaDB Job
mysql-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -125,6 +125,8 @@ jobs:
db: "mysql:5.7"
- php: '8.3'
db: "mysql:5.7"
- php: '8.4'
db: "mysql:5.7"

name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}

Expand Down Expand Up @@ -154,14 +156,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down Expand Up @@ -207,7 +209,7 @@ jobs:

# START PostgreSQL Job
postgres-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -237,6 +239,8 @@ jobs:
db: "postgres:14"
- php: '8.3'
db: "postgres:14"
- php: '8.4'
db: "postgres:14"

name: PHP ${{ matrix.php }} - ${{ matrix.db }}

Expand Down Expand Up @@ -268,14 +272,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down Expand Up @@ -321,7 +325,7 @@ jobs:

# START Other Tests Job (SQLite 3 and mssql)
other-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -363,14 +367,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"extra": {
"display-name": "Canned Messages",
"soft-require": {
"phpbb/phpbb": ">=3.2.0"
"phpbb/phpbb": ">=3.2.0,<4.0.0@dev"
}
}
}
4 changes: 2 additions & 2 deletions styles/prosilver/template/mcp_cannedmessages_manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ <h3>{{ lang('ERROR') }}</h3>
</dt>
<dd class="message-list-actions">
<span class="up-disabled" style="display:none;"><i class="icon mcp-icon mcp-icon-disabled fa-arrow-circle-up fa-fw" title="{{ lang('MOVE_UP') }}"></i></span>
<span class="up"><a href="{{ cannedmessage.U_MOVE_UP }}"><i class="icon mcp-icon mcp-icon-move fa-arrow-circle-up fa-fw" title="{{ lang('MOVE_UP') }}"></i></a></span>
<span class="up"><a href="{{ cannedmessage.U_MOVE_UP }}" data-ajax="row_up"><i class="icon mcp-icon mcp-icon-move fa-arrow-circle-up fa-fw" title="{{ lang('MOVE_UP') }}"></i></a></span>
<span class="down-disabled" style="display:none;"><i class="icon mcp-icon mcp-icon-disabled fa-arrow-circle-down fa-fw" title="{{ lang('MOVE_DOWN') }}"></i></span>
<span class="down"><a href="{{ cannedmessage.U_MOVE_DOWN }}"><i class="icon mcp-icon mcp-icon-move fa-arrow-circle-down fa-fw" title="{{ lang('MOVE_DOWN') }}"></i></a></span>
<span class="down"><a href="{{ cannedmessage.U_MOVE_DOWN }}" data-ajax="row_down"><i class="icon mcp-icon mcp-icon-move fa-arrow-circle-down fa-fw" title="{{ lang('MOVE_DOWN') }}"></i></a></span>
<a href="{{ cannedmessage.U_EDIT }}"><i class="icon mcp-icon mcp-icon-settings fa-cog fa-fw" title="{{ lang('EDIT') }}"></i></a>
<a href="{{ cannedmessage.U_DELETE }}"><i class="icon mcp-icon mcp-icon-delete fa-times-circle fa-fw" title="{{ lang('DELETE') }}"></i></a>
</dd>
Expand Down