From 5ceede62e4fbe555bf9f5d9f3a2c0cb2f411d39e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 21 Oct 2014 17:29:32 -0700 Subject: [PATCH 1/3] Update readme and composer information --- README.md | 4 ++-- composer.json | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b6249da..795860d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Google Analytics Extension -This is the repository for the development of the Google Analytics Extension for phpBB 3.1 +An extension for phpBB 3.1 that allows administrators to easily add their Google Analytics tracking code to their phpBB forum. [![Build Status](https://travis-ci.org/phpbb-extensions/googleanalytics.png)](https://travis-ci.org/phpbb-extensions/googleanalytics) @@ -26,7 +26,7 @@ You can install this on the latest release of phpBB 3.1 by following the steps b * **Important: Only official release versions validated by the phpBB Extensions Team should be installed on a live forum. Pre-release (beta, RC) versions downloaded from this repository are only to be used for testing on offline/development forums and are not officially supported.** * Report bugs and other issues to our [Issue Tracker](https://github.com/phpbb-extensions/googleanalytics/issues). -* Support requests should be posted and discussed in the [Google Analytics topic at phpBB.com](https://www.phpbb.com/community/viewtopic.php?f=456&t=2249256). +* Support requests should be posted and discussed in the [Google Analytics topic at phpBB.com](https://www.phpbb.com/customise/db/extension/googleanalytics/support). ## License [GNU General Public License v2](http://opensource.org/licenses/GPL-2.0) diff --git a/composer.json b/composer.json index 966f1cf..4f20700 100644 --- a/composer.json +++ b/composer.json @@ -1,16 +1,17 @@ { "name": "phpbb/googleanalytics", "type": "phpbb-extension", - "description": "An extension which adds Google Analytics to your phpBB forum", + "description": "An extension that allows administrators to easily add their Google Analytics tracking code to their phpBB forum.", "homepage": "https://phpbb.com", "version": "1.0.0-b1", "keywords": ["phpbb", "extension", "google", "analytics"], "license": "GPL-2.0", "authors": [ { - "name": "Nathan Guse", - "email": "nathaniel.guse@gmail.com", - "role": "Extensions Development Team Lead" + "name": "Marc Alexander", + "email": "admin@m-a-styles.de", + "homepage": "http://www.m-a-styles.de", + "role": "Extensions Team Consultant" }, { "name": "Michael Cullum", @@ -18,16 +19,15 @@ "email": "michael@phpbb.com", "role": "Extensions Team Consultant" }, - { - "name": "Marc Alexander", - "email": "admin@m-a-styles.de", - "homepage": "http://www.m-a-styles.de", - "role": "Extensions Team Consultant" - }, { "name": "Matt Friedman", "homepage": "http://mattfriedman.me", - "role": "Extensions Development Team" + "role": "Extensions Development Team Lead" + }, + { + "name": "Nathan Guse", + "email": "nathaniel.guse@gmail.com", + "role": "Former Extensions Development Team Lead" }, { "name": "Lukasz Kaczynski", From a96c1e3a34dda0a1bdeb6cbf92c910cf9d767bf2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 21 Oct 2014 17:29:49 -0700 Subject: [PATCH 2/3] Increment version to 1.0.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4f20700..63a381b 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "phpbb-extension", "description": "An extension that allows administrators to easily add their Google Analytics tracking code to their phpBB forum.", "homepage": "https://phpbb.com", - "version": "1.0.0-b1", + "version": "1.0.0", "keywords": ["phpbb", "extension", "google", "analytics"], "license": "GPL-2.0", "authors": [ From d42689a19e42a1fe73bd73aaff4c948a07da58e9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 21 Oct 2014 17:40:07 -0700 Subject: [PATCH 3/3] Travis testing on release branches --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b6979c7..8ab4d72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ branches: - master - develop - /^develop-.*$/ + - /^release-.*$/ install: - composer install --dev --no-interaction --prefer-source