aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-06-251-0/+43
|\
| * [prep-release-3.1.11] Add migration for update to 3.1.11-RC1Marc Alexander2017-06-251-0/+43
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-17/+30
|\ \ | |/
| * [ticket/14982] Always do a ban check except on contact me formDavid Colón2017-06-251-17/+30
* | [ticket/15251] Use dispatcher_interface in help managerAgris2017-06-251-3/+3
* | 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-181-0/+105
| |/
| * Merge pull request #4825 from marc1706/ticket/15219Tristan Darricau2017-06-063-0/+280
| |\
* | \ Merge pull request #4843 from rxu/ticket/15238Marc Alexander2017-06-251-0/+137
|\ \ \
| * | | [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-181-0/+108
* | | | 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-241-0/+36
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/15176] Add setting for user activity display limit.lr942017-04-161-0/+36
* | | | | [ticket/15243] Check permissions before installing with SQLiteRubén Calvo2017-06-151-0/+9
* | | | | Merge pull request #4799 from marc1706/ticket/15179Marc Alexander2017-06-113-3/+12
|\ \ \ \ \
| * | | | | [ticket/15179] Replace spaces with a tabMarc Alexander2017-06-031-1/+1
| * | | | | Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-312-2/+11
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #4826 from marc1706/ticket/15219-rheaTristan Darricau2017-06-063-0/+280
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-06-031-0/+117
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | [ticket/15219] Add console command for updating hashes to bcryptMarc Alexander2017-06-031-0/+117
| * | | | | | | 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-052-0/+163
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/15219] Update hashes to bcrypt with cronMarc Alexander2017-05-052-0/+163
* | | | | | | Merge pull request #4833 from javiexin/ticket/15227Marc Alexander2017-06-052-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15227] Remove STRIP, as always falsejaviexin2017-05-212-2/+2
* | | | | | | | Merge pull request #4811 from rxu/ticket/15200Marc Alexander2017-06-051-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/15200] Allow extensions using custom templates for help/faq controllersrxu2017-04-271-1/+5
| |/ / / / / / /
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-051-0/+32
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #4784 from rubencm/ticket/15150Marc Alexander2017-06-051-0/+32
| |\ \ \ \ \ \
| | * | | | | | [ticket/15150] Add Jabber SSL context configuration optionsRubén Calvo2017-03-301-0/+32
* | | | | | | | Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.xMarc Alexander2017-05-293-0/+126
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '3.2.x' into ticket/15068javiexin2017-03-09428-6852/+41420
| |\ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-03-092-4/+20
| * | | | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-02-053-0/+110
* | | | | | | | | | [ticket/14992] Add temp index migration for removing duplicatesDavid Colón2017-05-254-3/+54
* | | | | | | | | | Merge pull request #4701 from DavidIQ/ticket/14992Marc Alexander2017-05-257-13/+335
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/14992] Reduce notification table col sizesDavid Colón2017-05-252-1/+49
| * | | | | | | | | | [ticket/14992] 'method' is needed for the unique indexDavid Colón2017-05-241-1/+1
| * | | | | | | | | | [ticket/14992] Remove temp index migrationDavid Colón2017-05-233-52/+1
| * | | | | | | | | | [ticket/14992] Make unit tests run more verboseMarc Alexander2017-05-212-2/+2