aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/15566] Set category to none if extension don't existrubencm2018-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15566
* | | | | | [3.2.x] Update verions for 3.2.4-devMarc Alexander2018-08-021-1/+1
| | | | | |
* | | | | | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-08-021-1/+1
|\ \ \ \ \ \
| * | | | | | [prep-release-3.2.3] Update version numbers for 3.2.3-RC2Marc Alexander2018-07-301-1/+1
| | | | | | |
* | | | | | | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-301-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | [ticket/15731] Fix language string parametersRubén Calvo2018-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15731
* | | | | | Merge pull request #5253 from senky/ticket/15618Tristan Darricau2018-07-081-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 permissionJakub Senko2018-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15618
* | | | | | | Merge pull request #5277 from ghostal/ticket/15717Tristan Darricau2018-07-081-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 entryAlex Miles2018-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15717
* | | | | | | | Merge pull request #5217 from Zoddo/ticket/15656Tristan Darricau2018-07-081-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 ACPZoddo2018-05-011-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.xTristan Darricau2018-07-081-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/15676Tristan Darricau2018-07-081-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 noticeMarc Alexander2018-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15676
| | * | | | | | [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACYMarc Alexander2018-05-311-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15676
* | | | | | | | [ticket/15695] Fix gen_rand_string returning less characters than expectedRubén Calvo2018-06-181-4/+6
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-15695
* | | | | | | Merge pull request #5245 from rubencm/ticket/15693Marc Alexander2018-06-171-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | [ticket/15693] Fix get_rand_string()
| * | | | | | [ticket/15693] Update tests to reflect changes to gen_rand_string()Marc Alexander2018-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15693
| * | | | | | [ticket/15693] Fix get_rand_string()Rubén Calvo2018-06-151-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-15693
* | | | | | Merge pull request #5218 from senky/ticket/15657Marc Alexander2018-06-171-2/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/15657] Add MCP queue events
| * | | | | [ticket/15657] Add MCP queue eventsJakub Senko2018-05-031-2/+43
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-15657
* | | | | [3.2.x] Update version numbers to 3.2.4-devMarc Alexander2018-03-261-1/+1
|/ / / /
* | | | [prep-release-3.2.3] Update version numbers for 3.2.3-RC1Marc Alexander2018-02-281-1/+1
| |/ / |/| |
* | | Merge pull request #5094 from JoshyPHP/ticket/15518Marc Alexander2018-02-211-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 viewtopicJoshyPHP2018-01-171-0/+1
| | | | | | | | | | | | | | | | PHPBB3-15518
* | | | [ticket/15507] Fix PHP 7.2 warning in functions_messenger.phphubaishan2018-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | By pre assgin `$extra_headers` to array. PHPBB3-15507
* | | | Merge pull request #5100 from senky/ticket/15528Marc Alexander2018-01-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15528] Display style phpBB version
| * | | | [ticket/15528] Display style phpBB versionJakub Senko2018-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15528
* | | | | [ticket/15529] Color groups in ACPJakub Senko2018-01-211-1/+2
|/ / / / | | | | | | | | | | | | PHPBB3-15529
* | | | Merge pull request #5084 from hubaishan/ticket/15510Marc Alexander2018-01-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15510] Link Orphan attachments in ACP General to its page
| * | | | [ticket/15510] Link Orphan attachments in ACP General to its pagehubaishan2018-01-121-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 errorcanonknipser2018-01-201-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | When editing a users signature in acp, a error is thrown. PHPBB3-15513
* | | | 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
* | | | [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-071-1/+1
| | | |
* | | | 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 remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2Marc Alexander2018-01-0766-722/+722
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4680 from marc1706/ticket/15055Derky2018-01-051-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 compatibilityMarc Alexander2018-01-011-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-15055
| * | | | | [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-0164-626/+626
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14972
| * | | | | [ticket/14972] Fix sizeof callsrxu2018-01-013-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 Alexander2018-01-071-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | prep-release-3.2.2
| * | | | Merge pull request #40 from phpbb/ticket/security/211Marc Alexander2017-12-312-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.12Marc Alexander2017-12-311-1/+1
| | | | | |
* | | | | | Merge branch 'ticket/security/211' into ticket/security/211-rheaMarc Alexander2018-01-012-3/+8
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | [ticket/security/211] Do not match javascript URIs with URL regexesMarc Alexander2017-07-261-2/+2
| | | | | | | | | | | | | | | | | | | | SECURITY-211
| * | | | [ticket/security/211] Make sure website URL only uses http & https schemesMarc Alexander2017-07-222-1/+6
| |/ / / | | | | | | | | | | | | SECURITY-211