Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| | | |||||
* | | Merge pull request #5045 from senky/ticket/15454 | Marc Alexander | 2017-12-28 | 1 | -2/+30 |
|\ \ | | | | | | | | | | [ticket/15454] Add core.mcp_queue_approve_details_template | ||||
| * | | [ticket/15454] Add post template data to event | Marc Alexander | 2017-12-28 | 1 | -0/+2 |
| | | | | | | | | | | | | PHPBB3-15454 | ||||
| * | | [ticket/15454] Add core.mcp_queue_approve_details_template | Jakub Senko | 2017-11-13 | 1 | -2/+28 |
| | | | | | | | | | | | | PHPBB3-15454 | ||||
* | | | Merge pull request #5044 from hubaishan/ticket/15453 | Marc Alexander | 2017-12-28 | 1 | -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.php | hubaishan | 2017-12-27 | 1 | -2/+15 |
| |/ / | | | | | | | | | | | | | | | | Add core event after language deleted in acp_language.php PHPBB3-15453 | ||||
* | | | Merge pull request #5040 from kasimi/ticket/15446 | Marc Alexander | 2017-12-27 | 1 | -0/+26 |
|\ \ \ | | | | | | | | | | | | | [ticket/15446] Add event core.acp_profile_action | ||||
| * | | | [ticket/15446] Add event core.acp_profile_action | kasimi | 2017-11-08 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | PHPBB3-15446 | ||||
* | | | | Merge pull request #5041 from kasimi/ticket/15447 | Marc Alexander | 2017-12-27 | 1 | -2/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/15447] Add event core.acp_profile_modify_profile_row | ||||
| * | | | | [ticket/15447] Add event core.acp_profile_modify_profile_row | kasimi | 2017-11-08 | 1 | -2/+21 |
| |/ / / | | | | | | | | | | | | | PHPBB3-15447 | ||||
* | | | | Merge pull request #5055 from dsinn/ticket/15471 | Marc Alexander | 2017-12-27 | 2 | -5/+39 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/15471] Add core events to ACP when pruning a forum | ||||
| * | | | | [ticket/15471] Fix event documentation for core.prune_forums_settings_confirm | Daniel Sinn | 2017-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-15471 | ||||
| * | | | | [ticket/15471] Add core events to ACP when pruning a forum | Daniel Sinn | 2017-11-30 | 2 | -5/+39 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-15471 | ||||
* | | | | | Merge pull request #5064 from rxu/ticket/15486 | Marc Alexander | 2017-12-27 | 1 | -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 data | rxu | 2017-12-19 | 1 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, fix some typos in two other events docblocks. PHPBB3-15486 | ||||
* | | | | | | Merge pull request #5061 from marc1706/ticket/15322 | Derky | 2017-12-27 | 3 | -11/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15322] Add config for envelope sender & remove mail function setting | ||||
| * | | | | | | [ticket/15322] Adjust email language and move force sender setting | Marc Alexander | 2017-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15322 | ||||
| * | | | | | | [ticket/15322] Try to make new email setting more readable | Marc Alexander | 2017-12-13 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15322 | ||||
| * | | | | | | [ticket/15322] Add config setting for -f parameter & remove mail function name | Marc Alexander | 2017-12-11 | 3 | -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 emails | kitsiosk | 2017-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15322 | ||||
* | | | | | | | Merge pull request #4868 from javiexin/ticket/15266 | Marc Alexander | 2017-12-27 | 2 | -3/+9 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | [ticket/15266] Fix events in content_visibility | ||||
| * | | | | | | [ticket/15266] Expand functionality of content_visibility | javiexin | 2017-12-27 | 2 | -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/15440 | Derky | 2017-12-17 | 1 | -5/+27 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | [ticket/15440] Added core.ucp_register_agreement_modify_template_data | ||||
| * | | | | | | [ticket/15440] State deprecated version for core.ucp_register_agreement | Derky | 2017-12-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15440 | ||||
| * | | | | | | [ticket/15440] Added core.ucp_register_agreement_modify_template_data | kasimi | 2017-12-17 | 1 | -5/+27 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | PHPBB3-15440 | ||||
* | | | | | | Merge pull request #5022 from kasimi/ticket/15431 | Derky | 2017-12-03 | 1 | -6/+31 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | [ticket/15431] Add event core.ucp_register_modify_template_data | ||||
| * | | | | | [ticket/15431] Moved phpbb_timezone_select() before the event | kasimi | 2017-12-03 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15431 | ||||
| * | | | | | [ticket/15431] Split up $template_vars | kasimi | 2017-12-03 | 1 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15431 | ||||
| * | | | | | [ticket/15431] Removed $page_title | kasimi | 2017-11-29 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15431 | ||||
| * | | | | | [ticket/15431] Fixed event argument description | kasimi | 2017-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15431 | ||||
| * | | | | | [ticket/15431] Add event core.ucp_register_modify_template_data | kasimi | 2017-10-31 | 1 | -7/+34 |
| |/ / / / | | | | | | | | | | | | | | | | PHPBB3-15431 | ||||
* | | | | | [ticket/15460] Fix group name displayed in the manage users ACP module | rxu | 2017-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-15460 | ||||
* | | | | | Merge pull request #4976 from rubencm/ticket/15171 | Marc Alexander | 2017-11-16 | 1 | -11/+11 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | [ticket/15171] Replace all BBCode templates by default | ||||
| * | | | | [ticket/15171] Fix test | Rubén Calvo | 2017-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-15171 | ||||
| * | | | | [ticket/15171] Replace all BBCode templates by default | Rubén Calvo | 2017-10-31 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-15171 |