aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-08-101-1/+1
|\
| * Merge pull request #3811 from marcovo/ticket/14069Andreas Fischer2015-08-101-1/+1
| |\
| | * [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migrationMarco Kubuntu2015-08-051-1/+1
* | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+4
|\ \ \ | |/ /
| * | Merge pull request #3822 from brunoais/ticket/14083Marc Alexander2015-08-091-0/+4
| |\ \
| | * | [ticket/14083] Fix wrong variables from previous commitbrunoais2015-08-081-0/+4
* | | | Merge branch '3.1.x'Marc Alexander2015-08-091-5/+7
|\ \ \ \ | |/ / /
| * | | [ticket/14082] Fix wrong variables from previous commitbrunoais2015-08-081-5/+7
| |/ /
* | | Merge branch '3.1.x'Marc Alexander2015-08-081-7/+67
|\ \ \ | |/ /
| * | Merge pull request #3738 from javiexin/ticket/13981Marc Alexander2015-08-081-7/+67
| |\ \ | | |/ | |/|
| | * [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-241-3/+3
| | * [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-171-1/+1
| | * [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-171-6/+10
| | * [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-091-0/+10
| | * [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-031-6/+52
* | | [ticket/14079] Correctly mark notifications as readTristan Darricau2015-08-083-10/+17
* | | [ticket/14076] Fix notification settingsTristan Darricau2015-08-071-5/+5
* | | Merge remote-tracking branch 'Nicofuma/ticket/12692'Marc Alexander2015-08-073-0/+454
|\ \ \
| * | | [ticket/12692] Fix tests and update styleTristan Darricau2015-08-063-46/+86
| * | | [ticket/12692] Cleanup language fileTristan Darricau2015-07-093-8/+8
| * | | [ticket/12692] Fix languages filesTristan Darricau2015-07-092-4/+2
| * | | [ticket/12692] Add outputTristan Darricau2015-07-093-0/+63
| * | | [ticket/12692] Move the language strings to cli.phpTristan Darricau2015-07-093-32/+17
| * | | [ticket/12692] Update the database regularlyTristan Darricau2015-07-092-8/+42
| * | | [ticket/12692] Cast the ids to intTristan Darricau2015-07-091-1/+1
| * | | [ticket/12692] Remove a not and swap the blocks in the corresponding ifTristan Darricau2015-07-091-4/+4
| * | | [ticket/12692] Update commentsTristan Darricau2015-07-091-1/+1
| * | | [ticket/12692] Fix coding styleTristan Darricau2015-07-092-2/+2
| * | | [ticket/12692] Use strict comparison in thumbnail:recreateTristan Darricau2015-07-091-1/+1
| * | | [ticket/12692] Use !empty() instead of sizeof()Tristan Darricau2015-07-092-2/+2
| * | | [ticket/12692] Update doc blocksTristan Darricau2015-07-093-1/+7
| * | | [ticket/12692] Add a console command to manage the thumbnailsTristan Darricau2015-07-093-0/+328
* | | | Merge branch '3.1.x'Andreas Fischer2015-08-051-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/13711] Notifications are sent to inactive usersRMcGirr832015-07-271-1/+1
* | | | Merge pull request #3698 from s9e/ticket/13935Tristan Darricau2015-08-052-1/+42
|\ \ \ \
| * | | | [ticket/13935] Allow more admin-configurable schemes in post linksJoshyPHP2015-07-152-1/+42
* | | | | [ticket/14056] Fix remaining schema pathMate Bartus2015-07-291-1/+1
* | | | | [ticket/14056] Keep install schema resources in the install folderMate Bartus2015-07-296-951/+3
* | | | | Merge pull request #3514 from CHItA/ticket/13740Tristan Darricau2015-07-2764-16/+9313
|\ \ \ \ \
| * | | | | [ticket/13740] Reduce number of references in nav providerMate Bartus2015-07-261-6/+12
| * | | | | [ticket/13740] Move handle_language_select calls to the controllersMate Bartus2015-07-263-3/+5
| * | | | | [ticket/13740] Fix infinite config.php check loopMate Bartus2015-07-251-5/+1
| * | | | | [ticket/13740] Move default data settings out of constructorsMate Bartus2015-07-253-263/+251
| * | | | | [ticket/13740] Deduplicate container builder's checksMate Bartus2015-07-251-20/+15
| * | | | | [ticket/13740] Use JSON for installer configMate Bartus2015-07-251-2/+2
| * | | | | [ticket/13740] Fix commentMate Bartus2015-07-251-1/+1
| * | | | | [ticket/13740] Use language service in console applicationMate Bartus2015-07-241-9/+9
| * | | | | [ticket/13740] Fix CSMate Bartus2015-07-242-1/+1
| * | | | | [ticket/13740] Filter basic directory change attempts in lang changeMate Bartus2015-07-241-1/+2
| * | | | | [ticket/13740] Add success message when install finishedMate Bartus2015-07-231-0/+29