aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge PR #812 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-4/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10565] Add line breaks to query in order to follow coding guidelines. [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
| * | | | | | Merge PR #812 branch 'bantu/ticket/10565' into develop-olympusOleg Pudeyev2012-05-211-4/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10565: [ticket/10565] Add line breaks to query in order to follow coding guidelines. [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
| | * | | | | | [ticket/10565] Add line breaks to query in order to follow coding guidelines.Andreas Fischer2012-05-221-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10565
| | * | | | | | [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clauseAndreas Fischer2012-05-221-2/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10565
* | | | | | | Merge PR #808 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
| * | | | | | Merge PR #808 branch 'bantu/ticket/10898' into develop-olympusOleg Pudeyev2012-05-211-2/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10898: [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
| | * | | | | | [ticket/10898] Do not write ?> into config.php to avoid whitespace output.Andreas Fischer2012-05-181-2/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10898
* | | | | | | Merge PR #743 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10094] Purge acm_file cache before phpBB installation.
| * | | | | | Merge PR #743 branch 'bantu/ticket/10094' into develop-olympusOleg Pudeyev2012-05-211-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * bantu/ticket/10094: [ticket/10094] Purge acm_file cache before phpBB installation.
| | * | | | | [ticket/10094] Purge acm_file cache before phpBB installation.Andreas Fischer2012-04-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10094
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-143-54/+202
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user
| * | | | | | Merge branch 'ticket/10605' into develop-olympusAndreas Fischer2012-05-143-55/+203
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10605: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user Conflicts: phpBB/install/database_update.php
| | * | | | | | [ticket/10605] Use database updater function _sql() instead of $db->sql_query()Andreas Fischer2012-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Put end of array on its own line because start of array is too.Andreas Fischer2012-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Add parameter documentation to phpbb_delete_user_pmsJoas Schilling2012-04-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Fix left join usage.Oleg Pudeyev2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this produced broken SQL: SELECT p.msg_id FROM phpbb_privmsgs p LEFT JOIN 0 phpbb_privmsgs_to ON (p.msg_id = t.msg_id) WHERE t.user_id IS NULL LIMIT 500 OFFSET 0 PHPBB3-10605
| | * | | | | | [ticket/10605] Add a section for updating from 3.0.10 to schema updates.Oleg Pudeyev2012-04-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without it data updates do not appear to be run. PHPBB3-10605
| | * | | | | | [ticket/10605] Fix syntax error in database updater.Oleg Pudeyev2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Reset user´s pm count to 0 when deleting his PMsJoas Schilling2012-03-271-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Split query to be able to use indexesJoas Schilling2012-03-271-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Rename $delete_rows to $delete_ids.Andreas Fischer2012-03-271-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Break long comment into multiple lines 80 chars short.Andreas Fischer2012-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Remove unnecessary $delete_ids array.Andreas Fischer2012-03-271-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.Andreas Fischer2012-03-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Remove unused variable declarations.Andreas Fischer2012-03-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Turn $undelivered_user into a real array of counters.Andreas Fischer2012-03-271-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Use unset() instead of checking user_id over and over again.Andreas Fischer2012-03-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Prefix function with phpbb_ and use true instead of 1Joas Schilling2012-03-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Delete orphan private messages on updateJoas Schilling2012-02-271-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10605
| | * | | | | | [ticket/10605] Check for orphan privmsgs when deleting a userJoas Schilling2012-02-182-54/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved the hole code into a new function. PHPBB3-10605
* | | | | | | | Merge remote-tracking branch 'github-hardolaf/ticket/10893' into developNils Adermann2012-05-141-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-hardolaf/ticket/10893: [ticket/10893] Update the usage of Composer
| * | | | | | | | [ticket/10893] Update the usage of ComposerJoseph Warner2012-05-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes 'vendor/.composer/autoload.php' to 'vendor/autoload.php' as per the change in the way that composer works as noted https://groups.google.com/forum/#!msg/composer-dev/fWIs3KocwoA/nU3aLko9LhQJ PHPBB3-10893
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-132-2/+18
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10891] Allow specifying test_config.php path via environment.
| * | | | | | | | Merge remote-tracking branch 'p/ticket/10891' into develop-olympusAndreas Fischer2012-05-132-2/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10891: [ticket/10891] Allow specifying test_config.php path via environment. Conflicts: tests/RUNNING_TESTS.txt
| | * | | | | | | | [ticket/10891] Allow specifying test_config.php path via environment.Oleg Pudeyev2012-05-112-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10891
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-131-9/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10892] Update wiki link to mediawiki. [ticket/10892] Add empty lines for consistency. [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines. [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
| * | | | | | | | Merge remote-tracking branch 'p/ticket/10892' into develop-olympusAndreas Fischer2012-05-131-9/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10892: [ticket/10892] Update wiki link to mediawiki. [ticket/10892] Add empty lines for consistency. [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines. [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
| | * | | | | | | | [ticket/10892] Update wiki link to mediawiki.Oleg Pudeyev2012-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10892
| | * | | | | | | | [ticket/10892] Add empty lines for consistency.Oleg Pudeyev2012-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some headings had empty lines after them, some did not. Add missing empty lines. PHPBB3-10892
| | * | | | | | | | [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.Oleg Pudeyev2012-05-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10892
| | * | | | | | | | [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.Patrick Webster2012-05-111-5/+7
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10892
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-112-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10492] Skip functional tests on PHP 5.2 on travis
| * | | | | | | | Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympusAndreas Fischer2012-05-112-0/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10492: [ticket/10492] Skip functional tests on PHP 5.2 on travis
| | * | | | | | | | [ticket/10492] Skip functional tests on PHP 5.2 on travisNils Adermann2012-05-112-0/+8
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10492
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
| * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10889' into develop-olympusNils Adermann2012-05-111-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10889: [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
| | * | | | | | | | [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.Andreas Fischer2012-05-111-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10889
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-112-45/+100
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10887] Add spaces. [ticket/10887] Split auto increment test from db tools test.
| * | | | | | | | Merge remote-tracking branch 'p/ticket/10887' into develop-olympusAndreas Fischer2012-05-112-45/+100
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10887: [ticket/10887] Add spaces. [ticket/10887] Split auto increment test from db tools test.
| | * | | | | | | [ticket/10887] Add spaces.Oleg Pudeyev2012-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10887