| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'prep-release-3.2.3' into 3.2.x | Marc Alexander | 2018-08-02 | 1 | -1/+1 |
| |\ | |||||
| | * | [prep-release-3.2.3] Update version numbers for 3.2.3-RC2 | Marc Alexander | 2018-07-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'prep-release-3.2.3' into 3.2.x | Marc Alexander | 2018-07-30 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | [ticket/15731] Fix language string parameters | Rubén Calvo | 2018-07-30 | 1 | -1/+1 |
| | | | | | | | | | PHPBB3-15731 | ||||
| * | | Merge pull request #5253 from senky/ticket/15618 | Tristan Darricau | 2018-07-08 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | [ticket/15618] Display The team link only to users with permission * github.com:/phpbb/phpbb: [ticket/15618] Display The team link only to users with permission | ||||
| | * | | [ticket/15618] Display The team link only to users with permission | Jakub Senko | 2018-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-15618 | ||||
| * | | | Merge pull request #5277 from ghostal/ticket/15717 | Tristan Darricau | 2018-07-08 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15717] Using correct variable for log entry * github.com:/phpbb/phpbb: [ticket/15717] Using correct variable for log entry | ||||
| | * | | | [ticket/15717] Using correct variable for log entry | Alex Miles | 2018-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-15717 | ||||
| * | | | | Merge pull request #5217 from Zoddo/ticket/15656 | Tristan Darricau | 2018-07-08 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15656] Add "View post" link in the mod logs on the ACP * github.com:/phpbb/phpbb: [ticket/15656] Add "View post" link in the mod logs on the ACP | ||||
| | * | | | | [ticket/15656] Add "View post" link in the mod logs on the ACP | Zoddo | 2018-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This link was added to the MCP view in GH-3870 (PHPBB3-9485) but I completely forgot the ACP… Consistency is back! PHPBB3-15656 | ||||
| * | | | | | Merge branch 'prep-release-3.2.3' into 3.2.x | Tristan Darricau | 2018-07-08 | 1 | -2/+26 |
| |\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | * prep-release-3.2.3: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY | ||||
| | * | | | Merge pull request #5231 from marc1706/ticket/15676 | Tristan Darricau | 2018-07-08 | 1 | -2/+26 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY * github.com:/phpbb/phpbb: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY | ||||
| | | * | | | [ticket/15676] Simplify link text and use privacy link in cookie notice | Marc Alexander | 2018-05-31 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-15676 | ||||
| | | * | | | [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY | Marc Alexander | 2018-05-31 | 1 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-15676 | ||||
| * | | | | | [ticket/15695] Fix gen_rand_string returning less characters than expected | Rubén Calvo | 2018-06-18 | 1 | -4/+6 |
| | |_|_|/ |/| | | | | | | | | | | | PHPBB3-15695 | ||||
| * | | | | Merge pull request #5245 from rubencm/ticket/15693 | Marc Alexander | 2018-06-17 | 1 | -2/+6 |
| |\ \ \ \ | |/ / / |/| | | | | | | | [ticket/15693] Fix get_rand_string() | ||||
| | * | | | [ticket/15693] Update tests to reflect changes to gen_rand_string() | Marc Alexander | 2018-06-17 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | PHPBB3-15693 | ||||
| | * | | | [ticket/15693] Fix get_rand_string() | Rubén Calvo | 2018-06-15 | 1 | -2/+2 |
| | | |/ | |/| | | | | | | | PHPBB3-15693 | ||||
| * | | | Merge pull request #5218 from senky/ticket/15657 | Marc Alexander | 2018-06-17 | 1 | -2/+43 |
| |\ \ \ | |/ / |/| | | | | | [ticket/15657] Add MCP queue events | ||||
| | * | | [ticket/15657] Add MCP queue events | Jakub Senko | 2018-05-03 | 1 | -2/+43 |
| |/ / | | | | | | | PHPBB3-15657 | ||||
| * | | [3.2.x] Update version numbers to 3.2.4-dev | Marc Alexander | 2018-03-26 | 1 | -1/+1 |
| |/ | |||||
| * | [prep-release-3.2.3] Update version numbers for 3.2.3-RC1 | Marc Alexander | 2018-02-28 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #5094 from JoshyPHP/ticket/15518 | Marc Alexander | 2018-02-21 | 1 | -0/+1 |
| |\ | | | | | | | [ticket/15518] Add a setting to toggle permission checks for pms in viewtopic | ||||
| | * | [ticket/15518] Add a setting to toggle permission checks for pms in viewtopic | JoshyPHP | 2018-01-17 | 1 | -0/+1 |
| | | | | | | | | | PHPBB3-15518 | ||||
| * | | [ticket/15507] Fix PHP 7.2 warning in functions_messenger.php | hubaishan | 2018-01-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | By pre assgin `$extra_headers` to array. PHPBB3-15507 | ||||
| * | | Merge pull request #5100 from senky/ticket/15528 | Marc Alexander | 2018-01-24 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | [ticket/15528] Display style phpBB version | ||||
| | * | | [ticket/15528] Display style phpBB version | Jakub Senko | 2018-01-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | PHPBB3-15528 | ||||
| * | | | [ticket/15529] Color groups in ACP | Jakub Senko | 2018-01-21 | 1 | -1/+2 |
| |/ / | | | | | | | PHPBB3-15529 | ||||
| * | | Merge pull request #5084 from hubaishan/ticket/15510 | Marc Alexander | 2018-01-20 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | [ticket/15510] Link Orphan attachments in ACP General to its page | ||||
| | * | | [ticket/15510] Link Orphan attachments in ACP General to its page | hubaishan | 2018-01-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Link Orphan attachments in ACP General to Orphaned attachments page if Orphan attachments>0 PHPBB3-15510 | ||||
| * | | | [ticket/15513] Signature edit in acp gives error | canonknipser | 2018-01-20 | 1 | -1/+1 |
| | |/ |/| | | | | | | | | | When editing a users signature in acp, a error is thrown. PHPBB3-15513 | ||||
| * | | Merge pull request #5071 from dsinn/ticket/15495 | Marc Alexander | 2018-01-16 | 1 | -0/+4 |
| |\ \ | |/ |/| | | | [ticket/15495] Use transaction in ACP move_forum | ||||
| | * | [ticket/15495] Use transaction in ACP move_forum | Daniel Sinn | 2018-01-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | Should prevent the forums table from getting messed up if an error or concurrent execution happens. PHPBB3-15495 | ||||
| * | | [ticket/15506] Assign attachrow_template_vars before foreach | Marc Alexander | 2018-01-11 | 1 | -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-dev | Marc Alexander | 2018-01-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #5074 from marc1706/ticket/15498 | Marc Alexander | 2018-01-07 | 1 | -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_route | Marc Alexander | 2018-01-06 | 1 | -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 remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2 | Marc Alexander | 2018-01-07 | 66 | -722/+722 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #4680 from marc1706/ticket/15055 | Derky | 2018-01-05 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/15055] Add appveyor file to allow running tests on appveyor as well | ||||
| | | * | | | [ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibility | Marc Alexander | 2018-01-01 | 1 | -1/+1 |
| | | | |/ | | |/| | | | | | | | | | PHPBB3-15055 | ||||
| | * | | | [ticket/14972] replace all occurrences of sizeof() with the count() | rxu | 2018-01-01 | 64 | -626/+626 |
| | | | | | | | | | | | | | | | | | PHPBB3-14972 | ||||
| | * | | | [ticket/14972] Fix sizeof calls | rxu | 2018-01-01 | 3 | -95/+95 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of PHP 7.2, only arrays and objects implementing the Countable interface should be passed as a count() or sizeof() parameter. See https://github.com/php/php-src/blob/php-7.2.0alpha2/UPGRADING#L197-L198 Also, sizeof() seems to be sheduled for deprecation, see https://wiki.php.net/rfc/deprecations_php_7_2#suggested_deprecations PHPBB3-14972 | ||||
| * | | | Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into ↵ | Marc Alexander | 2018-01-07 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | prep-release-3.2.2 | ||||
| | * \ \ | Merge pull request #40 from phpbb/ticket/security/211 | Marc Alexander | 2017-12-31 | 2 | -3/+8 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/security/211] Make sure website URL only uses http & https schemes | ||||
| | * | | | | [prep-release-3.1.12] Update version numbers to 3.1.12 | Marc Alexander | 2017-12-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'ticket/security/211' into ticket/security/211-rhea | Marc Alexander | 2018-01-01 | 2 | -3/+8 |
| |\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| | * | | | [ticket/security/211] Do not match javascript URIs with URL regexes | Marc Alexander | 2017-07-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | SECURITY-211 | ||||
| | * | | | [ticket/security/211] Make sure website URL only uses http & https schemes | Marc Alexander | 2017-07-22 | 2 | -1/+6 |
| | |/ / | | | | | | | | | | SECURITY-211 | ||||
| * | | | [3.2.x] Update version number to 3.2.3-dev | Marc Alexander | 2017-12-28 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | [prep-release-3.2.2] Update version to 3.2.2-RC1 | Marc Alexander | 2017-12-28 | 1 | -1/+1 |
| | | | |||||
