aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #4494 from JoshyPHP/ticket/14846Máté Bartus2016-11-024-5/+35
|\ \ | | | | | | | | | [ticket/14846] Updated s9e\TextFormatter
| * | [ticket/14846] Updated s9e\TextFormatterJoshyPHP2016-11-024-5/+35
|/ / | | | | | | PHPBB3-14846
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-283-32/+23
|\ \
| * \ Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-283-33/+24
| |\ \ | | | | | | | | | | | | [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 testsrxu2016-10-241-14/+10
| | | | | | | | | | | | | | | | PHPBB3-14830
| | * | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-212-7/+7
| | | | | | | | | | | | | | | | PHPBB3-14830
| | * | [ticket/14830] Fix ACP search control functional testsrxu2016-10-211-5/+5
| | | | | | | | | | | | | | | | 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-243-15/+181
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-243-15/+181
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 against UCP modulesrxu2016-10-232-1/+99
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | [ticket/14831] Add more tests, better name for $e placeholderrxu2016-10-232-10/+61
| | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4482 from marc1706/ticket/14821Máté Bartus2016-10-201-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14821] Replace escaped strong tags with actual tags
| | * | | | [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-123-1/+42
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-10-125-3/+44
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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-023-3/+3
| | | | | |
* | | | | | Merge pull request #4476 from Nicofuma/ticket/14807Marc Alexander2016-10-105-128/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14807] Updates dependencies
| * | | | | | [ticket/14807] s9e/textformatter 0.8.1Tristan Darricau2016-10-102-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | | [ticket/14807] Fix tests after symfony upgradeTristan Darricau2016-10-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | | [ticket/14807] Updates s9e textformatter againTristan Darricau2016-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge pull request #4478 from Nicofuma/ticket/14813Marc Alexander2016-10-091-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | [ticket/14813] Add missing functions_compatibiity in phpbbcli
| * | | | | | [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-032-1/+17
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | * 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