Skip to content

Commit

Permalink
Merge a8a2d6f into 888ef45
Browse files Browse the repository at this point in the history
  • Loading branch information
marc1706 committed Jun 22, 2020
2 parents 888ef45 + a8a2d6f commit e5802af
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 553 deletions.
27 changes: 14 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
language: php
sudo: required

matrix:
include:
- php: 5.3.3
env: DB=mysqli
- php: 5.3
env: DB=mysqli # MyISAM
- php: 5.5
env: DB=none;NOTESTS=1
- php: 5.4
env: DB=mysqli
env: DB=mysqli #myisam
- php: 5.4
env: DB=mysql
- php: 5.4
Expand All @@ -20,28 +19,30 @@ matrix:
env: DB=mysqli
- php: 5.6
env: DB=mysqli
- php: hhvm
- php: 7.0
env: DB=mysqli
- php: 7.1
env: DB=mysqli
- php: 7.2
env: DB=mysqli
- php: 7
- php: nightly
env: DB=mysqli
allow_failures:
- php: hhvm
- php: 7
- php: nightly
fast_finish: true

env:
global:
- EXTNAME="marc/quickedit" # CHANGE name of the extension HERE
- EXTNAME="marc1706/quickedit" # CHANGE name of the extension HERE
- SNIFF="1" # Should we run code sniffer on your code?
- IMAGE_ICC="0" # Should we run icc profile sniffer on your images?
- COVERAGE="1" # Should we send coverage?
- PHPBB_BRANCH="3.1.x"
- PHPBB_BRANCH="3.2.x"

branches:
only:
- master
- develop
- /^develop-.*$/
- /^\d+(\.\d+)?\.x$/

install:
- travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "marc/quickedit",
"name": "marc1706/quickedit",
"type": "phpbb-extension",
"description": "Adds quickediting capability to viewtopic.",
"homepage": "https://www.m-a-styles.de",
"version": "1.0.1",
"version": "1.1.0-dev",
"time": "2015-10-02 08:23:15",
"license": "GPL-2.0",
"authors": [{
"name": "Marc Alexander",
"email": "admin@m-a-styles.de",
"homepage": "http://www.m-a-styles.de",
"homepage": "https://www.m-a-styles.de",
"role": "Lead Developer"
}],
"require": {
"php": ">=5.3.3"
"php": ">=5.4"
},
"extra": {
"display-name": "Quickedit",
"soft-require": {
"phpbb/phpbb": ">=3.1.6,<3.2.*@dev"
"phpbb/phpbb": ">=3.2.0-b1,<4.0.0@dev"
},
"version-check": {
"host": "www.m-a-styles.de",
Expand Down

0 comments on commit e5802af

Please sign in to comment.