aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4476 from Nicofuma/ticket/14807Marc Alexander2016-10-105-128/+142
|\
| * [ticket/14807] s9e/textformatter 0.8.1Tristan Darricau2016-10-102-6/+5
| * [ticket/14807] Fix tests after symfony upgradeTristan Darricau2016-10-091-2/+0
| * [ticket/14807] Updates s9e textformatter againTristan Darricau2016-10-091-1/+1
| * [ticket/14807] Updates paragonie/random_compatTristan Darricau2016-10-092-14/+14
| * [ticket/14807] Updates everything elseTristan Darricau2016-10-022-110/+118
| * [ticket/14807] Updates TwigTristan Darricau2016-10-022-9/+18
* | Merge pull request #4478 from Nicofuma/ticket/14813Marc Alexander2016-10-091-0/+1
|\ \
| * | [ticket/14813] Add missing functions_compatibiity in phpbbcliTristan Darricau2016-10-091-0/+1
|/ /
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-032-1/+17
|\ \ | |/ |/|
| * 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 branch '3.1.x' into 3.2.xTristan Darricau2016-10-022-0/+16
|\ \ \ | |/ /
| * | 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 branch '3.1.x' into 3.2.xTristan Darricau2016-10-021-0/+3
|\ \ \ \ | |/ / /
| * | | 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 branch '3.1.x' into 3.2.xTristan Darricau2016-10-021-3/+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 '3.1.x' into 3.2.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ | |/ / /
| * | | 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 '3.1.x' into 3.2.xTristan Darricau2016-10-021-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+46
|\ \ \ \ \ | |/ / / /
| * | | | 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 pull request #4473 from rxu/ticket/14799-1Marc Alexander2016-09-301-1/+1
|\ \ \ \
| * | | | [ticket/14799] Remove accidentally added whitespaces into 3.2.x and masterrxu2016-10-011-1/+1
|/ / / /
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-281-0/+2
|\ \ \ \ | |/ / /
| * | | 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
| | |/ | |/|
* | | Merge pull request #4463 from marc1706/ticket/14797Tristan Darricau2016-09-255-7/+6
|\ \ \
| * | | [ticket/14797] Support PHP 7.1 and clearly state support for latest versionsMarc Alexander2016-09-255-7/+6
* | | | Merge pull request #4265 from Senky/ticket/10809Tristan Darricau2016-09-2521-636/+7
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10809] Reflect MSSQL removal in docs filesJakub Senko2016-08-022-3/+3
| * | | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-0219-633/+4
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-242-1/+119
|\ \ \ \ | | |/ / | |/| |
| * | | [3.1.x] Increase version for 3.1.11 developmentMarc Alexander2016-09-243-3/+3