| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-05-28 | 1 | -0/+12 |
| |\ | |||||
| | * | Merge pull request #4173 from lavigor/ticket/14466 | Marc Alexander | 2016-05-28 | 1 | -0/+12 |
| | |\ | | | | | | | | | | [ticket/14466] Add an event to cron.php | ||||
| | | * | [ticket/14466] Fix class name in PHPDoc comment. | lavigor | 2016-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-14466 | ||||
| | | * | [ticket/14466] Add an event to cron.php | lavigor | 2016-02-07 | 1 | -0/+12 |
| | | | | | | | | | | | | | PHPBB3-14466 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-05-27 | 1 | -2/+7 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: phpBB/phpbb/notification/manager.php | ||||
| | * | | Merge pull request #4332 from Senky/ticket/11446 | Marc Alexander | 2016-05-27 | 1 | -14/+17 |
| | |\ \ | | | | | | | | | | | | | [ticket/11446] Use sql_in_set properly in phpbb_notification_manager | ||||
| | | * | | [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 | ||||
| * | | | | Merge pull request #4333 from markshawtoronto/ticket/14648 | Marc Alexander | 2016-05-27 | 1 | -8/+31 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14648] Fix bug where default notifications stop working if another setting is set. | ||||
| | * | | | | [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 branch '3.1.x' into 3.2.x | Máté Bartus | 2016-05-27 | 2 | -0/+10 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14650] Semi-colon instead of slash to make Matt happy [ticket/14650] Move CONTRIBUTING.md and add pull request template | ||||
| | * | | | | Merge pull request #4335 from marc1706/ticket/14650 | Máté Bartus | 2016-05-27 | 2 | -0/+10 |
| | |\ \ \ \ | | |_|/ / | |/| | | | [ticket/14650] Move CONTRIBUTING.md and add pull request template | ||||
| | | * | | | [ticket/14650] Semi-colon instead of slash to make Matt happy | Marc Alexander | 2016-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14650 | ||||
| | | * | | | [ticket/14650] Move CONTRIBUTING.md and add pull request template | Marc Alexander | 2016-05-26 | 2 | -0/+10 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-14650 | ||||
| * | | | | Merge pull request #4334 from rmcgirr83/ticket_14649 | Marc Alexander | 2016-05-26 | 1 | -1/+3 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | [ticket/14649] Add preview variable back to ucp_profile for event | ||||
| | * | | | [ticket/14649] Add preview variable back to ucp_profile for event | Richard McGirr | 2016-05-26 | 1 | -1/+3 |
| |/ / / | | | | | | | | | | PHPBB3-14649 | ||||
| * | | | 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 | ||||
| * | | | | Merge pull request #4327 from paul999/ticket/14645 | Máté Bartus | 2016-05-22 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / |/| | | | [ticket/14645] Language pack not reconised when using a symlink | ||||
| | * | | | [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 | ||||
| * | | | | Merge pull request #4320 from marc1706/ticket/14624 | Máté Bartus | 2016-05-16 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | [ticket/14624] Remove no longer existing event argumemt | ||||
| | * | | | | [ticket/14624] Remove no longer existing event argumemt | Marc Alexander | 2016-05-16 | 1 | -1/+0 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-14624 | ||||
| * | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-05-15 | 1 | -0/+26 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php | ||||
| | * | | | Merge pull request #4314 from rmcgirr83/ticket_14624 | Marc Alexander | 2016-05-15 | 1 | -0/+26 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/14624] Add event to ucp_profile in signature section | ||||
| | | * | | | [ticket/14624] Remove whitespace | Richard McGirr | 2016-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624 | ||||
| | | * | | | [ticket/14624] Fix typo and phpBB version | Richard McGirr | 2016-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624 | ||||
| | | * | | | [ticket/14624] Move event so it actually works | Richard McGirr | 2016-05-05 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624 | ||||
| | | * | | | [ticket/14624] Add event to ucp_profile in signature section | Richard McGirr | 2016-05-05 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624 | ||||
| * | | | | | Merge pull request #4319 from derekheld/ticket/14595 | Tristan Darricau | 2016-05-15 | 5 | -0/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14595] Installer will now ask for a SMTP port as part of email setup. * derekheld/ticket/14595: [ticket/14595] Added smtp_port where places where smtp_host exists. PHPBB3-14595 [ticket/14595] Added SMTP port to getConfigTreeBuilder PHPBB3-14595 | ||||
| | * | | | | | [ticket/14595] Added smtp_port where places where smtp_host exists. | Derek Held | 2016-05-14 | 4 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| | * | | | Merge pull request #4317 from rmcgirr83/ticket_14610 | Marc Alexander | 2016-05-12 | 1 | -5/+9 |
| | |\ \ \ | | |/ / | |/| | | | | | | [ticket/14610] Don't log an error if the Q&A captcha has been solved | ||||
| | | * | | [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 | ||||
| * | | | Merge pull request #4310 from Crizz0/ticket/14619 | Tristan Darricau | 2016-05-02 | 4 | -23/+23 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14619] Updates "docs" from 3.1.x/ascraeus to 3.2.x/rhea * Crizz0/ticket/14619: [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea | ||||
| | * | | | [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea | Crizzo | 2016-05-01 | 4 | -23/+23 |
| | | | | | | | | | | | | | | | | | PHPBB3-14619 | ||||
| * | | | | Merge pull request #4308 from marc1706/ticket/14607 | Tristan Darricau | 2016-05-02 | 2 | -1/+3435 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | [ticket/14607] Add missing auto_increment to report_id * marc1706/ticket/14607: [ticket/14607] Add missing auto_increment to report_id | ||||
| | * | | | [ticket/14607] Add missing auto_increment to report_id | Marc Alexander | 2016-05-01 | 2 | -1/+3435 |
| |/ / / | | | | | | | | | | PHPBB3-14607 | ||||
| * | | | Merge pull request #4303 from paul999/ticket/13969 | Tristan Darricau | 2016-04-29 | 2 | -470/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13969] Remove obsolute language files * paul999/ticket/13969: [ticket/13969] Remove obsolute language files | ||||
| | * | | | [ticket/13969] Remove obsolute language files | Paul Sohier | 2016-04-28 | 2 | -470/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These help_*.php files have been moved to help/ PHPBB3-13969 | ||||
| * | | | | Merge branch 'prep-release-3.2.0-b2' into 3.2.x | Tristan Darricau | 2016-04-28 | 3 | -3390/+74 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | * 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 schema.json | Tristan Darricau | 2016-03-03 | 1 | -3389/+1 |
| | | | | | |||||
| | * | | | [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2 | Tristan Darricau | 2016-03-03 | 1 | -1/+33 |
| | | | | | |||||
| | * | | | [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 | Tristan Darricau | 2016-03-03 | 1 | -0/+40 |
| | | | | | |||||
| | * | | | [prep-release-3.2.0-b2] Update version to 3.2.0-b2 | Tristan Darricau | 2016-03-02 | 6 | -7/+7 |
| | | | | | |||||
