aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15917] Remove br tagsbattye2019-04-071-2/+2
| | | | PHPBB3-15917
* [ticket/15917] Special unapproved topics messagebattye2019-02-132-1/+9
| | | | | | | | For forums that have no approved posts but also have topics awaiting approval, to avoid the inconsistency of saying 'no posts' alongside a positive post count. PHPBB3-15917
* Merge pull request #5487 from 3D-I/ticket/15918Marc Alexander2019-02-111-3/+3
|\ | | | | | | [ticket/15918] Fix addslashes in mcp_ban.html
| * [ticket/15918] Apply the Twig escape filter to not add-slashed contents3D-I2018-12-241-2/+2
| | | | | | | | PHPBB3-15918
| * [ticket/15918] Remove redundant escape JS3D-I2018-12-241-3/+3
| | | | | | | | | | | | In mcp_ban.html and coherently use twig syntax PHPBB3-15918
* | Merge pull request #5525 from kasimi/ticket/15954Marc Alexander2019-02-119-22/+88
|\ \ | | | | | | | | | [ticket/15954] Add safeguards to include() calls
| * | [ticket/15954] Fixed including mcp_front.phpkasimi2019-01-301-1/+1
| | | | | | | | | | | | PHPBB3-15954
| * | [ticket/15954] Add safeguards to include() callskasimi2019-01-269-22/+88
| | | | | | | | | | | | PHPBB3-15954
* | | Merge pull request #5529 from 3D-I/ticket/15960Marc Alexander2019-02-111-0/+4
|\ \ \ | | | | | | | | | | | | [ticket/15960] Add SQL transactions to functions_admin.php
| * | | [ticket/15960] Add SQL transactions to functions_admin.php3D-I2019-02-011-0/+4
| | |/ | |/| | | | | | | PHPBB3-15960
* | | Merge pull request #5530 from marc1706/ticket/15959Marc Alexander2019-02-111-1/+1
|\ \ \ | |_|/ |/| | | | | [ticket/15959] Fix invalid CNAME record
| * | [ticket/15959] Fix invalid CNAME recordAJ Quick2019-02-031-1/+1
| | | | | | | | | | | | PHPBB3-15959
| * | [ticket/15959] Fix invalid CNAME recordAJ Quick2019-02-031-1/+1
|/ / | | | | | | PHPBB3-15959
* | Merge pull request #5510 from mrgoldy/ticket/15931Marc Alexander2019-01-202-5/+10
|\ \ | | | | | | | | | [ticket/15931] Fix PM report emails
| * | [ticket/15931] Fix PM report emailsmrgoldy2019-01-142-5/+10
| | | | | | | | | | | | PHPBB3-15931
* | | Merge pull request #5469 from senky/ticket/15899Marc Alexander2019-01-201-0/+20
|\ \ \ | |/ / |/| | | | | [ticket/15899] Add core.modify_attachment_sql_ary_on_* events
| * | [ticket/15899] Add core.modify_attachment_sql_ary_on_* eventsJakub Senko2018-12-271-0/+20
| | | | | | | | | | | | PHPBB3-15899
* | | Merge pull request #5508 from marc1706/ticket/15935Marc Alexander2019-01-131-4/+7
|\ \ \ | | | | | | | | | | | | [ticket/15935] Don't install APCu if it's already installed
| * | | [ticket/15935] Don't install APCu if it's already installedAlec2019-01-131-4/+7
|/ / / | | | | | | | | | | | | | | | | | | Travis fails when the APCu install fails due to it already being installed A check is added here to make sure that it does nothing in that case PHPBB3-15935
* | | Merge pull request #5498 from 3D-I/ticket/15926Marc Alexander2019-01-062-3/+3
|\ \ \ | | | | | | | | | | | | [ticket/15926] Deny 3.2.x installation if PHP >= 7.3-dev
| * | | [ticket/15926] Deny 3.2.x installation if PHP >= 7.3-dev3D-I2019-01-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15926
| * | | [ticket/15926] Update docs/INSTALL.html3D-I2019-01-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15926
| * | | [ticket/15926] Deny 3.2.x installation if PHP >= 7.3-dev3D-I2019-01-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15926
| * | | [ticket/15926] Deny 3.2.x installation if PHP >= 7.3-dev3D-I2019-01-051-2/+2
| | |/ | |/| | | | | | | PHPBB3-15926
| * | Merge pull request #1 from phpbb/3.2.x3Di2018-12-2425-34/+302
| |\ \ | | | | | | | | 3.2.x
* | \ \ Merge pull request #5457 from battye/ticket/15883Marc Alexander2019-01-054-5/+53
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15883] New error message for when users try adding invalid usernames to a group
| * | | | [ticket/15883] Doc block changebattye2019-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15883
| * | | | [ticket/15883] Review changesbattye2019-01-043-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-15883
| * | | | [ticket/15883] Use the new language objectbattye2018-11-292-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the new ->lang() format. Made the username comparison case insensitive. Also fixed a bug where the return to previous page link in the UCP was going back to the list of groups rather than the specific manage group page when an error occurred. PHPBB3-15883
| * | | | [ticket/15883] Add error for invalid usernames being added to a groupbattye2018-11-264-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the ACP and the UCP so that when bulk adding users to a group, if invalid usernames are submitted alongside valid usernames then a message will be displayed to inform the user what the invalid usernames are. PHPBB3-15883
* | | | | Merge pull request #5485 from marc1706/ticket/15919Derky2019-01-021-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15919] Don't run lint test against node_modules
| * | | | | [ticket/15919] Don't run lint test against node_modulesMarc Alexander2018-12-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, make sure to correctly handle opendir returning false instead of the stream handle. PHPBB3-15919
* | | | | | Merge pull request #5493 from marc1706/ticket/15924Derky2019-01-014-5/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15924] Switch to trusty build environment
| * | | | | | [ticket/15924] Switch back to installing mariadb from 3rd party repoMarc Alexander2019-01-013-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15924
| * | | | | | [ticket/15924] Enable APCu extensionMarc Alexander2019-01-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15924
| * | | | | | [ticket/15924] Install apc via pecl and remove nginx config checkMarc Alexander2018-12-312-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15924
| * | | | | | [ticket/15924] Switch to trusty build environmentMarc Alexander2018-12-314-62/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-15924
* | | | | | Merge pull request #5488 from marc1706/ticket/15921chita2018-12-297-29/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15921] Update textformattter to 1.3.2
| * | | | | | [ticket/15921] Use backward compatible template for emojisJoshyPHP2018-12-291-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15921
| * | | | | | [ticket/15921] Update tests for twemojiMarc Alexander2018-12-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15921
| * | | | | | [ticket/15921] Use twemojiMarc Alexander2018-12-262-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15921
| * | | | | | [ticket/15921] Update inconsistencies in composer.lockMarc Alexander2018-12-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15921
| * | | | | | [ticket/15921] Updated dependencies to latest textformatterJoshyPHP2018-12-265-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15921
* | | | | | | Merge pull request #5462 from 3D-I/ticket/15890Marc Alexander2018-12-291-3/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15890] Add core.memberlist_modify_viewprofile_sql
| * | | | | | | [ticket/15890] Add core.memberlist_modify_viewprofile_sql3D-I2018-12-011-3/+25
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-15890
* | | | | | | Merge pull request #5468 from senky/ticket/15898Marc Alexander2018-12-271-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15898] Add core.ucp_pm_compose_template
| * | | | | | | [ticket/15898] Add core.ucp_pm_compose_templateJakub Senko2018-12-031-2/+14
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-15898
* | | | | | | Merge pull request #5482 from GanstaZ/ticket/15914Marc Alexander2018-12-271-6/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15914] Add core.modify_memberlist_viewprofile_group* events
| * | | | | | | [ticket/15914] Change sinceGanstaZ2018-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15914
| * | | | | | | Merge branch '3.2.x' into ticket/15914GanstaZ2018-12-2215-22/+210
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |