Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x | Marc Alexander | 2016-11-05 | 3 | -8/+22 |
|\ | |||||
| * | [ticket/14814] Fix reparser cron | Tristan Darricau | 2016-11-02 | 3 | -8/+22 |
| | | | | | | | | PHPBB3-14814 | ||||
* | | Merge pull request #4494 from JoshyPHP/ticket/14846 | Máté Bartus | 2016-11-02 | 4 | -5/+35 |
|\ \ | | | | | | | | | | [ticket/14846] Updated s9e\TextFormatter | ||||
| * | | [ticket/14846] Updated s9e\TextFormatter | JoshyPHP | 2016-11-02 | 4 | -5/+35 |
|/ / | | | | | | | PHPBB3-14846 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-28 | 3 | -32/+23 |
|\ \ | |||||
| * \ | Merge pull request #4489 from rxu/ticket/14830 | Marc Alexander | 2016-10-28 | 3 | -33/+24 |
| |\ \ | | | | | | | | | | | | | [ticket/14830] Fix FORM_INVALID error during some ACP setting operations | ||||
| | * | | [ticket/14823] Move check_form_key() inside actual save data step | Marc Alexander | 2016-10-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-14823 | ||||
| | * | | [ticket/14830] Fix FORM_INVALID error on cpf settings changing | rxu | 2016-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | [ticket/14830] Fix tests | rxu | 2016-10-24 | 1 | -14/+10 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletion | rxu | 2016-10-21 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | [ticket/14830] Fix ACP search control functional tests | rxu | 2016-10-21 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | [ticket/14830] Fix FORM_INVALID error on search backend changing | rxu | 2016-10-21 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | [ticket/14830] Fix link hash checking case | rxu | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion | rxu | 2016-10-21 | 1 | -8/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-10-24 | 1 | -7/+7 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * 3.1.x: [ticket/14818] Optimize generate_board_url function | ||||
| * | | | Merge pull request #4487 from gmixo/patch-2 | Tristan Darricau | 2016-10-24 | 1 | -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 function | MIkhail Gulyaev | 2016-10-17 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | if $config['force_server_vars'] no need to calculate $request | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-10-24 | 3 | -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/14831 | Tristan Darricau | 2016-10-24 | 3 | -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 construction | rxu | 2016-10-24 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831 | ||||
| | * | | | | [ticket/14831] Add more tests against UCP modules | rxu | 2016-10-23 | 2 | -1/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831 | ||||
| | * | | | | [ticket/14831] Add more tests, better name for $e placeholder | rxu | 2016-10-23 | 2 | -10/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831 | ||||
| | * | | | | [ticket/14831] Do not throw exception on the module existence checking | rxu | 2016-10-23 | 1 | -7/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831 | ||||
| | * | | | | [ticket/14831] Fix module migrator tool | rxu | 2016-10-23 | 1 | -4/+3 |
| | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-14831 | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-24 | 2 | -0/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4477 from rxu/ticket/14808 | Marc Alexander | 2016-10-24 | 2 | -0/+8 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14808] Add template event overall_header_searchbox_after | ||||
| | * | | | | [ticket/14808] Add template event overall_header_searchbox_after | rxu | 2016-10-04 | 2 | -0/+8 |
| | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-14808 | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-23 | 1 | -9/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4490 from kasimi/ticket/14827 | Marc Alexander | 2016-10-23 | 1 | -9/+11 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | [ticket/14827] Fix adding multiple form keys | ||||
| | * | | | [ticket/14827] Possibility to add multiple form keys | kasimi | 2016-10-19 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14827 | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Máté Bartus | 2016-10-20 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4482 from marc1706/ticket/14821 | Máté Bartus | 2016-10-20 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14821] Replace escaped strong tags with actual tags | ||||
| | * | | | | [ticket/14821] Simplify regex for converting <strong> tags back to HTML | Marc Alexander | 2016-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14821 | ||||
| | * | | | | [ticket/14821] Replace escaped strong tags with actual tags | Marc Alexander | 2016-10-14 | 1 | -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.x | Marc Alexander | 2016-10-12 | 3 | -1/+42 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'prep-release-3.1.10' into 3.1.x | Marc Alexander | 2016-10-12 | 5 | -3/+44 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Merge pull request #27 from phpbb/ticket/security-196 | Marc Alexander | 2016-10-02 | 1 | -0/+5 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | [ticket/security-196] Escapes the exception messages before displaying them | ||||
| | | * | | | [ticket/security-196] Escapes the exception messages before displaying them | Tristan Darricau | 2016-04-19 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-196 | ||||
| | * | | | | [prep-release-3.1.10] Add 3.1.10 migration | Marc Alexander | 2016-10-02 | 1 | -0/+36 |
| | | | | | | |||||
| | * | | | | [prep-release-3.1.10] Update version numbers for 3.1.10 | Marc Alexander | 2016-10-02 | 3 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #4476 from Nicofuma/ticket/14807 | Marc Alexander | 2016-10-10 | 5 | -128/+142 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14807] Updates dependencies | ||||
| * | | | | | | [ticket/14807] s9e/textformatter 0.8.1 | Tristan Darricau | 2016-10-10 | 2 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807 | ||||
| * | | | | | | [ticket/14807] Fix tests after symfony upgrade | Tristan Darricau | 2016-10-09 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807 | ||||
| * | | | | | | [ticket/14807] Updates s9e textformatter again | Tristan Darricau | 2016-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807 | ||||
| * | | | | | | [ticket/14807] Updates paragonie/random_compat | Tristan Darricau | 2016-10-09 | 2 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807 | ||||
| * | | | | | | [ticket/14807] Updates everything else | Tristan Darricau | 2016-10-02 | 2 | -110/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807 | ||||
| * | | | | | | [ticket/14807] Updates Twig | Tristan Darricau | 2016-10-02 | 2 | -9/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807 | ||||
* | | | | | | | Merge pull request #4478 from Nicofuma/ticket/14813 | Marc Alexander | 2016-10-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | [ticket/14813] Add missing functions_compatibiity in phpbbcli | ||||
| * | | | | | | [ticket/14813] Add missing functions_compatibiity in phpbbcli | Tristan Darricau | 2016-10-09 | 1 | -0/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | PHPBB3-14813 | ||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-10-03 | 2 | -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 |