aboutsummaryrefslogtreecommitdiffstats
path: root/build/build.xml
Commit message (Collapse)AuthorAgeFilesLines
...
| | * [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-211-1/+1
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-251-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [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
| | |
* | | [ticket/12620] Use the test environment for the testsTristan Darricau2014-11-201-0/+2
| | | | | | | | | | | | PHPBB3-12620
* | | [ticket/13063] Adds Twig routing extensionTristan Darricau2014-11-201-0/+6
| | | | | | | | | | | | PHPBB3-13063
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-121-1/+8
|\ \ \ | |/ /
| * | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-121-1/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-121-1/+8
| | | | | | | | | | | | PHPBB3-13331
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-021-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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 phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/memberlist_email.html
| * | 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
| |/ /
| * | [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-231-1/+1
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [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
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-071-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [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
| | |
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-071-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13137] Create schema.json in build script [ticket/13137] Improve output of create_schema_files.php [ticket/13137] Add schema.json file to .gitignore [ticket/13137] Generate the schema when the schema.json file is not available [ticket/13137] Remove schema.json file
| * | [ticket/13137] Create schema.json in build scriptJoas Schilling2014-10-071-0/+3
| | | | | | | | | | | | PHPBB3-13137
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-201-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 [prep-release-3.1.0-RC4] Prepare Changelog [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [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
| | |
* | | [ticket/12974] Update nightly build version to 3.2.0-a1-devJoas Schilling2014-08-121-1/+1
| | | | | | | | | | | | PHPBB3-12974
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg
| * | [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/12958] Remove more references of subsilver2Joas Schilling2014-08-101-3/+0
|/ / | | | | | | PHPBB3-12958
* | 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
* | | [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/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
|/ /
* | [ticket/12723] Do not mention too many details on documentation.Andreas Fischer2014-06-221-0/+1
| | | | | | | | PHPBB3-12723
* | [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensionsAndreas Fischer2014-06-221-0/+8
| | | | | | | | PHPBB3-12757
* | [ticket/12723] Use core suffix in filename instead of phpbb in the middle.Andreas Fischer2014-06-221-2/+2
| | | | | | | | PHPBB3-12723
* | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-221-2/+2
| | | | | | | | PHPBB3-12723
* | [ticket/12682] Make Code Sniffer run properly on Travis CI again.Andreas Fischer2014-06-131-10/+10
| | | | | | | | | | | | | | | | | | | | The --ignore parameter takes a case-insensitive pattern and as such 'phpBB/phpbb/*' matches any '/home/travis/build/phpbb/phpbb/...' file name. This results in nothing being checked against ruleset-php-legacy.xml. Using absolute paths in the --ignore pattern fixes this issues. PHPBB3-12682
* | [prep-release-3.1.0-b4] Update phpBB Version for b5 developmentJoas Schilling2014-05-301-3/+3
| |
* | [prep-release-3.1.0-b4] Update version to 3.1.0-b4Joas Schilling2014-05-301-1/+1
| |
* | Merge branch 'task/sami' into task/sami-ascraeusAndreas Fischer2014-05-161-8/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * task/sami: [task/sami] Replace phpdoctor with sami. [task/sami] Add sami/sami as a composer development dependency. Conflicts: phpBB/composer.json phpBB/composer.lock
| * [task/sami] Replace phpdoctor with sami.Andreas Fischer2014-05-161-8/+2
| | | | | | | | PHPBB3-12495
* | Merge branch 'ticket/10839-olympus' into ticket/10839Joas Schilling2014-05-091-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * ticket/10839-olympus: [ticket/10839] Fix note about running slow tests and build task [ticket/10839] Removing phpunit.xml.all [ticket/10839] Always run functional tests by default Conflicts: phpunit.xml.dist
| * [ticket/10839] Fix note about running slow tests and build taskJoas Schilling2014-05-091-1/+0
| | | | | | | | PHPBB3-10839
* | [ticket/12325] Generate the list of the deleted files and foldersTristan Darricau2014-05-051-0/+1
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12325 PHPBB3-12325