aboutsummaryrefslogtreecommitdiffstats
path: root/build
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
|
* 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 '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 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-112-8/+8
|\ \ | |/
| * Merge branch '3.0.x' into prep-release-3.1.5Joas Schilling2015-06-102-7/+7
| |\
| | * [ticket/13823] Change diff options while packaging to not ignore all whitespacesTristan Darricau2015-06-102-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
* | | | [ticket/13930] Use OpeningParenthesisSniff in legacy rulesetMarc Alexander2015-06-082-3/+3
| | | | | | | | | | | | | | | | PHPBB3-13930
* | | | [ticket/13930] Remove not needed return statementsMarc Alexander2015-06-081-2/+0
| | | | | | | | | | | | | | | | PHPBB3-13930
* | | | [ticket/13930] Check for correct spacing between keyword & parenthesisMarc Alexander2015-06-072-0/+65
|/ / / | | | | | | | | | | | | | | | | | | The codesniffer should check for a correct spacing between keywords like if or foreach and its opening parenthesis. PHPBB3-13930
* | | Merge pull request #3638 from naderman/ticket/13874Oliver Schramm2015-05-301-0/+1
|\ \ \ | | | | | | | | | | | | [ticket/13874] Add master to sami API docs
| * | | [ticket/13874] Add master to sami API docsNils Adermann2015-05-281-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13874
* | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-303-76/+75
|\ \ \ \ | |/ / / |/| | | [ticket/13790] Update phpcs
| * | | [ticket/13790] Update phpcsTristan Darricau2015-05-193-76/+75
| | | | | | | | | | | | | | | | PHPBB3-13790
* | | | Merge pull request #3606 from Nicofuma/ticket/13838Joas Schilling2015-05-162-0/+146
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13838] Check braces for control structures
| * | | | [ticket/13838] Fix coding styleNicofuma2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13838
| * | | | [ticket/13838] Check braces for control structuresNicofuma2015-05-142-0/+146
| | | | | | | | | | | | | | | | | | | | PHPBB3-13838
* | | | | [ticket/13830] Fix unsused used statements and catch blocksNicofuma2015-05-141-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-13830
* | | | [ticket/13830] Check class used in catch statementsNicofuma2015-05-101-0/+14
| | | | | | | | | | | | | | | | PHPBB3-13830
* | | | 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 '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 '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
| | | |
* | | | [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
| |/ |/|
* | Merge branch '3.0.x' into 3.1.xJoas Schilling2015-04-031-5/+5
|\ \ | |/
| * [ticket/13738] Use new branch names in sami-all.conf.php.Andreas Fischer2015-04-021-5/+5
| | | | | | | | PHPBB3-13738
| * 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
* | \ 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 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-3/+3
|\ \ \ \ | |/ / /
| * | | [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-311-3/+3
|/ / /
* | | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-301-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. [ticket/12933] Handle case when * is last character of word [ticket/13554] Show feature release upgrades in blue rather than red. Conflicts: build/build.xml phpBB/adm/style/acp_update.html phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/includes/startup.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql tests/security/trailing_path_test.php
| * | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.Andreas Fischer2015-01-291-2/+2
| | |
* | | [prep-release-3.1.3] Update version to 3.1.2-RC1Joas Schilling2015-01-261-1/+1
| | |
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-30 01:51:43 +0000