Skip to content

Commit

Permalink
Merge pull request #182 from iMattPro/updates
Browse files Browse the repository at this point in the history
Minor updates
  • Loading branch information
iMattPro committed Jan 24, 2024
2 parents 6fa3dad + b762b36 commit 8a6b887
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/tests.yml
Expand Up @@ -93,24 +93,22 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "mariadb:10.1"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.2"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.3"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.4"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.5"
- php: '7.1'
- php: '7.2'
db: "mysql:5.6"
db_alias: "MyISAM Tests"
MYISAM: 1
- php: '7.1'
- php: '7.2'
db: "mysql:5.6"
- php: '7.1'
db: "mysql:5.7"
- php: '7.2'
db: "mysql:5.7"
COVERAGE: 1
Expand All @@ -127,6 +125,8 @@ jobs:
db: "mysql:5.7"
- php: '8.2'
db: "mysql:5.7"
- php: '8.3'
db: "mysql:5.7"

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

Expand Down Expand Up @@ -244,18 +244,16 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "postgres:9.5"
- php: '7.1'
- php: '7.2'
db: "postgres:9.6"
- php: '7.1'
- php: '7.2'
db: "postgres:10"
- php: '7.1'
- php: '7.2'
db: "postgres:11"
- php: '7.1'
- php: '7.2'
db: "postgres:12"
- php: '7.1'
db: "postgres:13"
- php: '7.2'
db: "postgres:13"
- php: '7.3'
Expand All @@ -270,6 +268,8 @@ jobs:
db: "postgres:14"
- php: '8.2'
db: "postgres:14"
- php: '8.3'
db: "postgres:14"

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

Expand Down Expand Up @@ -358,7 +358,7 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "sqlite3"
- php: '7.2'
db: "mcr.microsoft.com/mssql/server:2017-latest"
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Expand Up @@ -38,7 +38,8 @@
"version-check": {
"host": "www.phpbb.com",
"directory": "/customise/db/extension/ads",
"filename": "version_check"
"filename": "version_check",
"ssl": true
}
}
}
2 changes: 1 addition & 1 deletion language/en/common.php
Expand Up @@ -61,7 +61,7 @@
'AD_AFTER_FOOTER_NAVBAR' => 'After footer navbar',
'AD_AFTER_FOOTER_NAVBAR_DESC' => 'Displays on every page after footer navigation bar.',
'AD_POP_UP' => 'Pop-up',
'AD_POP_UP_DESC' => 'Displays once per day when user visits this board as overlaying box. User need to close this box to continue to the content. Please, be aware, that this kind of advertisement is very obtrusive to the user!',
'AD_POP_UP_DESC' => 'Displays once per day when user visits this board as overlaying box. User need to close this box to continue to the content. Please, be aware, that this kind of advertisement is very obtrusive to the user! This location does not support JavaScript code.',
'AD_SLIDE_UP' => 'Slide up',
'AD_SLIDE_UP_DESC' => 'Displays on every page after user scrolls below main content. Slides up from the bottom.',
'AD_SCRIPTS' => 'Scripts',
Expand Down

0 comments on commit 8a6b887

Please sign in to comment.