Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-16 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'prep-release-3.1.9' into 3.1.x | Joas Schilling | 2016-04-16 | 1 | -2/+2 |
| |\ | |||||
| | * | [prep-release-3.1.9] Update version for 3.1.9 final | Joas Schilling | 2016-04-16 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Máté Bartus | 2016-04-13 | 1 | -41/+52 |
|\ \ \ | |/ / | | | | | | | | | | * 3.1.x: [ticket/14598] Support vars docblock in sniffer | ||||
| * | | [ticket/14598] Support vars docblock in sniffer | Tristan Darricau | 2016-04-12 | 1 | -41/+52 |
| | | | | | | | | | | | | PHPBB3-14598 | ||||
| * | | [3.1.x] Increase version for 3.1.10 development | Joas Schilling | 2016-04-09 | 1 | -1/+1 |
| |/ | |||||
| * | [prep-release-3.1.9] Update version to 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 1 | -1/+1 |
| | | |||||
| * | [ticket/14500] Specify prevversion instead of duplicate newversion | Marc Alexander | 2016-02-27 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-14500 | ||||
* | | [ticket/13616] Uses a php 5.4 compatible version | Tristan Darricau | 2016-04-03 | 1 | -3/+3 |
| | | | | | | | | PHPBB3-13616 | ||||
* | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer | Tristan Darricau | 2016-04-03 | 1 | -0/+16 |
| | | | | | | | | PHPBB3-13616 | ||||
* | | [release-3.2.0-b2] Update versions to 3.2.0-3-dev | Tristan Darricau | 2016-03-07 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #4165 from Nicofuma/ticket/14457 | Marc Alexander | 2016-02-18 | 1 | -0/+7 |
|\ \ | | | | | | | | | | [ticket/14457] Uses a random placeholder to inject css and js | ||||
| * | | [ticket/14457] Replaces unique_id implementation by random_bytes() | Tristan Darricau | 2016-02-18 | 1 | -0/+7 |
| | | | | | | | | | | | | PHPBB3-14457 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-02-18 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: build/build.xml phpBB/composer.lock | ||||
| * | Merge branch 'prep-release-3.1.8' into 3.1.x | Joas Schilling | 2016-02-18 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql | ||||
| | * | Update version for final 3.1.8 release | Joas Schilling | 2016-02-18 | 1 | -2/+2 |
| | | | |||||
| * | | [3.1.x] Increase dev version for 3.1.9 | Joas Schilling | 2016-02-13 | 1 | -1/+1 |
| |/ | |||||
| * | [prep-release-3.1.8] Update version to 3.1.8-RC1 | Joas Schilling | 2016-02-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4159 from marc1706/ticket/14448 | Tristan Darricau | 2016-02-11 | 1 | -0/+36 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14448] Use guzzle for remote files uploading * marc1706/ticket/14448: [ticket/14448] Correctly pass verify setting if available [ticket/14448] Let user decide if remote upload certs should be checked [ticket/14448] Add new vendor files and dirs to clean task [ticket/14448] Do not try to test remote upload timeout [ticket/14448] Remove no longer needed guzzle 3.9.3 [ticket/14448] Use GuzzleHttp and try to verify certs [ticket/14448] Update composer.json and lock file for guzzlehttp [ticket/14431] Remote avatar uploading [ticket/14431] Remote avatar uploading | ||||
| * | | [ticket/14448] Add new vendor files and dirs to clean task | Marc Alexander | 2016-02-03 | 1 | -0/+36 |
| | | | | | | | | | | | | PHPBB3-14448 | ||||
* | | | [release-3.2.0-b1] Update version to 3.2.0-b2-dev | Tristan Darricau | 2016-02-05 | 1 | -3/+3 |
| | | | |||||
* | | | [prep-release-3.2.0-b1] Update version to 3.2.0-b1 | Tristan Darricau | 2016-02-03 | 1 | -3/+3 |
|/ / | |||||
* | | Merge branch '3.1.x' | Joas Schilling | 2016-01-09 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php | ||||
| * | Merge branch 'prep-release-3.1.7' into 3.1.x | Joas Schilling | 2016-01-09 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql | ||||
| | * | [prep-release-3.1.7] Update version to 3.1.7-pl1 | Joas Schilling | 2016-01-09 | 1 | -2/+2 |
| | | | |||||
* | | | [ticket/14250] Review/bump dependencies | Oliver Schramm | 2016-01-04 | 1 | -35/+29 |
| | | | | | | | | | | | | PHPBB3-14250 | ||||
* | | | [ticket/14377] Handle new $classname() in the sniffer | Tristan Darricau | 2015-12-23 | 1 | -0/+5 |
| | | | | | | | | | | | | PHPBB3-14377 | ||||
* | | | [release-3.2.0-a2] Update version to 3.2.0-a3 | Tristan Darricau | 2015-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | [prep-release-3.2.0-a2] Update version to 3.2.0-a2 | Tristan Darricau | 2015-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-12-19 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: build/build.xml | ||||
| * | | Merge branch 'prep-release-3.1.7' into 3.1.x | Joas Schilling | 2015-12-19 | 1 | -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.7 | Joas Schilling | 2015-12-19 | 1 | -2/+2 |
| | | | |||||
| * | | [3.1.x] Update version to 3.1.8-dev | Joas Schilling | 2015-12-12 | 1 | -1/+1 |
| |/ | |||||
| * | [prep-release-3.1.7] Update version to 3.1.7-RC1 | Joas Schilling | 2015-12-12 | 1 | -1/+1 |
| | | |||||
* | | [master] Update version to 3.2.0-a2-dev | Tristan Darricau | 2015-11-23 | 1 | -3/+3 |
| | | |||||
* | | [prep-release-3.2.0-a1] Update version to 3.2.0-a1 | Tristan Darricau | 2015-11-09 | 1 | -1/+1 |
| | | |||||
* | | [ticket/14039] Revamp updater | Mate Bartus | 2015-10-17 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-14039 | ||||
* | | [ticket/14243] Exclude every .git directory from the pakages | Tristan Darricau | 2015-10-17 | 1 | -71/+70 |
| | | | | | | | | PHPBB3-14243 | ||||
* | | [ticket/14243] Exclude every .git directory from the pakages | Tristan Darricau | 2015-10-17 | 1 | -27/+28 |
| | | | | | | | | PHPBB3-14243 | ||||
* | | [ticket/14240] Fix packaging script for 3.2 | Mate Bartus | 2015-10-15 | 1 | -2/+11 |
| | | | | | | | | PHPBB3-14240 | ||||
* | | Merge branch '3.1.x' | Joas Schilling | 2015-09-05 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: build/build.xml | ||||
| * | Merge branch 'prep-release-3.1.6' into 3.1.x | Joas Schilling | 2015-09-05 | 1 | -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 release | Joas Schilling | 2015-09-05 | 1 | -2/+2 |
| | | | |||||
| * | | [3.1.x] Update version to 3.1.7-dev | Joas Schilling | 2015-08-23 | 1 | -1/+1 |
| |/ | |||||
| * | [prep-release-3.1.6] Update version to 3.1.6-RC1 | Joas Schilling | 2015-08-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '3.1.x' | Joas Schilling | 2015-06-14 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | | | Conflicts: build/build.xml phpBB/phpbb/user.php | ||||
| * | Merge branch 'prep-release-3.1.5' into 3.1.x | Joas Schilling | 2015-06-14 | 1 | -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 release | Joas Schilling | 2015-06-14 | 1 | -2/+2 |
| | | | |||||
| * | | [3.1.x] Update dev version to 3.1.6-RC1 | Joas Schilling | 2015-06-11 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'prep-release-3.1.5' into 3.1.x | Joas Schilling | 2015-06-11 | 2 | -8/+8 |
| |\ \ | | |/ |