aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/install/database_update.php
| * \ Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-261-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-261-3/+3
| | |
* | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-211-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.14-dev. [develop-olympus] Add changelog for 3.0.13 release. [develop-olympus] Bump version numbers for 3.0.13-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.13 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
| * | [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-211-3/+3
| |/
| * [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-211-1/+1
| |
* | [ticket/13511] Call the check() method with the phpcsFile objectTristan Darricau2015-01-171-7/+7
| | | | | | | | PHPBB3-13511
* | [ticket/13272] Add vendor/ folder to "changed files" packageJoas Schilling2015-01-101-0/+1
| | | | | | | | PHPBB3-13272
* | [ticket/13402] Handle arrays and multiples typesTristan Darricau2014-11-301-2/+10
| | | | | | | | PHPBB3-13402
* | [ticket/13402] Refactor unused use SniffTristan Darricau2014-11-301-79/+29
| | | | | | | | PHPBB3-13402
* | [ticket/13402] Code sniffer, unused use, check the function doc blocksTristan Darricau2014-11-291-0/+62
| | | | | | | | PHPBB3-13402
* | [ticket/13381] Allow ' *' in the doc blocks (especially the header files)Tristan Darricau2014-11-271-3/+3
| | | | | | | | PHPBB3-13381
* | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-devJoas Schilling2014-11-251-3/+3
| |
* | [prep-release-3.1.2] Increase version number to 3.1.2Joas Schilling2014-11-241-3/+3
| |
* | [prep-release-3.1.2] Update version to 3.1.2-RC1Joas Schilling2014-11-221-1/+1
| |
* | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-123-16/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches * bantu/ticket/13331: [ticket/13331] Use docs target for this branch, add docs-all for dev branches. Conflicts: build/build.xml build/sami-checkout.conf.php
| * [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-123-20/+51
| | | | | | | | PHPBB3-13331
* | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-021-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-011-3/+3
| | |
* | | [develop-ascraeus] Update version number to 3.1.1-RC1-devNils Adermann2014-10-251-3/+3
|/ /
* | Merge pull request #3059 from nickvergessen/ticket/13208Marc Alexander2014-10-231-1/+1
|\ \ | | | | | | | | | [ticket/13208] Add security issues to the final changelog
| * | [ticket/13208] Add security issues to the final changelogJoas Schilling2014-10-231-1/+1
| | | | | | | | | | | | PHPBB3-13208
* | | [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-231-1/+1
|/ /
* | [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-231-3/+3
| |
* | [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6Joas Schilling2014-10-231-1/+1
| |
* | [prep-release-3.1.0-RC5] Update phpBB Version for RC6 developmentJoas Schilling2014-10-071-3/+3
| |
* | [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5Joas Schilling2014-10-071-1/+1
| |
* | [ticket/13137] Create schema.json in build scriptJoas Schilling2014-10-071-0/+3
| | | | | | | | PHPBB3-13137
* | [prep-release-3.1.0-RC4] Update phpBB Version for RC4 developmentJoas Schilling2014-09-201-3/+3
| |
* | [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4Joas Schilling2014-09-191-1/+1
| |
* | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-121-3/+3
| |
* | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-111-1/+1
| |
* | [ticket/12941] Add sami.conf.php for Travis CI.Andreas Fischer2014-08-091-2/+4
| | | | | | | | PHPBB3-12941
* | Merge pull request #2644 from Nicofuma/ticket/12051Joas Schilling2014-08-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12051] Optimise Composer Autoloader on Build * Nicofuma/ticket/12051: [ticket/12051] Optimise Composer Autoloader on Build
| * | [ticket/12051] Optimise Composer Autoloader on BuildTristan Darricau2014-06-231-1/+1
| | | | | | | | | | | | PHPBB3-12051
* | | Merge pull request #2725 from Nicofuma/ticket/12842Joas Schilling2014-07-121-10/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12842] Out of memory issue in code sniffer call for extensions * Nicofuma/ticket/12842: [ticket/12842] Skip parameters without exlicit type
| * | | [ticket/12842] Skip parameters without exlicit typeTristan Darricau2014-07-121-10/+15
| | | | | | | | | | | | | | | | PHPBB3-12842
* | | | [prep-release-3.1.0-RC2] Update phpBB Version for RC3 developmentJoas Schilling2014-07-111-3/+3
| | | |
* | | | [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2Joas Schilling2014-07-111-1/+1
|/ / /
* | | [ticket/12839] Include update related templates and assets in the packageJoas Schilling2014-07-111-6/+36
| | | | | | | | | | | | PHPBB3-12839
* | | [ticket/12825] Better sniff for the extensions and skip the vendor/ directoryTristan Darricau2014-07-061-0/+1
| | | | | | | | | | | | PHPBB3-12825
* | | [prep-release-3.1.0-RC1] Update phpBB Version for RC2 developmentJoas Schilling2014-06-251-3/+3
| | |
* | | [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1Joas Schilling2014-06-241-1/+1
|/ /