aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | 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 branch '3.1.x' into 3.2.xMarc Alexander2016-09-242-0/+16
|\ \ \ | |/ /
| * | 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 branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-1/+1
|\ \ \ \ | |/ / /
| * | | 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 branch '3.1.x' into 3.2.xTristan Darricau2016-09-240-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4394 from marc1706/ticket/14484Tristan Darricau2016-09-243-35/+399
| |\ \ \ \
* | \ \ \ \ Merge pull request #4455 from marc1706/ticket/14484-rheaTristan Darricau2016-09-241-10/+132
|\ \ \ \ \ \
| * | | | | | [ticket/14484] Remove duplicate methods and no longer needed callsMarc Alexander2016-09-211-45/+56
| * | | | | | [ticket/14484] Remove invalid code caused by merge conflictMarc Alexander2016-09-181-4/+0
| * | | | | | Merge branch 'ticket/14484' into ticket/14484-rheaMarc Alexander2016-09-181-26/+141
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [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 branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-8/+30
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-4/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4432 from Senky/ticket/14762Marc Alexander2016-09-241-4/+14
| |\ \ \ \ \ \
| | * | | | | | [ticket/14762] Add core event to session.phpJakub Senko2016-09-181-4/+14
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4433 from Senky/ticket/14747Marc Alexander2016-09-241-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | [ticket/14747] Add post_data to core.modify_posting_authJakub Senko2016-09-031-0/+3
| | |/ / / / /
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4460 from marc1706/ticket/14784Marc Alexander2016-09-241-2/+11
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge pull request #4460 from marc1706/ticket/14784Marc Alexander2016-09-241-2/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | [ticket/14784] missing rewrite for lighttpdTobi Schäfer2016-09-241-2/+11
| |/ / / / / /
* | | | | | | Merge pull request #4459 from rxu/ticket/14794Marc Alexander2016-09-231-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibilityrxu2016-09-231-2/+2