Skip to content

Merge Release 1.0.0 branch #32

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

Merged
iMattPro merged 4 commits into from
Oct 28, 2014
Merged

Merge Release 1.0.0 branch #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ceede6
Update readme and composer information
iMattPro Oct 22, 2014
a96c1e3
Increment version to 1.0.0
iMattPro Oct 22, 2014
d42689a
Travis testing on release branches
iMattPro Oct 22, 2014
3484236
Merge pull request #31 from VSEphpbb/release
iMattPro Oct 22, 2014
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ branches:
- master
- develop
- /^develop-.*$/
- /^release-.*$/

install:
- composer install --dev --no-interaction --prefer-source
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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)
24 changes: 12 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"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",
"version": "1.0.0",
"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",
"homepage": "http://michaelcullum.com",
"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",
Expand Down