| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis | Marc Alexander | 2015-06-07 | 2 | -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 Schramm | 2015-05-30 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #3638 from naderman/ticket/13874 | Oliver Schramm | 2015-05-30 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/13874] Add master to sami API docs | ||||
| | | * | | | [ticket/13874] Add master to sami API docs | Nils Adermann | 2015-05-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13874 | ||||
| * | | | | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 3 | -76/+75 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock | ||||
| | * | | | | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 3 | -76/+75 |
| | |\ \ \ \ | | |/ / / | |/| | | | [ticket/13790] Update phpcs | ||||
| | | * | | | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 3 | -76/+75 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13790 | ||||
| * | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-16 | 2 | -0/+146 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3606 from Nicofuma/ticket/13838 | Joas Schilling | 2015-05-16 | 2 | -0/+146 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13838] Check braces for control structures | ||||
| | | * | | | | [ticket/13838] Fix coding style | Nicofuma | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838 | ||||
| | | * | | | | [ticket/13838] Check braces for control structures | Nicofuma | 2015-05-14 | 2 | -0/+146 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838 | ||||
| * | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |