aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [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
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/15200] Allow extensions using custom templates for help/faq controllersrxu2017-04-271-1/+5
* | | | | | | | | | | 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-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #4810 from rxu/ticket/15199Marc Alexander2017-06-051-1/+31
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/15199] Add core event to the messenger send() functionrxu2017-04-271-1/+31
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-056-37/+132
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #4784 from rubencm/ticket/15150Marc Alexander2017-06-056-37/+132
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/15150] Remove php4 constructorRubén Calvo2017-04-171-8/+0
| | * | | | | | | | | | | [ticket/15150] Remove empty spaceRubén Calvo2017-04-041-1/+1
| | * | | | | | | | | | | [ticket/15150] Use php5 constructorRubén Calvo2017-04-041-2/+20
| | * | | | | | | | | | | [ticket/15150] Use stream_* functions instead of socket_* functionsRubén Calvo2017-04-041-5/+5
| | * | | | | | | | | | | [ticket/15150] Remove default values for argumentsRubén Calvo2017-04-041-1/+1
| | * | | | | | | | | | | [ticket/15150] Hide errors if function stream_socket_client have been disabledRubén Calvo2017-04-021-1/+1
| | * | | | | | | | | | | [ticket/15150] Hide errors if function stream_socket_client have been disabledRubén Calvo2017-04-021-1/+1
| | * | | | | | | | | | | [ticket/15150] Fix template label tagRubén Calvo2017-03-301-3/+3
| | * | | | | | | | | | | [ticket/15150] Add Jabber SSL context configuration optionsRubén Calvo2017-03-306-31/+116
* | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-053-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #4782 from nomind60s/ticket/14498Marc Alexander2017-06-053-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | [ticket/14498] Don't display 'Who is online' members when permission is Nonomind60s2017-03-293-6/+9