aboutsummaryrefslogtreecommitdiffstats
path: root/build/build.xml
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2015-12-191-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.7] Increase version to 3.1.7Joas Schilling2015-12-191-2/+2
| | |
| * | [3.1.x] Update version to 3.1.8-devJoas Schilling2015-12-121-1/+1
| |/
| * [prep-release-3.1.7] Update version to 3.1.7-RC1Joas Schilling2015-12-121-1/+1
| |
* | [master] Update version to 3.2.0-a2-devTristan Darricau2015-11-231-3/+3
| |
* | [prep-release-3.2.0-a1] Update version to 3.2.0-a1Tristan Darricau2015-11-091-1/+1
| |
* | [ticket/14243] Exclude every .git directory from the pakagesTristan Darricau2015-10-171-71/+70
| | | | | | | | PHPBB3-14243
* | [ticket/14243] Exclude every .git directory from the pakagesTristan Darricau2015-10-171-27/+28
| | | | | | | | PHPBB3-14243
* | Merge branch '3.1.x'Joas Schilling2015-09-051-2/+2
|\ \ | |/ | | | | | | Conflicts: build/build.xml
| * Merge branch 'prep-release-3.1.6' into 3.1.xJoas Schilling2015-09-051-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.6] Update version for final 3.1.6 releaseJoas Schilling2015-09-051-2/+2
| | |
| * | [3.1.x] Update version to 3.1.7-devJoas Schilling2015-08-231-1/+1
| |/
| * [prep-release-3.1.6] Update version to 3.1.6-RC1Joas Schilling2015-08-231-1/+1
| |
* | Merge branch '3.1.x'Joas Schilling2015-06-141-2/+2
|\ \ | |/ | | | | | | | | Conflicts: build/build.xml phpBB/phpbb/user.php
| * Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-141-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.5] Update version for final 3.1.5 releaseJoas Schilling2015-06-141-2/+2
| | |
| * | [3.1.x] Update dev version to 3.1.6-RC1Joas Schilling2015-06-111-2/+2
| |/
* | Merge branch '3.1.x'Joas Schilling2015-06-111-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [3.1.x] Increase dev version to 3.1.6-devJoas Schilling2015-06-111-2/+2
| |/
| * Merge branch '3.0.x' into prep-release-3.1.5Joas Schilling2015-06-101-4/+4
| |\
| | * [ticket/13823] Change diff options while packaging to not ignore all whitespacesTristan Darricau2015-06-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed: -w, --ignore-all-space Ignore white space when comparing lines. Added: -Z, --ignore-trailing-space Ignore white space at line end. -b, --ignore-space-change Ignore changes in the amount of white space. PHPBB3-13823
| | * Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-05-031-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | [3.0.x] Increment version number to 3.0.15-dev.Andreas Fischer2015-04-281-3/+3
| | | |
| * | | [prep-release-3.1.5] Update version to 3.1.5-RC1Joas Schilling2015-06-091-1/+1
| | | |
* | | | Merge branch '3.1.x'Nils Adermann2015-05-301-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-301-3/+3
| |\ \ \ | | | | | | | | | | [ticket/13790] Update phpcs
| | * | | [ticket/13790] Update phpcsTristan Darricau2015-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13790
* | | | | Merge branch '3.1.x'Joas Schilling2015-05-031-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: build/build.xml
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | | [prep-release-3.1.4] Update version to 3.1.4Joas Schilling2015-05-031-2/+2
| | | | | |
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-031-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml
| | * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | | * | | [prep-release-3.0.14] Bump version numbers for 3.0.14 release.Andreas Fischer2015-05-031-3/+3
| | | | |/ | | | |/|
| | * | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-2/+2
| | | | |
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html 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
| | | * | [3.0.x] Bump version numbers for 3.0.14-RC1 release.Andreas Fischer2015-04-271-1/+1
| | | | |
| | | * | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-301-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | | | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-101-1/+1
| |/ / / /
| * | | | Update version to 3.1.4-RC1Joas Schilling2015-04-091-1/+1
| | |_|/ | |/| |
* | | | [ticket/13767] Remove vendor/s9e/text-formatter/.git during buildJoshyPHP2015-04-191-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13767
* | | | [ticket/13619] Remove unneeded files and folders from vendor in release packageMarc Alexander2015-02-151-0/+32
| | | | | | | | | | | | | | | | PHPBB3-13619
* | | | [ticket/13407] Update Symfony to 2.7.*@devNicofuma2015-02-041-0/+12
| | | | | | | | | | | | | | | | PHPBB3-13407
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: build/build.xml
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-02-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.1.3] Update version to 3.1.3Joas Schilling2015-02-011-3/+3
| | | | |
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-3/+3
| |\ \ \ \ | | |/ / /
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 13:51:32 +0000