Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/14700] Prevent an exception on duplicate smilies in text_formatter | JoshyPHP | 2016-07-21 | 1 | -1/+1 |
| | | | | PHPBB3-14700 | ||||
* | Merge pull request #4344 from Senky/ticket2/14586 | Marc Alexander | 2016-07-20 | 3 | -9/+143 |
|\ | | | | | | | [ticket/14586] Add OAuth1 support | ||||
| * | [ticket/14586] Add OAuth1 support | Jakub Senko | 2016-05-30 | 3 | -9/+143 |
| | | | | | | | | PHPBB3-14586 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-17 | 2 | -2/+57 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/feed.yml phpBB/feed.php phpBB/phpbb/feed/base.php | ||||
| * \ | Merge pull request #4365 from rxu/ticket/14688 | Marc Alexander | 2016-07-17 | 1 | -2/+35 |
| |\ \ | | | | | | | | | | | | | [ticket/14688] Add core events to the feeds | ||||
| | * | | [ticket/14688] Add core events to the feeds | rxu | 2016-07-17 | 1 | -2/+35 |
| | | | | | | | | | | | | | | | | PHPBB3-14688 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-17 | 1 | -46/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #4378 from Crizz0/ticket/14704 | Marc Alexander | 2016-07-17 | 1 | -46/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | [ticket/14704] Removes unused function and language files in base.php | ||||
| | * | | | [ticket/14704] Removes unused function and language files in base.php | Crizzo | 2016-07-03 | 1 | -46/+0 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14704 | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-17 | 2 | -4/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4321 from Senky/ticket/14615 | Marc Alexander | 2016-07-17 | 2 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14615] Fix HTML5 validation errors on avatar deletion | ||||
| | * | | | | [ticket/14615] Fix HTML5 validation errors on avatar deletion | Jakub Senko | 2016-05-16 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14615 | ||||
* | | | | | | Merge pull request #4380 from JoshyPHP/ticket/14706 | Marc Alexander | 2016-07-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14706] Updated [list] BBCode to automatically create a list item | ||||
| * | | | | | | [ticket/14706] Updated [list] BBCode to automatically create a list item | JoshyPHP | 2016-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues with missing list items. Produces valid HTML. PHPBB3-14706 | ||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-14 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #4347 from Senky/ticket/14631 | Marc Alexander | 2016-07-14 | 1 | -0/+10 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | [ticket/14631] Load truncate_string() if needed | ||||
| | * | | | | | [ticket/14631] Load truncate_string() if needed | Jakub Senko | 2016-06-07 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14631 | ||||
* | | | | | | | Merge pull request #4349 from marc1706/ticket/14665 | Andreas Fischer | 2016-07-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migration * marc1706/ticket/14665: [ticket/14665] Remove invalid syntax in report_id_auto_increment migration | ||||
| * | | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migration | Marc Alexander | 2016-06-08 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | PHPBB3-14665 | ||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php | ||||
| * | | | | | Merge pull request #4346 from lavigor/ticket/14661 | Marc Alexander | 2016-06-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14661] Fix a typo in twig.php | ||||
| | * | | | | | [ticket/14661] Fix a typo in twig.php | lavigor | 2016-06-05 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | PHPBB3-14661 | ||||
* | | | | | | [prep-release-3.2.0-RC1] Add migration | Tristan Darricau | 2016-06-19 | 1 | -0/+40 |
| | | | | | | |||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | |||||
| * | | | | [ticket/14664] Fix PHPDoc comment in cron manager | lavigor | 2016-06-07 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | PHPBB3-14664 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-05-27 | 1 | -2/+7 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: phpBB/phpbb/notification/manager.php | ||||
| * | | | [ticket/11446] Make get_notification_type_ids work with string too | Jakub Senko | 2016-05-27 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | PHPBB3-11446 | ||||
| * | | | [ticket/11446] Use sql_in_set properly in phpbb_notification_manager | Jakub Senko | 2016-05-23 | 1 | -12/+10 |
| |/ / | | | | | | | | | | PHPBB3-11446 | ||||
* | | | [ticket/14648] Remove whitespace at the end of a line | Mark Shaw | 2016-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-14648 | ||||
* | | | [ticket/14648] Fix bug where default notifications stop working if another ↵ | Mark Shaw | 2016-05-25 | 1 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | setting is set. When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work. PHPBB3-14648 | ||||
* | | | Merge pull request #4325 from DavidIQ/ticket/14591 | Marc Alexander | 2016-05-24 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | [ticket/14591] Use the correct delimiter for MSSQL | ||||
| * | | | [ticket/14591] Use the correct delimiter for MSSQL | David Colón | 2016-05-18 | 1 | -3/+3 |
| | | | | | | | | | | | | PHPBB3-14591 | ||||
* | | | | [ticket/14645] Language pack not reconised when using a symlink | Paul Sohier | 2016-05-21 | 1 | -0/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Symfony finder does not follow symlinks by default. With this change it does, so a user is able to have the language pack outside the phpBB directory, and linked with a symlink into phpBB/language/ PHPBB3-14645 | ||||
* | | | Merge pull request #4315 from Nicofuma/ticket/14628 | Marc Alexander | 2016-05-16 | 1 | -4/+5 |
|\ \ \ | | | | | | | | | | | | | [ticket/14628] Supports translatable error messages in the CLI installer | ||||
| * | | | [ticket/14628] Supports translatable error messages in the CLI installer | Tristan Darricau | 2016-05-05 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-14628 | ||||
* | | | | [ticket/14595] Added smtp_port where places where smtp_host exists. | Derek Held | 2016-05-14 | 3 | -0/+12 |
| | | | | | | | | | | | | | | | | PHPBB3-14595 | ||||
* | | | | [ticket/14595] Added SMTP port to getConfigTreeBuilder | Derek Held | 2016-05-14 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-14595 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-05-12 | 1 | -5/+9 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | [ticket/14610] Implement lavigor method | Richard McGirr | 2016-05-09 | 1 | -10/+9 |
| | | | | | | | | | | | | PHPBB3-14610 | ||||
| * | | [ticket/14610] Remove whitespace | Richard McGirr | 2016-05-08 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-14610 | ||||
| * | | [ticket/14610] Don't log an error if the Q&A captcha has been solved | Richard McGirr | 2016-05-08 | 1 | -0/+5 |
| |/ | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14610 PHPBB3-14610 | ||||
* | | [ticket/14607] Add missing auto_increment to report_id | Marc Alexander | 2016-05-01 | 1 | -0/+45 |
| | | | | | | | | PHPBB3-14607 | ||||
* | | Merge branch 'prep-release-3.2.0-b2' into 3.2.x | Tristan Darricau | 2016-04-28 | 1 | -0/+40 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-b2: [prep-release-3.2.0-b2] Add schema.json [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 [prep-release-3.2.0-b2] Update version to 3.2.0-b2 | ||||
| * | | [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 | Tristan Darricau | 2016-03-03 | 1 | -0/+40 |
| | | | |||||
* | | | Merge pull request #4286 from VSEphpbb/ticket/14569 | Marc Alexander | 2016-04-23 | 5 | -131/+48 |
|\ \ \ | | | | | | | | | | | | | [ticket/14569] Extract CLI progress bar creation to a method | ||||
| * | | | [ticket/14569] Extract CLI progress bar creation to a method | Matt Friedman | 2016-04-12 | 5 | -131/+48 |
| | | | | | | | | | | | | | | | | PHPBB3-14569 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-16 | 1 | -0/+36 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | [prep-release-3.1.9] Add migration for 3.1.9 | Joas Schilling | 2016-04-16 | 1 | -0/+36 |
| | | | | |||||
* | | | | [ticket/14589] Fix @var usage | Máté Bartus | 2016-04-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-14589 | ||||
* | | | | Merge pull request #4236 from Nicofuma/ticket/13616 | Máté Bartus | 2016-04-13 | 4 | -23/+17 |
|\ \ \ \ | | | | | | | | | | | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer |