aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12475] Error in db:update console commandNicofuma2014-05-021-1/+1
| | | | PHPBB3-12475
* Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-025-28/+187
|\ | | | | | | | | | | | | * github-bantu/ticket/12473: [ticket/12473] Add console command for database migration. [ticket/12473] Add more compatibility to phpBB Console Application. [ticket/12473] Move compatibility globals out into its own file.
| * [ticket/12473] Add console command for database migration.Andreas Fischer2014-05-022-0/+139
| | | | | | | | PHPBB3-12473
| * [ticket/12473] Add more compatibility to phpBB Console Application.Andreas Fischer2014-05-021-0/+3
| | | | | | | | PHPBB3-12473
| * [ticket/12473] Move compatibility globals out into its own file.Andreas Fischer2014-05-022-28/+45
| | | | | | | | PHPBB3-12473
* | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-021-0/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/12472] Set fast_finish for travis
| * \ Merge remote-tracking branch 'github-nickvergessen/ticket/12472' into ↵Nils Adermann2014-05-021-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12472: [ticket/12472] Set fast_finish for travis
| | * | [ticket/12472] Set fast_finish for travisJoas Schilling2014-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, a build will finish as soon as a job has failed, or when the only jobs left allow failures. http://docs.travis-ci.com/user/build-configuration/#Fast-finishing PHPBB3-12472
* | | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-05-021-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/12120] Add Marc Alexander to AUTHORS
| * | | Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympusMarc Alexander2014-05-021-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * nickvergessen/ticket/12120: [ticket/12120] Add Marc Alexander to AUTHORS
| | * | [ticket/12120] Add Marc Alexander to AUTHORSJoas Schilling2014-05-021-0/+1
| |/ / | | | | | | | | | PHPBB3-12120
* | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-0222-79/+229
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
| * | | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Ensure that dropdown is always at the very left of the containerCesar G2014-04-151-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-154-66/+117
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Break the icons that aren't in loop in case extensions add moreCesar G2014-04-152-0/+12
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Fix modulo logic.Cesar G2014-04-152-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Adjust alignment of AIM and Jabber icons.Cesar G2014-04-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.Cesar G2014-04-151-0/+4
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Add contact icon and remove border from last row & cells.Cesar G2014-04-156-46/+70
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Fix issue with dropdown being restricted by the width of parentCesar G2014-04-152-2/+13
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Remove ugly logic.Cesar G2014-04-153-47/+12
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-1516-66/+149
| | | | | | | | | | | | | | | | PHPBB3-12265
* | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-0225-125/+837
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/feature/sqlite3: [feature/sqlite3] Add sqlite3 database to .gitignore [feature/sqlite3] Use SQLite3 by default [feature/sqlite3] Remove invalid comment [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries [feature/sqlite3] Correctly recreate indexes when recreating a table [feature/sqlite3] Fix sql_index_drop() for sqlite3 [feature/sqlite3] Remove trailing comma from column list [feature/sqlite3] Update docblocks and function visibility [feature/sqlite3] Add support for SQLite 3
| * | | | [feature/sqlite3] Add sqlite3 database to .gitignoreJoas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Use SQLite3 by defaultJoas Schilling2014-05-021-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Remove invalid commentJoas Schilling2014-05-022-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-022-5/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Correctly recreate indexes when recreating a tableJoas Schilling2014-05-021-82/+135
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Fix sql_index_drop() for sqlite3Joas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Remove trailing comma from column listJoas Schilling2014-05-021-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Update docblocks and function visibilityPatrick Webster2014-05-021-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing docblock annotations and added visibility identifiers. PHPBB3-9728
| * | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-0223-55/+690
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0 when support for SQLite 3 was added. PHPBB3-9728
* | | | | Merge remote-tracking branch 'github-marc1706/ticket/12071' into ↵Nils Adermann2014-05-021-1/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12071: [ticket/12071] Add test that covers not available fileinfo [ticket/12071] Get rid of unneeded cast to boolean in tests [ticket/12071] Skip tests that depend on fileinfo and fix expected results
| * | | | | [ticket/12071] Add test that covers not available fileinfomarc17062014-01-031-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newly added test case will also emulate a non-existing fileinfo in order to check if the mimetype guesser is properly working when fileinfo is not available. PHPBB3-12071
| * | | | | [ticket/12071] Get rid of unneeded cast to boolean in testsmarc17062014-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12071
| * | | | | [ticket/12071] Skip tests that depend on fileinfo and fix expected resultsmarc17062014-01-031-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests that depend on fileinfo being enabled will now be skipped to prevent fatal errors while running the test suite. The expected results will be modified to "application/octet-stream" in test_guess_files() if only the extension_guesser is available due to the non-existing extension of those files. PHPBB3-12071
* | | | | | Merge remote-tracking branch 'github-prototech/ticket/11508' into ↵Nils Adermann2014-05-026-62/+393
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/11508: [ticket/11508] Fix build_url test. [ticket/11508] Add functional test for jumpbox. [ticket/11508] Use $phpbb_path_helper. [ticket/11508] Allow equal sign in parameter value. [ticket/11508] Remove unnecessary implode. [ticket/11508] Remove unnecessary isset check. [ticket/11508] Fix build_url test. [ticket/11508] Curly brace should be on its own line... [ticket/11508] The question mark is expected even if there are no parameters. [ticket/11508] Add tests. [ticket/11508] Do not add the '?' unless there are parameters. [ticket/11508] Change separator parameter to a simple true|false $is_amp. [ticket/11508] Move helper functions to path_helper class. [ticket/11508] Move the stripping param code to separate function as well. [ticket/11508] Build the jumpbox hidden fields using the _form action_ [ticket/11508] Split parts of build_url() into reusable functions.
| * | | | | [ticket/11508] Fix build_url test.Cesar G2014-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Add functional test for jumpbox.Cesar G2014-04-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-222-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Remove unnecessary implode.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Remove unnecessary isset check.Cesar G2014-04-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Fix build_url test.Cesar G2014-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Curly brace should be on its own line...Cesar G2014-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] The question mark is expected even if there are no parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Add tests.Cesar G2014-04-222-1/+214
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Do not add the '?' unless there are parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | | [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-222-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11508