aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
| | | | PHPBB3-14660
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-131-5/+24
|\
| * [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-4/+2
| | | | | | | | PHPBB3-14626
| * [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-2/+2
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14626 PHPBB3-14626
| * [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-5/+26
| | | | | | | | PHPBB3-14626
* | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-06-111-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14291] Do not update filesize if displaying thumbnail
| * Merge pull request #4345 from marc1706/ticket/14291Andreas Fischer2016-06-111-1/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/14291] Do not update filesize if displaying thumbnail * marc1706/ticket/14291: [ticket/14291] Do not update filesize if displaying thumbnail
| | * [ticket/14291] Do not update filesize if displaying thumbnailMarc Alexander2016-05-301-1/+1
| | | | | | | | | | | | PHPBB3-14291
| * | Merge pull request #4346 from lavigor/ticket/14661Marc Alexander2016-06-081-1/+1
| |\ \ | | | | | | | | | | | | [ticket/14661] Fix a typo in twig.php
| | * | [ticket/14661] Fix a typo in twig.phplavigor2016-06-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14661
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-081-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/14664] Fix PHPDoc comment in cron managerlavigor2016-06-071-1/+1
| |/ / | | | | | | | | | PHPBB3-14664
* | | Merge pull request #4302 from cyberalien/ticket/14612Marc Alexander2016-06-041-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/14612] Fix incorrect class for fieldset in mcp_approve.html
| * | | [ticket/14612] Fix incorrect class for fieldset in mcp_approve.htmlcyberalien2016-04-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14612
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-311-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/14643] Offer latest backup to restore by defaultJakub Senko2016-05-291-1/+1
| | |/ | |/| | | | | | | PHPBB3-14643
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-281-0/+12
|\ \ \ | |/ /
| * | Merge pull request #4173 from lavigor/ticket/14466Marc Alexander2016-05-281-0/+12
| |\ \ | | | | | | | | | | | | [ticket/14466] Add an event to cron.php
| | * | [ticket/14466] Fix class name in PHPDoc comment.lavigor2016-03-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14466
| | * | [ticket/14466] Add an event to cron.phplavigor2016-02-071-0/+12
| | | | | | | | | | | | | | | | PHPBB3-14466
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-271-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/phpbb/notification/manager.php
| * | | [ticket/11446] Make get_notification_type_ids work with string tooJakub Senko2016-05-271-2/+7
| | | | | | | | | | | | | | | | PHPBB3-11446
| * | | [ticket/11446] Use sql_in_set properly in phpbb_notification_managerJakub Senko2016-05-231-12/+10
| | | | | | | | | | | | | | | | PHPBB3-11446
* | | | Merge pull request #4333 from markshawtoronto/ticket/14648Marc Alexander2016-05-271-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 lineMark Shaw2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14648
| * | | | [ticket/14648] Fix bug where default notifications stop working if another ↵Mark Shaw2016-05-251-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
* | | | | [ticket/14649] Add preview variable back to ucp_profile for eventRichard McGirr2016-05-261-1/+3
|/ / / / | | | | | | | | | | | | PHPBB3-14649
* | | | Merge pull request #4325 from DavidIQ/ticket/14591Marc Alexander2016-05-241-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14591] Use the correct delimiter for MSSQL
| * | | | [ticket/14591] Use the correct delimiter for MSSQLDavid Colón2016-05-181-3/+3
| | | | | | | | | | | | | | | PHPBB3-14591
* | | | | [ticket/14645] Language pack not reconised when using a symlinkPaul Sohier2016-05-211-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/14628Marc Alexander2016-05-161-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14628] Supports translatable error messages in the CLI installer
| * | | | [ticket/14628] Supports translatable error messages in the CLI installerTristan Darricau2016-05-051-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14628
* | | | | [ticket/14624] Remove no longer existing event argumemtMarc Alexander2016-05-161-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14624
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-151-0/+26
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | | | Merge pull request #4314 from rmcgirr83/ticket_14624Marc Alexander2016-05-151-0/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14624] Add event to ucp_profile in signature section
| | * | | | [ticket/14624] Remove whitespaceRichard McGirr2016-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624
| | * | | | [ticket/14624] Fix typo and phpBB versionRichard McGirr2016-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624
| | * | | | [ticket/14624] Move event so it actually worksRichard McGirr2016-05-051-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624
| | * | | | [ticket/14624] Add event to ucp_profile in signature sectionRichard McGirr2016-05-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14624
* | | | | | [ticket/14595] Added smtp_port where places where smtp_host exists.Derek Held2016-05-144-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14595
* | | | | | [ticket/14595] Added SMTP port to getConfigTreeBuilderDerek Held2016-05-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14595
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-121-5/+9
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | [ticket/14610] Implement lavigor methodRichard McGirr2016-05-091-10/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-14610
| * | | | [ticket/14610] Remove whitespaceRichard McGirr2016-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14610
| * | | | [ticket/14610] Don't log an error if the Q&A captcha has been solvedRichard McGirr2016-05-081-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14610 PHPBB3-14610
* | | | Merge pull request #4310 from Crizz0/ticket/14619Tristan Darricau2016-05-024-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/rheaCrizzo2016-05-014-23/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-14619
* | | | | [ticket/14607] Add missing auto_increment to report_idMarc Alexander2016-05-012-1/+3435
|/ / / / | | | | | | | | | | | | PHPBB3-14607
* | | | Merge pull request #4303 from paul999/ticket/13969Tristan Darricau2016-04-292-470/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13969] Remove obsolute language files * paul999/ticket/13969: [ticket/13969] Remove obsolute language files
| * | | | [ticket/13969] Remove obsolute language filesPaul Sohier2016-04-282-470/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These help_*.php files have been moved to help/ PHPBB3-13969