fork/phpbb.git - TEMPORARY REPO: phpBB2 forums replacement

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/develop' into ticket/11574	Igor Wiedler	2013-07-14	1	-2/+2
\|\
\| *	Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop	Nils Adermann	2013-07-14	1	-2/+2
\| \|\
\| \| *	[ticket/11704] Use the correct directory for dependency checking.	Andreas Fischer	2013-07-14	1	-1/+1
\| \| *	[ticket/11704] Correctly escape "	Andreas Fischer	2013-07-14	1	-1/+1
* \| \|	Merge remote-tracking branch 'upstream/develop' into ticket/11574	Igor Wiedler	2013-07-14	1	-13/+29
\|\\| \|
\| * \|	Merge branch 'develop-olympus' into develop	Nils Adermann	2013-07-13	1	-13/+29
\| \|\\|
\| \| *	[ticket/11674] Do not include vendor folder if there are no dependencies.	Andreas Fischer	2013-07-13	1	-13/+29
\| \| *	[develop-olympus] Bump version numbers for 3.0.12-RC1 release.	Andreas Fischer	2013-07-12	1	-1/+1
* \| \|	[ticket/11574] Include vendor into update packages	Joas Schilling	2013-07-13	1	-0/+2
\|/ /
* \|	Merge branch 'develop-olympus' into develop	Nils Adermann	2013-05-09	1	-2/+4
\|\\|
\| *	[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.	Andreas Fischer	2013-05-09	1	-2/+4
* \|	Merge PR #1162 branch 'develop-olympus' into develop	Oleg Pudeyev	2012-12-29	1	-9/+33
\|\\|
\| *	Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympus	Oleg Pudeyev	2012-12-29	1	-9/+33
\| \|\
\| \| *	[ticket/11291] phing: Also add checkreturn="true" to composer execution.	Andreas Fischer	2012-12-29	1	-0/+1
\| \| *	[ticket/11291] phing: Add checkreturn="true" to all new commands.	Andreas Fischer	2012-12-29	1	-1/+4
\| \| *	[ticket/11291] phing: Exclude vendor folder from diffs.	Andreas Fischer	2012-12-29	1	-0/+1
\| \| *	[ticket/11291] phing packaging: Export composer.phar and install dependencies.	Andreas Fischer	2012-12-29	1	-4/+10
\| \| *	[ticket/11291] phing: Remove no longer needed create-package target.	Andreas Fischer	2012-12-29	1	-3/+2
\| \| *	[ticket/11291] phing: The package target does not depend on composer.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| *	[ticket/11291] phing: Adjust directory format of composer exec.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| *	[ticket/11291] phing: Add description for composer target.	Andreas Fischer	2012-12-29	1	-0/+5
\| \| *	[ticket/11291] phing: Add --dev to composer install.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| *	[ticket/11291] phing: Correct dependencies of composer target.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| *	[ticket/11291] phing: Make sure composer is available before calling it.	Andreas Fischer	2012-12-23	1	-3/+12
* \| \|	[develop] Set build version (and thus package name) to 3.1.0-dev.	Andreas Fischer	2012-12-23	1	-1/+1
* \| \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-12-23	1	-3/+3
\|\\| \|
\| * \|	[develop-olympus] Set build version (and thus package name) to 3.0.12-dev.	Andreas Fischer	2012-12-23	1	-3/+3
\| \|/
* \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-08-20	1	-2/+2
\|\\|
\| *	Merge branch 'prep-release-3.0.11' into develop-olympus	Andreas Fischer	2012-08-20	1	-2/+2
\| \|\
\| \| *	[prep-release-3.0.11] Bumping version number for 3.0.11 final.	Andreas Fischer	2012-08-20	1	-2/+2
* \| \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-07-23	1	-2/+2
\|\\| \|
\| * \|	Merge branch 'prep-release-3.0.11' into develop-olympus	Andreas Fischer	2012-07-23	1	-2/+2
\| \|\\|
\| \| *	[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.	Andreas Fischer	2012-07-23	1	-2/+2
\| * \|	[ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.	Andreas Fischer	2012-07-21	1	-5/+16
\| \|/
* \|	[ticket/10932] Use included composer.phar in build process	Nils Adermann	2012-06-11	1	-14/+2
* \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-05-31	1	-3/+3
\|\\|
\| *	[develop-olympus] Bump version numbers for 3.0.11-RC1 release.	Andreas Fischer	2012-05-31	1	-3/+3
* \|	[ticket/10736] Run composer in phing builds	Nils Adermann	2012-03-31	1	-5/+28
* \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-01-02	5	-10/+6
\|\\|
\| *	Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-...	Andreas Fischer	2012-01-02	5	-10/+6
\| \|\
\| \| *	[ticket/9916] Changing header in non-distributed files	Unknown	2012-01-02	5	-10/+6
* \| \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-01-01	1	-2/+2
\|\\| \|
\| * \|	[prep-release-3.0.10] Bumping version number for 3.0.10 final.	Andreas Fischer	2012-01-01	1	-2/+2
\| \|/
* \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2011-12-04	1	-2/+2
\|\\|
\| *	[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.	Andreas Fischer	2011-12-04	1	-2/+2
* \|	Merge branch 'develop-olympus' into develop	Nils Adermann	2011-12-01	2	-0/+59
\|\\|
\| *	[ticket/10480] Add a build target for changelog building.	Andreas Fischer	2011-11-29	1	-0/+6
\| *	[ticket/10480] Add a build script for exporting the changelog from tracker.	Andreas Fischer	2011-11-29	1	-0/+53
* \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2011-11-26	1	-2/+2
\|\\|
\| *	[prep-release-3.0.10] Bumping version number for 3.0.10-RC2.	Andreas Fischer	2011-11-26	1	-2/+2