aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4495 from senky/ticket/14847Marc Alexander2016-11-121-1/+13
|\
| * [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
* | Merge pull request #4481 from senky/ticket/14819Marc Alexander2016-11-122-1/+36
|\ \
| * | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-132-1/+36
* | | Merge pull request #4472 from dsinn/ticket/14804Marc Alexander2016-11-121-7/+21
|\ \ \
| * \ \ [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-0310-18/+111
| |\ \ \
| * | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| * | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| * | | | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-6/+20
* | | | | Merge pull request #4507 from nickvergessen/ticket-14788Marc Alexander2016-11-121-1/+1
|\ \ \ \ \
| * | | | | [ticket/14788] FarewellJoas Schilling2016-11-121-1/+1
* | | | | | Merge pull request #4506 from lavigor/ticket/14860Marc Alexander2016-11-121-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/14860] Broken link on subscriptions page on mobile deviceslavigor2016-11-081-3/+3
|/ / / / /
* | | | | 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 mergeMarc Alexander2016-10-161-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-062-6/+54
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [ticket/11483] Add tests for generating user act key on force reactivateMarc Alexander2016-11-061-0/+43
| * | | | [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
| |/ / /
* | | | Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-283-33/+24
|\ \ \ \
| * | | | [ticket/14823] Move check_form_key() inside actual save data stepMarc Alexander2016-10-281-5/+5
| * | | | [ticket/14830] Fix FORM_INVALID error on cpf settings changingrxu2016-10-241-1/+1
| * | | | [ticket/14830] Fix testsrxu2016-10-241-14/+10
| * | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-212-7/+7
| * | | | [ticket/14830] Fix ACP search control functional testsrxu2016-10-211-5/+5
| * | | | [ticket/14830] Fix FORM_INVALID error on search backend changingrxu2016-10-211-5/+3
| * | | | [ticket/14830] Fix link hash checking caserxu2016-10-211-1/+1
| * | | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletionrxu2016-10-211-8/+5
* | | | | Merge pull request #4487 from gmixo/patch-2Tristan Darricau2016-10-241-7/+7
|\ \ \ \ \
| * | | | | [ticket/14818] Optimize generate_board_url functionMIkhail Gulyaev2016-10-171-7/+7
* | | | | | Merge pull request #4491 from rxu/ticket/14831Tristan Darricau2016-10-243-15/+181
|\ \ \ \ \ \
| * | | | | | [ticket/14831] Optimize code constructionrxu2016-10-241-5/+3
| * | | | | | [ticket/14831] Add more tests against UCP modulesrxu2016-10-232-1/+99
| * | | | | | [ticket/14831] Add more tests, better name for $e placeholderrxu2016-10-232-10/+61
| * | | | | | [ticket/14831] Do not throw exception on the module existence checkingrxu2016-10-231-7/+27
| * | | | | | [ticket/14831] Fix module migrator toolrxu2016-10-231-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4477 from rxu/ticket/14808Marc Alexander2016-10-242-0/+8
|\ \ \ \ \ \
| * | | | | | [ticket/14808] Add template event overall_header_searchbox_afterrxu2016-10-042-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4490 from kasimi/ticket/14827Marc Alexander2016-10-231-9/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/14827] Possibility to add multiple form keyskasimi2016-10-191-9/+11
* | | | | | Merge pull request #4482 from marc1706/ticket/14821Máté Bartus2016-10-201-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/14821] Simplify regex for converting <strong> tags back to HTMLMarc Alexander2016-10-181-1/+1
| * | | | | [ticket/14821] Replace escaped strong tags with actual tagsMarc Alexander2016-10-141-0/+3
|/ / / / /
* | | | | 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 themTristan Darricau2016-04-191-0/+5
| * | | | | [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] Add test for empty/blank lines in poll optionsDaniel Sinn2016-10-031-0/+16
| * | | | | [ticket/14802] Empty/blank lines should not be additional poll optionsDaniel Sinn2016-09-291-1/+1
| | |_|_|/ | |/| | |