aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
* | | | [3.2.x] Update version number to 3.2.3-devMarc Alexander2017-12-281-1/+1
| |/ / |/| |
* | | [prep-release-3.2.2] Update version to 3.2.2-RC1Marc Alexander2017-12-281-1/+1
| | |
* | | Merge pull request #5045 from senky/ticket/15454Marc Alexander2017-12-281-2/+30
|\ \ \ | | | | | | | | | | | | [ticket/15454] Add core.mcp_queue_approve_details_template
| * | | [ticket/15454] Add post template data to eventMarc Alexander2017-12-281-0/+2
| | | | | | | | | | | | | | | | PHPBB3-15454
| * | | [ticket/15454] Add core.mcp_queue_approve_details_templateJakub Senko2017-11-131-2/+28
| | | | | | | | | | | | | | | | PHPBB3-15454
* | | | Merge pull request #5044 from hubaishan/ticket/15453Marc Alexander2017-12-281-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15453] Add core event after language deleted in acp_language.php
| * | | | [ticket/15453] Add core event after language deleted in acp_language.phphubaishan2017-12-271-2/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | Add core event after language deleted in acp_language.php PHPBB3-15453
* | | | Merge pull request #5040 from kasimi/ticket/15446Marc Alexander2017-12-271-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15446] Add event core.acp_profile_action
| * | | | [ticket/15446] Add event core.acp_profile_actionkasimi2017-11-081-0/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-15446
* | | | | Merge pull request #5041 from kasimi/ticket/15447Marc Alexander2017-12-271-2/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15447] Add event core.acp_profile_modify_profile_row
| * | | | | [ticket/15447] Add event core.acp_profile_modify_profile_rowkasimi2017-11-081-2/+21
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15447
* | | | | Merge pull request #5055 from dsinn/ticket/15471Marc Alexander2017-12-272-5/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15471] Add core events to ACP when pruning a forum
| * | | | | [ticket/15471] Fix event documentation for core.prune_forums_settings_confirmDaniel Sinn2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15471
| * | | | | [ticket/15471] Add core events to ACP when pruning a forumDaniel Sinn2017-11-302-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15471
* | | | | | Merge pull request #5064 from rxu/ticket/15486Marc Alexander2017-12-271-6/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15486] Add core event to the user_add() to modify notifications data
| * | | | | | [ticket/15486] Add core event to the user_add() to modify notifications datarxu2017-12-191-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, fix some typos in two other events docblocks. PHPBB3-15486
* | | | | | | Merge pull request #5061 from marc1706/ticket/15322Derky2017-12-273-11/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15322] Add config for envelope sender & remove mail function setting
| * | | | | | | [ticket/15322] Adjust email language and move force sender settingMarc Alexander2017-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15322
| * | | | | | | [ticket/15322] Try to make new email setting more readableMarc Alexander2017-12-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15322
| * | | | | | | [ticket/15322] Add config setting for -f parameter & remove mail function nameMarc Alexander2017-12-113-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -f parameter can now be added via configuration in the ACP. Addtionally, the config setting for the mail function name has been removed. PHPBB3-15322
| * | | | | | | [ticket/15322] Fix bug wrong return in emailskitsiosk2017-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15322
* | | | | | | | Merge pull request #4868 from javiexin/ticket/15266Marc Alexander2017-12-272-3/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | [ticket/15266] Fix events in content_visibility
| * | | | | | | [ticket/15266] Expand functionality of content_visibilityjaviexin2017-12-272-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new function "is_visible", and replaced several immediate uses of the above, including a single event in the new function to handle change in all places consistently, and much simpler. PHPBB3-15266
* | | | | | | | Merge pull request #5035 from kasimi/ticket/15440Derky2017-12-171-5/+27
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | [ticket/15440] Added core.ucp_register_agreement_modify_template_data