aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #4467 from Senky/ticket/14786Tristan Darricau2016-10-023-0/+20
|\ \ \ \ \
| * | | | | [ticket/14786] Add mcp_forum_actions_before/after eventsJakub Senko2016-09-263-0/+20
| | |_|_|/ | |/| | |
* | | | | 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_parametersrxu2016-09-291-0/+3
| |/ / / /
* | | | | Merge pull request #4470 from rxu/ticket/14801Tristan Darricau2016-10-021-3/+3
|\ \ \ \ \
| * | | | | [ticket/14801] Highlighting utf8 strings in search resultsrxu2016-09-291-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4474 from marc1706/ticket/14789Tristan Darricau2016-10-023-13/+29
| |\ \ \ \
| | * | | | [ticket/14789] Remove obsolete check_form_key() and add missing hashesMarc Alexander2016-09-302-7/+8
| | * | | | [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
* | | | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-021-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4475 from marc1706/ticket/14805Tristan Darricau2016-10-022-2/+48
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/14805] Ignore platform requirements while building packagesMarc Alexander2016-10-011-2/+2
* | | | | | Merge pull request #4466 from Senky/ticket/14795Marc Alexander2016-10-011-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/14795] Merge topic views when merging topicsJakub Senko2016-09-251-0/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #4465 from Senky/ticket/8301Marc Alexander2016-10-011-0/+46
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/8301] Add log_time indexJakub Senko2016-09-251-0/+46
| |/ / /
* | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-09-281-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #4468 from markshawtoronto/ticket/14799Tristan Darricau2016-09-284-3/+4
| |\ \
| | * | [ticket/14799] purge_notifications() should not leave open transactions.markshawtoronto2016-09-271-0/+1
| |/ / |/| |
* | | [3.1.x] Increase version for 3.1.11 developmentMarc Alexander2016-09-243-3/+3
* | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-09-248-9/+127
|\ \ \ | |/ /
| * | [prep-release-3.1.10] Add changelog for 3.1.10-RC1Marc Alexander2016-09-241-1/+83
| * | [prep-release-3.1.10] Add migration for 3.1.10-RC1Marc Alexander2016-09-241-0/+36
| * | [prep-release-3.1.10] Update version to 3.1.10-RC1Marc Alexander2016-09-246-8/+8
|/ /
* | Merge pull request #4461 from marc1706/ticket/14785Marc Alexander2016-09-242-0/+16
|\ \
| * | [ticket/14785] Add template event overall_header_headerbar_after/beforeGerB2016-09-242-0/+16
* | | Merge pull request #4462 from marc1706/ticket/14796Marc Alexander2016-09-241-1/+1
|\ \ \
| * | | [ticket/14796] Use log_table class member instead of table constantForumhulp.com2016-09-241-1/+1
* | | | Merge pull request #4394 from marc1706/ticket/14484Tristan Darricau2016-09-243-35/+399
|\ \ \ \
| * | | | [ticket/14484] Properly enable extensions in UI testsMarc Alexander2016-07-311-9/+18
| * | | | [ticket/14484] Move facebook/webdriver back to tests dir composer.jsonMarc Alexander2016-07-316-47/+87
| * | | | [ticket/14484] Move facebook webdriver to main composer.jsonMarc Alexander2016-07-277-95/+410
* | | | | Merge pull request #3527 from Elsensee/ticket/13709Marc Alexander2016-09-241-8/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/13709] Add fallback for email templates used by extensionsOliver Schramm2016-08-211-8/+30