aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'phpbb/develop' into ticket/11469Andreas Fischer2013-03-278-39/+133
|\
| * Merge remote-tracking branch 'nickvergessen/ticket/11476' into developAndreas Fischer2013-03-271-2/+2
| |\
| | * [ticket/11476] Remove pass-by-reference from sql_mutli_insertJoas Schilling2013-03-271-2/+2
| |/
| * Merge remote-tracking branch 'github-bantu/ticket/11460' into developNils Adermann2013-03-273-10/+130
| |\
| | * [ticket/11460] Add default behaviour tests for notification and email types.Andreas Fischer2013-03-241-2/+12
| | * [ticket/11460] Configure functional test board email using dummy SMTP data.Andreas Fischer2013-03-221-6/+6
| | * [ticket/11460] Add test for whether post_email and topic_email are checked.Andreas Fischer2013-03-221-0/+46
| | * [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.Andreas Fischer2013-03-211-0/+64
| | * [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.Andreas Fischer2013-03-191-4/+4
| * | Merge pull request #1318 from imkingdavid/ticket/11448Nils Adermann2013-03-261-0/+1
| |\ \
| | * | [ticket/11448] Use of $user_id parameter to mark a user's notifications readDavid King2013-03-261-0/+1
| * | | Merge pull request #1319 from imkingdavid/ticket/11466Nils Adermann2013-03-263-27/+0
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/11466] Remove old database driver files from PHPUnit excludeDavid King2013-03-263-27/+0
| |/ /
* | | [ticket/11469] Add example code to class documentation.Andreas Fischer2013-03-271-0/+15
* | | [ticket/11469] Add comment about using sql_multi_insert when not buffering.Andreas Fischer2013-03-251-0/+3
* | | [ticket/11469] Add SQL insert buffer allowing easier handling of multi inserts.Andreas Fischer2013-03-211-0/+111
|/ /
* | Merge PR #1298 branch 'nickvergessen/ticket/11438' into developOleg Pudeyev2013-03-203-70/+41
|\ \
| * | [ticket/11438] Add spaces after # comment start and before \ line breaksJoas Schilling2013-03-163-38/+38
| * | [ticket/11438] Add helpful comments from sample config to ACP outputJoas Schilling2013-03-151-3/+3
| * | [ticket/11438] Add empty sql_query_pre to delta-sourceJoas Schilling2013-03-151-0/+1
| * | [ticket/11438] Move backslash to concatenate the query strings correctlyJoas Schilling2013-03-151-60/+30
| * | [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()Joas Schilling2013-03-151-1/+1
* | | Merge remote-tracking branch 'bantu/ticket/11457' into developJoas Schilling2013-03-181-5/+0
|\ \ \
| * | | [ticket/11457] Remove check and include for set_var function. It's not used.Andreas Fischer2013-03-171-5/+0
| | |/ | |/|
* | | Merge remote-tracking branch 'bantu/ticket/11455' into developJoas Schilling2013-03-181-2/+2
|\ \ \ | |/ / |/| |
| * | [ticket/11455] Restore alphabetic order (underscore first) in config/tables.ymlAndreas Fischer2013-03-171-2/+2
|/ /
* | Merge remote-tracking branch 'nickvergessen/ticket/11443' into developAndreas Fischer2013-03-162-1/+6
|\ \
| * | [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log objectJoas Schilling2013-03-161-1/+6
| * | [ticket/11443] Add _test suffix to migration test filenamesJoas Schilling2013-03-152-0/+0
| |/
* | Merge remote-tracking branch 'bantu/ticket/11441' into developJoas Schilling2013-03-152-49/+63
|\ \
| * | [ticket/11441] Split user loader tests into multiple test methods.Andreas Fischer2013-03-151-2/+9
| * | [ticket/11441] Use setUp() in phpbb_user_loader_test.Andreas Fischer2013-03-151-10/+17
| * | [ticket/11441] Update/correct copyright year of user loader test.Andreas Fischer2013-03-151-1/+1
| * | [ticket/11441] Correct/fix class name of user loader test.Andreas Fischer2013-03-151-1/+1
| * | [ticket/11441] Add _test prefix to user loader test filename.Andreas Fischer2013-03-151-0/+0
* | | Merge remote-tracking branch 'bantu/ticket/11439' into developJoas Schilling2013-03-151-0/+0
|\ \ \ | |/ / |/| |
| * | [ticket/11439] Add _test suffix to notification test filename.Andreas Fischer2013-03-151-0/+0
|/ /
* | Merge remote-tracking branch 'remotes/Marc/ticket/11404' into developNathan Guse2013-03-122-90/+177
|\ \
| * | [ticket/11404] Remove version ID from manager_test.php file headerMarc Alexander2013-03-111-1/+0
| * | [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()Marc Alexander2013-03-111-0/+71
| * | [ticket/11404] Convert manager_test to UNIX line endingsMarc Alexander2013-03-111-90/+90
| * | [ticket/11404] Use a default data row if $row is empty in clean_row()Marc Alexander2013-03-071-10/+16
| * | [ticket/11404] Return empty array of avatar data if $row is emptyMarc Alexander2013-03-061-0/+11
* | | Merge remote-tracking branch 'remotes/Marc/ticket/11433' into developNathan Guse2013-03-121-1/+1
|\ \ \
| * | | [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"Marc Alexander2013-03-121-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'remotes/nickv/ticket/11310' into developNathan Guse2013-03-121-6/+15
|\ \ \ | |/ / |/| |
| * | [ticket/11310] Add hashes to action links to prevent CSRF attacksJoas Schilling2013-03-121-6/+15
|/ /
* | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-095-4/+5
|\ \
| * | [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-174-4/+4
| * | [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1