aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3842 from CHItA/ticket/14097Tristan Darricau2015-08-231-3/+10
|\
| * [ticket/14097] Remove auto refresh on install failureMate Bartus2015-08-211-2/+1
| * [ticket/14097] Improve error and failure handling in the installerMate Bartus2015-08-171-2/+10
* | Merge branch '3.1.x'Joas Schilling2015-08-231-0/+31
|\ \
| * | [prep-release-3.1.6] Add migration for 3.1.6-RC1Joas Schilling2015-08-231-0/+31
| * | Merge pull request #3829 from Nicofuma/ticket/14099Joas Schilling2015-08-231-0/+19
| |\ \
| | * | [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | * | [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
* | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #3834 from brunoais/ticket/14104Marc Alexander2015-08-221-0/+4
| |\ \ \
| | * | | [ticket/14104] Fix missing variables from previous commitbrunoais2015-08-151-0/+4
| | |/ /
* | | | Merge branch '3.1.x'Marc Alexander2015-08-201-0/+20
|\ \ \ \ | |/ / /
| * | | [ticket/14037] Minor coding style improvements to eventMarc Alexander2015-08-201-0/+2
| * | | [ticket/14037] Allows adapting memberlist profile fields headlinejaviexin2015-08-201-0/+18
* | | | Merge branch '3.1.x'Andreas Fischer2015-08-202-3/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #3848 from VSEphpbb/ticket/14116Andreas Fischer2015-08-202-3/+3
| |\ \ | | |/ | |/|
| | * [ticket/14116] sql_affectedrows method has no argumentsMatt Friedman2015-08-192-3/+3
* | | Merge branch '3.1.x'Marc Alexander2015-08-131-0/+8
|\ \ \ | |/ /
| * | [ticket/13968] Add core.user_setup_after eventZoddo2015-08-121-0/+8
| |/
* | 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