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

86 Commits

Author SHA1 Message Date
Andreas Fischer
bfdba90a34 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/install/database_update.php
 2012-08-20 16:42:41 +02:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
Andreas Fischer
efbc02acf3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/install/database_update.php
 2012-07-23 23:57:08 +02:00
Andreas Fischer
49a53755e6 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2012-07-23 23:45:17 +02:00
Andreas Fischer
9f073e4c75 [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. 2012-07-23 23:41:47 +02:00
Andreas Fischer
be44f32008 [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing. 
PHPBB3-11009
 2012-07-21 00:24:09 +02:00
Nils Adermann
171d661765 [ticket/10932] Use included composer.phar in build process 
PHPBB3-10932
 2012-06-11 15:40:32 +02:00
Andreas Fischer
4af503e11b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
  [develop-olympus] Add changelog for 3.0.11 release.
  [develop-olympus] Bump version numbers for 3.0.11-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.11 releases.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2012-05-31 23:11:27 +02:00
Andreas Fischer
2011085c29 [develop-olympus] Bump version numbers for 3.0.11-RC1 release. 2012-05-31 22:07:02 +02:00
Nils Adermann
fadeefe770 [ticket/10736] Run composer in phing builds 
PHPBB3-10736
 2012-03-31 15:18:49 +02:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
 2012-01-02 17:36:21 +01:00
Andreas Fischer
fd55d64996 Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-olympus 
* unknownbliss/ticket/9916-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header
 2012-01-02 17:35:49 +01:00
Unknown
5e52734c24 [ticket/9916] Changing header in non-distributed files 
PHPBB3-9916
 2012-01-02 16:20:30 +00:00
Andreas Fischer
44a236991c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.

Conflicts:
	phpBB/install/database_update.php
 2012-01-01 16:09:53 +01:00
Andreas Fischer
e14c3f3b77 [prep-release-3.0.10] Bumping version number for 3.0.10 final. 2012-01-01 16:00:17 +01:00
Andreas Fischer
3176dcbc05 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

Conflicts:
	phpBB/install/database_update.php
 2011-12-04 00:25:54 +01:00
Andreas Fischer
69cbb4ac1d [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 2011-12-04 00:22:10 +01:00
Nils Adermann
5e225d5d7a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:21:57 +01:00
Andreas Fischer
f351914137 [ticket/10480] Add a build target for changelog building. 
PHPBB3-10480
 2011-11-29 20:05:27 +01:00
Andreas Fischer
4cf059e38f [ticket/10480] Add a build script for exporting the changelog from tracker. 
PHPBB3-10480
 2011-11-29 20:05:21 +01:00
Andreas Fischer
791464258f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/install/database_update.php
 2011-11-26 22:26:59 +01:00
Andreas Fischer
007457f182 [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. 2011-11-26 22:17:43 +01:00
Oleg Pudeyev
2ddc4acd90 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 20:14:09 -05:00
Andreas Fischer
0d3697e40c [ticket/10486] Create git shortlog and git diff --stat in build script. 
PHPBB3-10486
 2011-11-22 20:59:51 +01:00
Andreas Fischer
c67ca0ac99 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.
  [develop-olympus] Add changelog for 3.0.10-RC1
  [develop-olympus] Bump version numbers for 3.0.10-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.10 releases.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2011-11-21 01:08:43 +01:00
Andreas Fischer
3e43b53a63 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. 2011-11-20 21:50:29 +01:00
Nils Adermann
28f72e427e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10222] Also build language and styles changes in diff/patch format.
 2011-08-25 22:57:56 -04:00
Andreas Fischer
d221d2f7e8 [ticket/10222] Also build language and styles changes in diff/patch format. 
PHPBB3-10222
 2011-08-25 19:35:01 +02:00
Nils Adermann
55e4dfd3bd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10313] Create a separate build task for slow tests.
 2011-08-07 21:34:46 -04:00
Nils Adermann
32e15315a8 [ticket/10313] Create a separate build task for slow tests. 
PHPBB3-10313
 2011-08-07 21:28:35 -04:00
Nils Adermann
4c8c76171f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10313] Include slow unit tests when running build script.
 2011-08-07 19:19:47 -04:00
Andreas Fischer
43fc8142f5 [ticket/10313] Include slow unit tests when running build script. 
PHPBB3-10313
 2011-08-08 01:11:44 +02:00
Andreas Fischer
09e0460e5b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/install/database_update.php
 2011-07-10 23:11:29 +02:00
Andreas Fischer
e6572b766f [prep-release-3.0.9] Bumping version number for 3.0.9 final. 2011-07-10 22:36:17 +02:00
Andreas Fischer
9c6c5895bc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.
 2011-07-07 20:29:25 +02:00
Andreas Fischer
787245a113 [prep-release-3.0.9] Decreasing version for an RC4 release. 2011-07-07 20:19:11 +02:00
Andreas Fischer
5f73cdcdc2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column

Conflicts:
	phpBB/install/database_update.php
 2011-07-05 01:07:22 +02:00
Andreas Fischer
d8ac2cc5f0 [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. 2011-07-05 00:40:45 +02:00
Andreas Fischer
372e885456 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.
 2011-06-26 21:00:25 +02:00
Andreas Fischer
fe0932fdf0 [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. 2011-06-26 20:47:33 +02:00
Andreas Fischer
29fb28b3ac Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.
 2011-06-15 19:46:48 +02:00
Andreas Fischer
48e5e56146 [prep-release-3.0.9] Bumping version number for 3.0.9-RC2. 2011-06-15 19:41:14 +02:00
Andreas Fischer
f9f5909f9a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Also build packages for 3.0.7.
 2011-06-12 23:08:08 +02:00
Andreas Fischer
cab3b1bf7b [develop-olympus] Also build packages for 3.0.7. 2011-06-12 23:07:48 +02:00
Andreas Fischer
c6075003a3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Changelog: Changes since 3.0.8
  [develop-olympus] Bumping version number for 3.0.9-RC1.
  [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2011-06-12 22:27:29 +02:00
Andreas Fischer
7232ca4102 [develop-olympus] Bumping version number for 3.0.9-RC1. 2011-06-12 19:45:01 +02:00
Andreas Fischer
d64ec4f765 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10204] Detect binary file changes in dirs with names containing dots
 2011-06-09 12:45:11 +02:00
Nils Adermann
3c60cfd863 [ticket/10204] Detect binary file changes in dirs with names containing dots 
PHPBB3-10204
 2011-06-09 05:58:38 +02:00
Andreas Fischer
208fc76761 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10178] Add path to find command to build packages on FreeBSD.
  [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
 2011-05-08 16:35:11 +02:00