aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge PR #1201 branch 'develop-olympus' into developOleg Pudeyev2013-01-244-3/+60
|\
| * Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympusOleg Pudeyev2013-01-244-2/+59
| |\
| | * [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| | * [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-233-3/+3
| | * [ticket/11337] Silence nginx config file writing.Andreas Fischer2013-01-231-1/+1
| | * [ticket/11337] php-fpm.conf is no longer owned by root.Andreas Fischer2013-01-231-1/+1
| | * [ticket/11337] Run functional tests on travis using nginx and php-fpm.Andreas Fischer2013-01-234-0/+56
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-231-0/+23
|\ \ | |/
| * Merge remote-tracking branch 'p/ticket/11295' into develop-olympusAndreas Fischer2013-01-231-2/+25
| |\
| | * [ticket/11295] Drop tables rather than database for postgres in test suite.Oleg Pudeyev2012-12-261-2/+25
* | | Merge PR #1203 branch 'bantu/ticket/11338' into developOleg Pudeyev2013-01-232-0/+22
|\ \ \
| * | | [ticket/11338] Travis CI: Install PHP extension for redis key-value store.Andreas Fischer2013-01-232-0/+22
* | | | Merge PR #1202 branch 'bantu/ticket/11338' into developOleg Pudeyev2013-01-222-0/+2
|\ \ \ \ | |/ / /
| * | | [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.Andreas Fischer2013-01-222-0/+2
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-220-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympusAndreas Fischer2013-01-222-0/+9
| |\ \ \
| | * | | [ticket/11323] Backport include_define test to olympus.Oleg Pudeyev2013-01-132-0/+9
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-220-0/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
| |\ \ \
* | \ \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into developNathan Guse2013-01-222-21/+31
|\ \ \ \ \
| * | | | | [ticket/11329] Moving colors to colours.cssVjacheslav Trushkin2013-01-212-21/+31
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11328' into developNathan Guse2013-01-224-8/+19
|\ \ \ \ \ \
| * | | | | | [ticket/11328] Replace long buttons text with short textVjacheslav Trushkin2013-01-163-8/+8
| * | | | | | [ticket/11328] Add language variables for buttonsVjacheslav Trushkin2013-01-161-0/+11
* | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/9492' into developNathan Guse2013-01-225-33/+339
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/9492] Fix missing phpbb_container in unit testsJoas Schilling2013-01-201-1/+8
| * | | | | | [ticket/9492] Fix typo in SQL queryJoas Schilling2013-01-201-1/+1
| * | | | | | [ticket/9492] Ensure to delete the avatar/rank data when we change itJoas Schilling2013-01-171-2/+2
| * | | | | | [ticket/9492] Ensure to update all avatar values when the avatar is changedJoas Schilling2013-01-172-2/+2
| * | | | | | [ticket/9492] Fix undefined user_avatar_* values when updating the group avatarJoas Schilling2013-01-171-11/+17
| * | | | | | [ticket/9492] Add unit tests for custom ranks and avatarsJoas Schilling2013-01-172-0/+270
| * | | | | | [ticket/9492] Retain custom ranks and avatars when setting users default groupJoas Schilling2013-01-171-30/+53
|/ / / / / /
* | | | | | Merge remote-tracking branch 'remotes/DavidIQ/ticket/10786' into developNathan Guse2013-01-164-14/+25
|\ \ \ \ \ \
| * | | | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-152-3/+7
| * | | | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-156-85/+22
| * | | | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-156-19/+89
|/ / / / / /
* | | | | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into developNathan Guse2013-01-151-0/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10431' into developNathan Guse2013-01-156-64/+60
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [ticket/10431] Remove .left class from reply-allVjacheslav Trushkin2013-01-161-1/+1
| * | | | | [ticket/10431] Remove reply-all custom cssVjacheslav Trushkin2013-01-161-14/+0
| * | | | | [ticket/10431] Adjustments for large buttonsVjacheslav Trushkin2013-01-151-33/+34
| * | | | | [ticket/10431] Changed fonts for LinuxVjacheslav Trushkin2012-11-121-1/+1
| * | | | | [ticket/10431] Adjustments for IE7Vjacheslav Trushkin2012-11-121-0/+1
| * | | | | [ticket/10431] Different font for iOSVjacheslav Trushkin2012-11-121-1/+2
| * | | | | [ticket/10431] CSS3 buttonsVjacheslav Trushkin2012-11-114-50/+57
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-1539-267/+21
|\ \ \ \ \ \
| * | | | | | [ticket/11201] Remove database column on updateJoas Schilling2013-01-161-0/+5
| * | | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-1138-267/+16
* | | | | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-1411-51/+80
|\ \ \ \ \ \ \