aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14250] Review/bump dependenciesOliver Schramm2016-01-041-35/+29
| | | | PHPBB3-14250
* [ticket/14377] Handle new $classname() in the snifferTristan Darricau2015-12-231-0/+5
| | | | PHPBB3-14377
* [release-3.2.0-a2] Update version to 3.2.0-a3Tristan Darricau2015-12-191-1/+1
|
* [prep-release-3.2.0-a2] Update version to 3.2.0-a2Tristan Darricau2015-12-191-1/+1
|
* Merge branch '3.1.x'Joas Schilling2015-12-191-1/+1
|\ | | | | | | | | Conflicts: build/build.xml
| * 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/14039] Revamp updaterMate Bartus2015-10-171-1/+1
| | | | | | | | PHPBB3-14039
* | [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
* | [ticket/14240] Fix packaging script for 3.2Mate Bartus2015-10-151-2/+11
| | | | | | | | PHPBB3-14240
* | 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 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-112-8/+8
| |\ \ | | |/
* | | Merge branch '3.1.x'Joas Schilling2015-06-112-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
| | | | |
* | | | | Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-082-0/+63
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| * | | | [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 branch '3.1.x'Oliver Schramm2015-05-301-0/+1
|\ \ \ \ | |/ / /
| * | | 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 branch '3.1.x'Nils Adermann2015-05-303-76/+75
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * | | | 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 branch '3.1.x'Joas Schilling2015-05-162-0/+146
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | Merge branch '3.1.x'Marc Alexander2015-05-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13830] Fix unsused used statements and catch blocksNicofuma2015-05-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13830
* | | | | Merge branch '3.1.x'Marc Alexander2015-05-141-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13830] Check class used in catch statementsNicofuma2015-05-101-0/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-13830
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-22 07:23:28 +0000