aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12429] Can not insert into more columns than exist.Andreas Fischer2014-05-031-1/+0
* Merge branch 'ticket/12429' into ticket/12429-developAndreas Fischer2014-05-022-89/+374
|\
| * [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.Andreas Fischer2014-05-022-80/+376
* | Merge pull request #2381 from Nicofuma/ticket/12475Andreas Fischer2014-05-021-1/+1
|\ \
| * | [ticket/12475] Error in db:update console commandNicofuma2014-05-021-1/+1
* | | Merge pull request #2380 from Nicofuma/ticket/12474Andreas Fischer2014-05-021-1/+1
|\ \ \ | |/ / |/| |
| * | [ticket/12474] Error messages should be displayed with <error> tagNicofuma2014-05-021-1/+1
|/ /
* | Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-025-28/+187
|\ \
| * | [ticket/12473] Add console command for database migration.Andreas Fischer2014-05-022-0/+139
| * | [ticket/12473] Add more compatibility to phpBB Console Application.Andreas Fischer2014-05-021-0/+3
| * | [ticket/12473] Move compatibility globals out into its own file.Andreas Fischer2014-05-022-28/+45
* | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-021-0/+1
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/12472' into develop...Nils Adermann2014-05-021-0/+1
| |\ \
| | * | [ticket/12472] Set fast_finish for travisJoas Schilling2014-05-021-0/+1
* | | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-05-021-0/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympusMarc Alexander2014-05-021-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/12120] Add Marc Alexander to AUTHORSJoas Schilling2014-05-021-0/+1
| |/ /
* | | Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-asc...Nils Adermann2014-05-0222-79/+229
|\ \ \
| * | | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| * | | [ticket/12265] Ensure that dropdown is always at the very left of the containerCesar G2014-04-151-0/+1
| * | | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-154-66/+117
| * | | [ticket/12265] Break the icons that aren't in loop in case extensions add moreCesar G2014-04-152-0/+12
| * | | [ticket/12265] Fix modulo logic.Cesar G2014-04-152-2/+2
| * | | [ticket/12265] Adjust alignment of AIM and Jabber icons.Cesar G2014-04-151-2/+2
| * | | [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.Cesar G2014-04-151-0/+4
| * | | [ticket/12265] Add contact icon and remove border from last row & cells.Cesar G2014-04-156-46/+70
| * | | [ticket/12265] Fix issue with dropdown being restricted by the width of parentCesar G2014-04-152-2/+13
| * | | [ticket/12265] Remove ugly logic.Cesar G2014-04-153-47/+12
| * | | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-1516-66/+149
* | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into deve...Nils Adermann2014-05-0225-125/+837
|\ \ \ \
| * | | | [feature/sqlite3] Add sqlite3 database to .gitignoreJoas Schilling2014-05-021-1/+1
| * | | | [feature/sqlite3] Use SQLite3 by defaultJoas Schilling2014-05-021-7/+7
| * | | | [feature/sqlite3] Remove invalid commentJoas Schilling2014-05-022-4/+0
| * | | | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-022-5/+3
| * | | | [feature/sqlite3] Correctly recreate indexes when recreating a tableJoas Schilling2014-05-021-82/+135
| * | | | [feature/sqlite3] Fix sql_index_drop() for sqlite3Joas Schilling2014-05-021-1/+1
| * | | | [feature/sqlite3] Remove trailing comma from column listJoas Schilling2014-05-021-1/+6
| * | | | [feature/sqlite3] Update docblocks and function visibilityPatrick Webster2014-05-021-23/+48
| * | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-0223-55/+690
* | | | | Merge remote-tracking branch 'github-marc1706/ticket/12071' into develop-ascr...Nils Adermann2014-05-021-1/+40
|\ \ \ \ \
| * | | | | [ticket/12071] Add test that covers not available fileinfomarc17062014-01-031-2/+22
| * | | | | [ticket/12071] Get rid of unneeded cast to boolean in testsmarc17062014-01-031-1/+1
| * | | | | [ticket/12071] Skip tests that depend on fileinfo and fix expected resultsmarc17062014-01-031-1/+20
* | | | | | Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-asc...Nils Adermann2014-05-026-62/+393
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [ticket/11508] Fix build_url test.Cesar G2014-04-221-2/+2
| * | | | | [ticket/11508] Add functional test for jumpbox.Cesar G2014-04-221-0/+33
| * | | | | [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| * | | | | [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-222-4/+21
| * | | | | [ticket/11508] Remove unnecessary implode.Cesar G2014-04-221-1/+1
| * | | | | [ticket/11508] Remove unnecessary isset check.Cesar G2014-04-221-4/+1