aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-6/+11
|\ | | | | | | | | | | * 3.1.x: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty
| * Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-061-6/+11
| |\ | | | | | | | | | | | | | | | | | | | | | [ticket/11483] Generate user act key if database entry is empty * github.com:phpbb/phpbb: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty
| | * [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The force reactivation action in the ACP will no longer overwrite the generated activation key in case the key stored in the database is empty. It will also save the generated key back to the database to actually allow the activation by the user. PHPBB3-11483
* | | Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.xMarc Alexander2016-11-053-8/+22
|\ \ \
| * | | [ticket/14814] Fix reparser cronTristan Darricau2016-11-023-8/+22
| | | | | | | | | | | | | | | | PHPBB3-14814
* | | | [ticket/14846] Updated s9e\TextFormatterJoshyPHP2016-11-021-5/+5
| | | | | | | | | | | | | | | | PHPBB3-14846
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-282-18/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-282-19/+14
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14830] Fix FORM_INVALID error during some ACP setting operations
| | * | | [ticket/14823] Move check_form_key() inside actual save data stepMarc Alexander2016-10-281-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14823
| | * | | [ticket/14830] Fix FORM_INVALID error on cpf settings changingrxu2016-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | [ticket/14830] Fix FORM_INVALID error on search backend changingrxu2016-10-211-5/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | [ticket/14830] Fix link hash checking caserxu2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletionrxu2016-10-211-8/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14830
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-241-7/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14818] Optimize generate_board_url function
| * | | | Merge pull request #4487 from gmixo/patch-2Tristan Darricau2016-10-241-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14818] Optimize generate_board_url function * gmixo/patch-2: [ticket/14818] Optimize generate_board_url function
| | * | | | [ticket/14818] Optimize generate_board_url functionMIkhail Gulyaev2016-10-171-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | if $config['force_server_vars'] no need to calculate $request
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-241-10/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14831] Optimize code construction [ticket/14831] Add more tests against UCP modules [ticket/14831] Add more tests, better name for $e placeholder [ticket/14831] Do not throw exception on the module existence checking [ticket/14831] Fix module migrator tool
| * | | | | Merge pull request #4491 from rxu/ticket/14831Tristan Darricau2016-10-241-10/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14831] Fix extension modules installation issues * rxu/ticket/14831: [ticket/14831] Optimize code construction [ticket/14831] Add more tests against UCP modules [ticket/14831] Add more tests, better name for $e placeholder [ticket/14831] Do not throw exception on the module existence checking [ticket/14831] Fix module migrator tool
| | * | | | | [ticket/14831] Optimize code constructionrxu2016-10-241-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | | [ticket/14831] Add more tests, better name for $e placeholderrxu2016-10-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | | [ticket/14831] Do not throw exception on the module existence checkingrxu2016-10-231-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | | [ticket/14831] Fix module migrator toolrxu2016-10-231-4/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14831
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-242-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4477 from rxu/ticket/14808Marc Alexander2016-10-242-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14808] Add template event overall_header_searchbox_after
| | * | | | | [ticket/14808] Add template event overall_header_searchbox_afterrxu2016-10-042-0/+8
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14808
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-231-9/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4490 from kasimi/ticket/14827Marc Alexander2016-10-231-9/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/14827] Fix adding multiple form keys
| | * | | | [ticket/14827] Possibility to add multiple form keyskasimi2016-10-191-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14827
* | | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-10-201-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/14821] Simplify regex for converting <strong> tags back to HTMLMarc Alexander2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14821
| * | | | | [ticket/14821] Replace escaped strong tags with actual tagsMarc Alexander2016-10-141-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything else will still be escaped. This will however add back support for bold text in exception messages. PHPBB3-14821
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-122-0/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-10-124-2/+43
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge pull request #27 from phpbb/ticket/security-196Marc Alexander2016-10-021-0/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/security-196] Escapes the exception messages before displaying them
| | | * | | [ticket/security-196] Escapes the exception messages before displaying themTristan Darricau2016-04-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-196
| | * | | | [prep-release-3.1.10] Add 3.1.10 migrationMarc Alexander2016-10-021-0/+36
| | | | | |
| | * | | | [prep-release-3.1.10] Update version numbers for 3.1.10Marc Alexander2016-10-022-2/+2
| | | | | |
* | | | | | Merge pull request #4476 from Nicofuma/ticket/14807Marc Alexander2016-10-103-125/+141
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14807] Updates dependencies
| * | | | | | [ticket/14807] s9e/textformatter 0.8.1Tristan Darricau2016-10-102-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | | [ticket/14807] Updates paragonie/random_compatTristan Darricau2016-10-092-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | | [ticket/14807] Updates everything elseTristan Darricau2016-10-022-110/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | | [ticket/14807] Updates TwigTristan Darricau2016-10-022-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
* | | | | | | [ticket/14813] Add missing functions_compatibiity in phpbbcliTristan Darricau2016-10-091-0/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | PHPBB3-14813
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | * 3.1.x: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| * | | | Merge pull request #4471 from dsinn/ticket/14802Tristan Darricau2016-10-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14802] Empty/blank lines should not be additional poll options * dsinn/ticket/14802: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| | * | | | [ticket/14802] Empty/blank lines should not be additional poll optionsDaniel Sinn2016-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14802
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-022-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14786] Add mcp_forum_actions_before/after events
| * | | | | Merge pull request #4467 from Senky/ticket/14786Tristan Darricau2016-10-023-0/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14786] Add mcp_forum_actions_before/after events * Senky/ticket/14786: [ticket/14786] Add mcp_forum_actions_before/after events
| | * | | | | [ticket/14786] Add mcp_forum_actions_before/after eventsJakub Senko2016-09-263-0/+20
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-14786