aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4506 from lavigor/ticket/14860Marc Alexander2016-11-121-3/+3
|\ | | | | | | [ticket/14860] Broken link on subscriptions page on mobile devices
| * [ticket/14860] Broken link on subscriptions page on mobile deviceslavigor2016-11-081-3/+3
|/ | | | PHPBB3-14860
* Merge pull request #4485 from marc1706/ticket/14795Tristan Darricau2016-11-061-1/+1
|\ | | | | | | | | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge * github.com:phpbb/phpbb: [ticket/14795] Use maximum topic views instead of adding up views in merge
| * [ticket/14795] Use maximum topic views instead of adding up views in mergeMarc Alexander2016-10-161-1/+1
| | | | | | | | | | | | | | Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795
* | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-062-6/+54
|\ \ | | | | | | | | | | | | | | | | | | | | | [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] Add tests for generating user act key on force reactivateMarc Alexander2016-11-061-0/+43
| | | | | | | | | | | | PHPBB3-11483
| * | [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 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 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 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 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 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 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 '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 #4471 from dsinn/ticket/14802Tristan Darricau2016-10-032-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add test for empty/blank lines in poll optionsDaniel Sinn2016-10-031-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-14802
| * | | | [ticket/14802] Empty/blank lines should not be additional poll optionsDaniel Sinn2016-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14802
* | | | | 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
* | | | | Merge pull request #4469 from rxu/ticket/14787-2Tristan Darricau2016-10-021-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters * rxu/ticket/14787-2: [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
| * | | | | [ticket/14787] Add 1 more parameter to the core.search_modify_url_parametersrxu2016-09-291-0/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14787
* | | | | Merge pull request #4470 from rxu/ticket/14801Tristan Darricau2016-10-021-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14801] Highlighting utf8 strings in search results * rxu/ticket/14801: [ticket/14801] Highlighting utf8 strings in search results
| * | | | | [ticket/14801] Highlighting utf8 strings in search resultsrxu2016-09-291-3/+3
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-14801
* | | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * prep-release-3.1.10: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| * | | | Merge pull request #4474 from marc1706/ticket/14789Tristan Darricau2016-10-023-13/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14789] Move form key checks to where they actually do something * marc1706/ticket/14789: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| | * | | | [ticket/14789] Remove obsolete check_form_key() and add missing hashesMarc Alexander2016-09-302-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14789
| | * | | | [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14789
* | | | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-021-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * prep-release-3.1.10: [ticket/14805] Ignore platform requirements while building packages