Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
abrain committed Mar 20, 2016
2 parents 6439423 + fb564bb commit 74852ea
Show file tree
Hide file tree
Showing 27 changed files with 2,154 additions and 902 deletions.
2 changes: 2 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ engines:
enabled: true
phpmd:
enabled: true
config:
standard: "PSR1,PSR2"
eslint:
enabled: true
csslint:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
build
setupLocalTest.sh
vendor
34 changes: 17 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,40 @@ php:
- hhvm

env:
- WP_VERSION=3.7.12 WP_MULTISITE=0
- WP_VERSION=3.8.12 WP_MULTISITE=0
- WP_VERSION=3.9.10 WP_MULTISITE=0
- WP_VERSION=4.0.9 WP_MULTISITE=0
- WP_VERSION=4.1.9 WP_MULTISITE=0
- WP_VERSION=4.2.6 WP_MULTISITE=0
- WP_VERSION=4.3.2 WP_MULTISITE=0
- WP_VERSION=4.4.1 WP_MULTISITE=0
- WP_VERSION=3.7.13 WP_MULTISITE=0
- WP_VERSION=3.8.13 WP_MULTISITE=0
- WP_VERSION=3.9.11 WP_MULTISITE=0
- WP_VERSION=4.0.10 WP_MULTISITE=0
- WP_VERSION=4.1.10 WP_MULTISITE=0
- WP_VERSION=4.2.7 WP_MULTISITE=0
- WP_VERSION=4.3.3 WP_MULTISITE=0
- WP_VERSION=4.4.2 WP_MULTISITE=0

matrix:
exclude:
- php: '5.5'
env: WP_VERSION=3.7.12 WP_MULTISITE=0
env: WP_VERSION=3.7.13 WP_MULTISITE=0
- php: '5.6'
env: WP_VERSION=3.7.12 WP_MULTISITE=0
env: WP_VERSION=3.7.13 WP_MULTISITE=0
- php: '7.0'
env: WP_VERSION=3.7.12 WP_MULTISITE=0
env: WP_VERSION=3.7.13 WP_MULTISITE=0
- php: '7.0'
env: WP_VERSION=3.8.12 WP_MULTISITE=0
env: WP_VERSION=3.8.13 WP_MULTISITE=0
- php: '7.0'
env: WP_VERSION=3.9.10 WP_MULTISITE=0
env: WP_VERSION=3.9.11 WP_MULTISITE=0
- php: '7.0'
env: WP_VERSION=4.0.9 WP_MULTISITE=0
env: WP_VERSION=4.0.10 WP_MULTISITE=0
- php: '7.0'
env: WP_VERSION=4.1.9 WP_MULTISITE=0
env: WP_VERSION=4.1.10 WP_MULTISITE=0
- php: '7.0'
env: WP_VERSION=4.2.6 WP_MULTISITE=0
env: WP_VERSION=4.2.7 WP_MULTISITE=0
allow_failures:
- php: hhvm
fast_finish: true

before_script:
- bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
- composer install --dev
- composer install --prefer-source

script: phpunit

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Dieses Plugin fügt WordPress eine neue Beitragsart "Einsatzbericht" hinzu.

Die primäre Zielgruppe des Plugins sind Feuerwehren im deutschsprachigen Raum, es ist aber genauso geeignet für Rettungsdienste, die Wasserwacht, das THW und sonstige Hilfsorganisationen, die ihre Einsätze im Internet präsentieren möchten.

[Plugin auf wordpress.org](https://wordpress.org/plugins/einsatzverwaltung/) - [Benutzerhandbuch](https://www.abrain.de/software/einsatzverwaltung/anleitung/) - [Changelog](https://github.com/abrain/einsatzverwaltung/releases)
[Plugin auf wordpress.org](https://wordpress.org/plugins/einsatzverwaltung/) - [Benutzerhandbuch](https://einsatzverwaltung.abrain.de/dokumentation/) - [Changelog](https://github.com/abrain/einsatzverwaltung/releases)

Uses Font Awesome by Dave Gandy - http://fontawesome.io

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "abrain/einsatzverwaltung",
"description": "Wordpress-Plugin zur Verwaltung und Darstellung von Einsatzberichten der Feuerwehr und anderer Hilfsorganisationen",
"homepage": "https://www.abrain.de/software/einsatzverwaltung/",
"homepage": "https://einsatzverwaltung.abrain.de",
"type": "wordpress-plugin",
"license": "GPL-2.0+",
"authors": [
Expand All @@ -17,7 +17,7 @@
"issues": "https://github.com/abrain/einsatzverwaltung/issues",
"forum": "https://wordpress.org/support/plugin/einsatzverwaltung",
"source": "https://github.com/abrain/einsatzverwaltung",
"docs": "https://www.abrain.de/software/einsatzverwaltung/anleitung/"
"docs": "https://einsatzverwaltung.abrain.de/dokumentation/"
},
"require-dev": {
"codeclimate/php-test-reporter": "dev-master"
Expand Down
Loading

0 comments on commit 74852ea

Please sign in to comment.