mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
20,635 Commits 17 Branches 190 Tags
Commit Graph

93 Commits

Author SHA1 Message Date
Joas Schilling
45f2efea19 [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 2014-03-30 22:53:09 +02:00
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00
Andreas Fischer
5e688f9540 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12302] Added `--no-dev` to composer call in build.xml
  [ticket/12302] Updated composer.phar to 1.0.0-alpha8
 2014-03-25 17:32:03 +01:00
s9e
55e7459922 [ticket/12302] Added --no-dev to composer call in build.xml 
PHPBB3-12302
 2014-03-25 17:20:59 +01:00
Joas Schilling
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
Joas Schilling
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
Joas Schilling
bf93e20afb [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development 2014-02-05 22:23:33 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Nils Adermann
1a31f03a7b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12162] Set language to C before running diff to ensure its english
  [ticket/11509] Be exact when referencing the branch name.
  [ticket/12161] Do not use subdirectories in build/save directory.
  [ticket/11509] Run commit message checker only in one environment.
  [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.

Conflicts:
	.travis.yml
 2014-02-04 13:05:20 +01:00
Joas Schilling
aae4d4c90d [ticket/12162] Set language to C before running diff to ensure its english 
PHPBB3-12162
 2014-02-04 12:32:25 +01:00
Andreas Fischer
78116a5298 [ticket/12161] Do not use subdirectories in build/save directory. 
This is pretty much pointless because a new build will wipe the save directory
and there are only a few files in there anyway.

PHPBB3-12161
 2014-02-04 02:07:45 +01:00
Andreas Fischer
dfe1761c95 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12140] Remove the diff class / MOD text build script

Conflicts:
	build/build_diff.php
 2014-02-02 14:01:39 +01:00
Nils Adermann
9047c0c061 [ticket/12140] Remove the diff class / MOD text build script 
PHPBB3-12140
 2014-02-02 13:36:12 +01:00
Joas Schilling
6ee05d369e [prep-release-3.1.0-a2] Update version to 3.1.0-a2 2013-11-19 01:18:21 +01:00
Andreas Fischer
10bfb2fe05 [task/code-sniffer] Completely ignore database_update.php. 
PHPBB3-11980
 2013-10-30 13:56:11 +01:00
Andreas Fischer
387ed37b31 [task/code-sniffer] Do not abort immediately on PHP Code Sniffer failure. 
PHPBB3-11980
 2013-10-29 23:53:07 +01:00
Andreas Fischer
92144b370c [task/code-sniffer] Check phpBB/phpbb first. This is where new files go. 
PHPBB3-11980
 2013-10-29 01:00:24 +01:00
Andreas Fischer
6a7db8d51a [task/code-sniffer] Require code sniffer to pass on Travis CI. 
PHPBB3-11980
 2013-10-29 00:59:51 +01:00
Andreas Fischer
e660d1bac1 [task/code-sniffer] Phing target for sniffing. 
PHPBB3-11980
 2013-10-27 17:43:03 +01:00
Joas Schilling
7a46976a78 [prep-release-3.1.0-a1] Only build packages for the latest olympus versions 2013-10-14 12:21:54 +02:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Nathan Guse
818296cfc9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11877] Create package links and checksums for announcement via script.
 2013-10-03 22:26:37 -05:00
Andreas Fischer
dbd0380c3f [ticket/11877] Create package links and checksums for announcement via script. 
PHPBB3-11877
 2013-10-01 16:16:19 +02:00
Nils Adermann
af2ad7a162 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
 2013-09-30 23:35:06 +02:00
Andreas Fischer
0cf9d657b7 [ticket/11876] Replace MD5 with SHA256. 
PHPBB3-11876
 2013-09-30 18:09:27 +02:00
Andreas Fischer
da9756ba25 [ticket/11876] Move checksum generation from build PHP files to phing build.xml 
This also removes paths from the checksum files.

PHPBB3-11876
 2013-09-30 18:08:42 +02:00
Andreas Fischer
94fccd8a5e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.

Conflicts:
	build/build.xml
 2013-09-30 17:05:40 +02:00
Andreas Fischer
ac4736db08 [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. 2013-09-30 17:04:14 +02:00
Andreas Fischer
8db820be63 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
 2013-09-27 01:39:24 +02:00
Andreas Fischer
50f6af2a20 [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. 2013-09-27 01:37:14 +02:00
Andreas Fischer
9a5415fe6d Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-09-27 01:32:09 +02:00
Andreas Fischer
d18bded3ac [prep-release-3.0.12] Bumping version number for 3.0.12 final. 2013-09-27 01:26:31 +02:00
Andreas Fischer
fcb9476615 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-09-05 00:37:40 +02:00
Andreas Fischer
ed0d7e9ea0 [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. 2013-09-02 23:38:42 +02:00
Andreas Fischer
02b4f1c874 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-08-01 17:30:21 +02:00
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Nils Adermann
af69349398 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop 
* github-phpbb/develop-olympus:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
 2013-07-14 13:56:05 -04:00
Andreas Fischer
da1ee75140 [ticket/11704] Use the correct directory for dependency checking. 
PHPBB3-11704
 2013-07-14 19:48:55 +02:00
Andreas Fischer
2a41128e6b [ticket/11704] Correctly escape " 
PHPBB3-11704
 2013-07-14 19:48:41 +02:00
Nils Adermann
1783134217 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11674] Do not include vendor folder if there are no dependencies.
 2013-07-13 13:12:28 -04:00
Andreas Fischer
e0aef4b320 [ticket/11674] Do not include vendor folder if there are no dependencies. 
PHPBB3-11674
 2013-07-13 18:32:33 +02:00
Andreas Fischer
f1dd35387c [develop-olympus] Bump version numbers for 3.0.12-RC1 release. 2013-07-12 21:10:05 +02:00
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
 2013-05-09 19:42:13 +02:00
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. 
PHPBB3-11513
 2013-05-09 19:21:40 +02:00
Oleg Pudeyev
f9354b98d8 Merge PR #1162 branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
 2012-12-29 07:47:23 -05:00
Oleg Pudeyev
51138d3f3a Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
 2012-12-29 07:47:10 -05:00
Andreas Fischer
6951356a87 [ticket/11291] phing: Also add checkreturn="true" to composer execution. 
PHPBB3-11291
 2012-12-29 13:38:40 +01:00
Andreas Fischer
b36050983d [ticket/11291] phing: Add checkreturn="true" to all new commands. 
PHPBB3-11291
 2012-12-29 13:30:25 +01:00
Andreas Fischer
1fc103e3f3 [ticket/11291] phing: Exclude vendor folder from diffs. 
Otherwise we end up with very huge diffs and the build process is severely
slowed down.

PHPBB3-11291
 2012-12-29 04:56:55 +01:00
Andreas Fischer
46a752ee62 [ticket/11291] phing packaging: Export composer.phar and install dependencies. 
PHPBB3-11291
 2012-12-29 04:44:45 +01:00