aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [prep-release-3.2.1] Add changelog since 3.2.0Marc Alexander2017-06-251-0/+108
* [prep-release-3.2.1] Add migration for 3.2.1-RC1Marc Alexander2017-06-251-0/+39
* [prep-release-3.2.1] Update version numbers for 3.2.1-RC1Marc Alexander2017-06-256-7/+7
* Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-06-253-1/+189
|\
| * [prep-release-3.1.11] Update changelogMarc Alexander2017-06-251-0/+1
| * Merge branch '3.1.x' into prep-release-3.1.11Marc Alexander2017-06-252-9/+50
| |\
| * | [prep-release-3.1.11] Update changelog for 3.1.11-RC1Marc Alexander2017-06-251-0/+144
| * | [prep-release-3.1.11] Add migration for update to 3.1.11-RC1Marc Alexander2017-06-251-0/+43
| * | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1Marc Alexander2017-06-256-10/+10
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-252-9/+50
|\ \ \ | | |/ | |/|
| * | Merge pull request #4804 from rxu/ticket/15186Marc Alexander2017-06-252-9/+50
| |\ \ | | |/ | |/|
| | * [ticket/15186] Fully implement the force_delete_allowed featurerxu2017-04-192-9/+50
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-17/+30
|\ \ \ | |/ /
| * | Merge pull request #4860 from marc1706/ticket/14982Marc Alexander2017-06-251-17/+30
| |\ \
| | * | [ticket/14982] Always do a ban check except on contact me formDavid Colón2017-06-251-17/+30
| |/ /
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-8/+3
|\ \ \ | |/ /
| * | Merge pull request #4852 from javiexin/ticket/15248Marc Alexander2017-06-251-8/+3
| |\ \
| | * | [ticket/15248] Make use of event parameters of core.modify_posting_authjaviexin2017-06-191-8/+3
* | | | Merge pull request #4858 from marc1706/ticket/15251Marc Alexander2017-06-251-3/+3
|\ \ \ \
| * | | | [ticket/15251] Use dispatcher_interface in help managerAgris2017-06-251-3/+3
|/ / / /
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-1/+15
|\ \ \ \ | |/ / /
| * | | Merge pull request #4855 from dsinn/ticket/15250Marc Alexander2017-06-251-1/+15
| |\ \ \
| | * | | [ticket/15250] Add core event to MCP at the end of merge_postsDaniel Sinn2017-06-201-1/+15
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-252-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4850 from rxu/ticket/15246Marc Alexander2017-06-252-4/+4
| |\ \ \ \
| | * | | | [ticket/15246] Allow use of Unix socket as memcache(d) hostrxu2017-06-172-4/+4
| | |/ / /
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-250-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4842 from rxu/ticket/15238-3.1Marc Alexander2017-06-253-0/+145
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/15238] Add missing protected keywordrxu2017-06-201-1/+1
| | * | | [ticket/15238] More code cleanuprxu2017-06-181-1/+2
| | * | | [ticket/15238] Code cleanup, add docblocksrxu2017-06-181-11/+39
| | * | | [ticket/15238] Add console command to fix forums/modules left/right IDsrxu2017-06-183-0/+116
| |/ / /
* | | | Merge pull request #4843 from rxu/ticket/15238Marc Alexander2017-06-253-0/+148
|\ \ \ \
| * | | | [ticket/15238] Add missing protected keywordrxu2017-06-201-1/+1
| * | | | [ticket/15238] More code cleanuprxu2017-06-181-1/+2
| * | | | [ticket/15238] Code cleanup, add docblocksrxu2017-06-181-11/+39
| * | | | [ticket/15238] Add console command to fix forums/modules left/right IDsrxu2017-06-183-0/+119
* | | | | Merge pull request #4824 from senky/ticket/15217Marc Alexander2017-06-251-3/+28
|\ \ \ \ \
| * | | | | [ticket/15217] Add core.user_format_date_override eventJakub Senko2017-06-051-3/+28
* | | | | | Merge pull request #4794 from lr94/ticket/15176Marc Alexander2017-06-245-3/+44
|\ \ \ \ \ \
| * | | | | | [ticket/15176] Add setting for user activity display limit.lr942017-04-165-3/+44
* | | | | | | Merge pull request #4856 from rxu/ticket/15252Marc Alexander2017-06-241-0/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ticket/15252] Fix editing a topic with poll by user not permitted to edit pollrxu2017-06-211-0/+5
|/ / / / / /
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-162-0/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4845 from javiexin/ticket/15241Marc Alexander2017-06-162-0/+8
| |\ \ \ \ \
| | * | | | | [ticket/15241] Add ACP template event acp_profile_contact_lastjaviexin2017-06-052-0/+8
* | | | | | | Merge pull request #4849 from rubencm/ticket/15243Marc Alexander2017-06-162-0/+10
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15243] Check permissions before installing with SQLiteRubén Calvo2017-06-152-0/+10
|/ / / / / / /
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-110-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4797 from marc1706/ticket/15178Marc Alexander2017-06-112-68/+82
| |\ \ \ \ \ \