aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-311-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-311-3/+3
| |
* | [ticket/10736] Run composer in phing buildsNils Adermann2012-03-311-5/+28
| | | | | | | | PHPBB3-10736
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-025-10/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * 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
| * Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into ↵Andreas Fischer2012-01-025-10/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-025-10/+6
| | | | | | | | | | | | PHPBB3-9916
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-011-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10 final. Conflicts: phpBB/install/database_update.php
| * | [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-011-2/+2
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-041-2/+2
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. Conflicts: phpBB/install/database_update.php
| * [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-2/+2
| |
* | Merge branch 'develop-olympus' into developNils Adermann2011-12-012-0/+59
|\ \ | |/ | | | | | | | | | | * 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'.
| * [ticket/10480] Add a build target for changelog building.Andreas Fischer2011-11-291-0/+6
| | | | | | | | PHPBB3-10480
| * [ticket/10480] Add a build script for exporting the changelog from tracker.Andreas Fischer2011-11-291-0/+53
| | | | | | | | PHPBB3-10480
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-261-2/+2
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. Conflicts: phpBB/install/database_update.php
| * [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-2/+2
| |
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-241-0/+8
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10486] Create git shortlog and git diff --stat in build script.
| * [ticket/10486] Create git shortlog and git diff --stat in build script.Andreas Fischer2011-11-221-0/+8
| | | | | | | | PHPBB3-10486
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-211-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-3/+3
| |
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-0/+9
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10222] Also build language and styles changes in diff/patch format.
| * [ticket/10222] Also build language and styles changes in diff/patch format.Andreas Fischer2011-08-251-0/+9
| | | | | | | | PHPBB3-10222
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-071-13/+9
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10313] Create a separate build task for slow tests.
| * [ticket/10313] Create a separate build task for slow tests.Nils Adermann2011-08-071-13/+9
| | | | | | | | PHPBB3-10313
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-071-0/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10313] Include slow unit tests when running build script.
| * [ticket/10313] Include slow unit tests when running build script.Andreas Fischer2011-08-081-0/+1
| | | | | | | | PHPBB3-10313
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-101-2/+2
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Bumping version number for 3.0.9 final. Conflicts: phpBB/install/database_update.php
| * [prep-release-3.0.9] Bumping version number for 3.0.9 final.Andreas Fischer2011-07-101-2/+2
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-071-1/+1
|\ \ | |/ | | | | | | | | * 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.
| * [prep-release-3.0.9] Decreasing version for an RC4 release.Andreas Fischer2011-07-071-1/+1
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-051-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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
| * [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.Andreas Fischer2011-07-051-3/+3
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-3/+3
|\ \ | |/ | | | | | | | | * 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.
| * [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-261-3/+3
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-3/+3
|\ \ | |/ | | | | | | * develop-olympus: [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.
| * [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.Andreas Fischer2011-06-151-3/+3
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [develop-olympus] Also build packages for 3.0.7.
| * [develop-olympus] Also build packages for 3.0.7.Andreas Fischer2011-06-121-1/+1
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [develop-olympus] Bumping version number for 3.0.9-RC1.Andreas Fischer2011-06-121-2/+2
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10204] Detect binary file changes in dirs with names containing dots
| * [ticket/10204] Detect binary file changes in dirs with names containing dotsNils Adermann2011-06-091-1/+1
| | | | | | | | PHPBB3-10204
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-081-3/+3
|\ \ | |/ | | | | | | | | * 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.
| * Merge remote-tracking branch 'p/ticket/10178' into develop-olympusAndreas Fischer2011-05-081-2/+2
| |\ | | | | | | | | | | | | * p/ticket/10178: [ticket/10178] Add path to find command to build packages on FreeBSD.
| | * [ticket/10178] Add path to find command to build packages on FreeBSD.Oleg Pudeyev2011-05-071-2/+2
| | | | | | | | | | | | PHPBB3-10178
| * | [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.Oleg Pudeyev2011-05-071-1/+1
| |/ | | | | | | PHPBB3-10177
* | Merge branch 'develop-olympus' into developNils Adermann2011-02-271-0/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9984] Add a phing target that does not create packages.
| * [ticket/9984] Add a phing target that does not create packages.Nils Adermann2011-02-271-0/+1
| | | | | | | | PHPBB3-9984
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-071-2/+2
|\ \ | |/ | | | | | | * develop-olympus: [task/phpdoc] Make phpdoctor output quiet instead of verbose.
| * Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-071-2/+2
| |\ | | | | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Make phpdoctor output quiet instead of verbose.
| | * [task/phpdoc] Make phpdoctor output quiet instead of verbose.Nils Adermann2011-01-071-2/+2
| | | | | | | | | | | | PHPBB3-9943
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-16 16:18:39 +0000