aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15533] Fix typo in viewtopic_topic_tools.htmlrxu2018-01-251-1/+1
| | | | PHPBB3-15533
* Merge pull request #5102 from JoshyPHP/ticket/15527Marc Alexander2018-01-242-10/+22
|\ | | | | | | [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
| * [ticket/15527] Remove "use" and specify full class name for exceptionMarc Alexander2018-01-241-3/+1
| | | | | | | | PHPBB3-15527
| * [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migrationJoshyPHP2018-01-222-10/+24
| | | | | | | | PHPBB3-15527
* | Merge pull request #5098 from VSEphpbb/ticket/15526Marc Alexander2018-01-241-2/+2
|\ \ | | | | | | | | | [ticket/15526] Cast bbcode id to INT in merge bbcodes migration
| * | [ticket/15526] Cast bbcode id to INT in merge bbcodes migrationMatt Friedman2018-01-201-2/+2
| | | | | | | | | | | | PHPBB3-15526
* | | Merge pull request #5100 from senky/ticket/15528Marc Alexander2018-01-243-0/+4
|\ \ \ | | | | | | | | | | | | [ticket/15528] Display style phpBB version
| * | | [ticket/15528] Rename column labelJakub Senko2018-01-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15528
| * | | [ticket/15528] Display style phpBB versionJakub Senko2018-01-213-0/+4
| | |/ | |/| | | | | | | PHPBB3-15528
* | | Merge pull request #5101 from senky/ticket/15529Marc Alexander2018-01-242-2/+3
|\ \ \ | | | | | | | | | | | | [ticket/15529] Color groups in ACP
| * | | [ticket/15529] Color groups in ACPJakub Senko2018-01-212-2/+3
| |/ / | | | | | | | | | PHPBB3-15529
* | | Merge pull request #5106 from senky/ticket/15514Marc Alexander2018-01-241-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/15514] Improve SMTP_SERVER lang key
| * | | [ticket/15514] Improve SMTP_SERVER lang keyJakub Senko2018-01-241-1/+1
| |/ / | | | | | | | | | PHPBB3-15514
* | | Merge pull request #5099 from VSEphpbb/ticket/15525Marc Alexander2018-01-241-1/+1
|\ \ \ | |/ / |/| | | | | [ticket/15525] Update to valid SPDX license name GPL-2.0-only
| * | [ticket/15525] Update to valid SPDX license name GPL-2.0-onlyMatt Friedman2018-01-201-1/+1
| |/ | | | | | | PHPBB3-15525
* | Merge pull request #5084 from hubaishan/ticket/15510Marc Alexander2018-01-202-2/+9
|\ \ | | | | | | | | | [ticket/15510] Link Orphan attachments in ACP General to its page
| * | [ticket/15510] Link Orphan attachments in ACP General to its pagehubaishan2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | change `IF TOTAL_ORPHAN` to `IF TOTAL_ORPHAN > 0` PHPBB3-15510
| * | [ticket/15510] Link Orphan attachments in ACP General to its pagehubaishan2018-01-122-2/+9
| | | | | | | | | | | | | | | | | | | | | Link Orphan attachments in ACP General to Orphaned attachments page if Orphan attachments>0 PHPBB3-15510
* | | Merge pull request #5078 from Crizz0/ticket/15500Marc Alexander2018-01-202-3/+3
|\ \ \ | | | | | | | | | | | | [ticket/15500] Updates PHP requirements to 5.4.7+ in docs/
| * | | [ticket/15500] Adds 7.1 and 7.2 to tested versionsChristian Schnegelberger2018-01-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15500
| * | | [ticket/15500] Remove number from upper PHP limitChristian Schnegelberger2018-01-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15500
| * | | [ticket/15500] Updates PHP requirements to 5.4.7+ in docs/Christian Schnegelberger2018-01-072-2/+2
| | | | | | | | | | | | | | | | PHPBB3-15500
* | | | Merge pull request #5067 from hubaishan/ticket/15491Marc Alexander2018-01-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15491] Fix out dated linkes in Installer support page
| * | | | [ticket/15491] Add twitter and facebookhubaishan2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add twitter and facebook PHPBB3-15491
| * | | | [ticket/15491] Fix out dated linkes in Installer support pagehubaishan2017-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix out dated linkes in Installer support page PHPBB3-15491
* | | | | Merge pull request #5097 from canonknipser/ticket/15513Marc Alexander2018-01-201-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | [ticket/15513] Signature edit in acp gives error
| * | | | [ticket/15513] Signature edit in acp gives errorcanonknipser2018-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When editing a users signature in acp, a error is thrown. PHPBB3-15513
* | | | | [ticket/15523] Fix AdBlocker causing JS error when using CookieConsentkasimi2018-01-191-16/+19
|/ / / / | | | | | | | | | | | | PHPBB3-15523
* | | | Merge pull request #5083 from JoshyPHP/ticket/15512Marc Alexander2018-01-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15512] Avoid reparsing non-existent polls
| * | | | [ticket/15512] Avoid reparsing non-existent pollsJoshyPHP2018-01-121-1/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-15512
* | | | [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJSJakub Senko2018-01-171-2/+2
| | | | | | | | | | | | | | | | PHPBB3-15099
* | | | Merge pull request #5071 from dsinn/ticket/15495Marc Alexander2018-01-161-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/15495] Use transaction in ACP move_forum
| * | | [ticket/15495] Use transaction in ACP move_forumDaniel Sinn2018-01-031-0/+4
| |/ / | | | | | | | | | | | | | | | | | | Should prevent the forums table from getting messed up if an error or concurrent execution happens. PHPBB3-15495
* | | Merge pull request #5079 from rxu/ticket/15502Derky2018-01-122-3/+7
|\ \ \ | | | | | | | | | | | | [ticket/15502] Fix migrations
| * | | [ticket/15502] Fix migrationsrxu2018-01-092-3/+7
| | |/ | |/| | | | | | | PHPBB3-15502
* | | [ticket/15506] Assign attachrow_template_vars before foreachMarc Alexander2018-01-111-1/+2
|/ / | | | | | | | | | | | | The attachrow_template_vars array needs to be defined once in front of the foreach instead of resetting the array on every iteration of the foreach. PHPBB3-15506
* | [3.2.x] Update versions to 3.2.3-devMarc Alexander2018-01-072-2/+2
| |
* | [prep-release-3.2.2] Add 3.1.12 to build and fix display of download boxMarc Alexander2018-01-072-5/+6
| |
* | Merge branch 'prep-release-3.1.12' into prep-release-3.2.2Marc Alexander2018-01-071-0/+4
|\ \
| * | [prep-release-3.1.12] Update changelogMarc Alexander2018-01-071-0/+4
| | |
* | | [prep-release-3.2.2] Add migration for 3.2.2Marc Alexander2018-01-071-0/+37
| | |
* | | [prep-release-3.2.2] Update changelog for 3.2.2 releaseMarc Alexander2018-01-071-0/+8
| | |
* | | Merge pull request #5077 from marc1706/ticket/15353Marc Alexander2018-01-072-4/+4
|\ \ \ | | | | | | | | | | | | [ticket/15353] Do not use empty to not offer empty archive for download
| * | | [ticket/15353] Do not use empty to not offer empty archive for downloadMarc Alexander2018-01-062-4/+4
| | | | | | | | | | | | | | | | PHPBB3-15353
* | | | Merge pull request #5076 from marc1706/ticket/15496Marc Alexander2018-01-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15496] Add sort key to SELECT in fulltext_postgres
| * | | | [ticket/15496] Add sort key to SELECT in fulltext_postgresMarc Alexander2018-01-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Postgres requires that the column being ordered also appears in the SELECT part of the query. PHPBB3-15496
* | | | Merge pull request #5074 from marc1706/ticket/15498Marc Alexander2018-01-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15498] Do not pass whether URL uses router to is_route
| * | | | [ticket/15498] Do not pass whether URL uses router to is_routeMarc Alexander2018-01-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_route expects a flag of whether this is a route that was generated with the router as opposed to is_router_used() which returns whether the router will be used via app.php. PHPBB3-15498
* | | | Merge pull request #5068 from Derky/ticket/15489Marc Alexander2018-01-072-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15489] Remove NO_FORUMS message for categories with subforums
| * | | | [ticket/15489] Add NO_FORUMS_IN_CATEGORY messageDerky2018-01-042-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15489