Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| |\ \ | | |/ | |||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-11 | 2 | -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-dev | Joas Schilling | 2015-06-11 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Merge branch '3.0.x' into prep-release-3.1.5 | Joas Schilling | 2015-06-10 | 2 | -7/+7 |
| |\ \ | |||||
| | * | | [ticket/13823] Change diff options while packaging to not ignore all whitespaces | Tristan Darricau | 2015-06-10 | 2 | -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.x | Andreas Fischer | 2015-05-03 | 1 | -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 Fischer | 2015-04-28 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | [prep-release-3.1.5] Update version to 3.1.5-RC1 | Joas Schilling | 2015-06-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'ticket/13930' into ticket/13930-master | Marc Alexander | 2015-06-08 | 2 | -0/+63 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php | ||||
| * | | | | [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset | Marc Alexander | 2015-06-08 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13930 | ||||
| * | | | | [ticket/13930] Remove not needed return statements | Marc Alexander | 2015-06-08 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13930 |