aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [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
| | |/
| * | [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
* | | | | [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 #4797 from marc1706/ticket/15178Marc Alexander2017-06-112-68/+82
| |\ \ \ \
| * \ \ \ \ Merge pull request #4825 from marc1706/ticket/15219Tristan Darricau2017-06-067-0/+315
| |\ \ \ \ \
* | | | | | | [ticket/15243] Check permissions before installing with SQLiteRubén Calvo2017-06-152-0/+10
* | | | | | | Merge pull request #4799 from marc1706/ticket/15179Marc Alexander2017-06-115-188/+210
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15179] Replace spaces with a tabMarc Alexander2017-06-031-1/+1
| * | | | | | | Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-314-187/+209
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | [ticket/15178] Run update againMarc Alexander2017-05-311-13/+15
| | * | | | | | [ticket/15178] Update dependencies for 3.1.xMarc Alexander2017-04-172-64/+76
* | | | | | | | Merge pull request #4826 from marc1706/ticket/15219-rheaTristan Darricau2017-06-067-0/+316
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-06-033-0/+132
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | [ticket/15219] Add console command for updating hashes to bcryptMarc Alexander2017-06-033-0/+131
| * | | | | | | | Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-05-051-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | [ticket/15219] Add missing spaceMarc Alexander2017-05-051-1/+1
| * | | | | | | | Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-05-054-0/+184
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | [ticket/15219] Update hashes to bcrypt with cronMarc Alexander2017-05-054-0/+184
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-055-5/+20
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #4840 from rmcgirr83/ticket_15237Marc Alexander2017-06-055-5/+20
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/15237] Fix unguarded includes to functions_userRMcGirr832017-05-245-5/+20
* | | | | | | | | Merge pull request #4833 from javiexin/ticket/15227Marc Alexander2017-06-054-85/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/15227] Remove function deregister_globals, not neededjaviexin2017-05-211-58/+0
| * | | | | | | | | [ticket/15227] Remove STRIP, as always falsejaviexin2017-05-213-7/+3
| * | | | | | | | | [ticket/15227] Check PHP version and remove old unused codejaviexin2017-05-122-26/+10
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-052-2/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4818 from rxu/ticket/15205Marc Alexander2017-06-053-2/+18
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/15205] Add template events prepending/appending subforum linkrxu2017-05-013-2/+18
| * | | | | | | | | | Merge pull request #4812 from rxu/ticket/15200-3.1.xMarc Alexander2017-06-051-1/+5
| |\ \ \ \ \ \ \ \ \ \