aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge PR #808 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-2/+0
|\
| * Merge PR #808 branch 'bantu/ticket/10898' into develop-olympusOleg Pudeyev2012-05-211-2/+0
| |\
| | * [ticket/10898] Do not write ?> into config.php to avoid whitespace output.Andreas Fischer2012-05-181-2/+0
* | | Merge PR #743 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-1/+3
|\ \ \ | |/ /
| * | Merge PR #743 branch 'bantu/ticket/10094' into develop-olympusOleg Pudeyev2012-05-211-1/+3
| |\ \ | | |/ | |/|
| | * [ticket/10094] Purge acm_file cache before phpBB installation.Andreas Fischer2012-04-131-1/+3
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-143-54/+202
|\ \ \ | |/ /
| * | Merge branch 'ticket/10605' into develop-olympusAndreas Fischer2012-05-143-55/+203
| |\ \
| | * | [ticket/10605] Use database updater function _sql() instead of $db->sql_query()Andreas Fischer2012-05-141-1/+1
| | * | [ticket/10605] Put end of array on its own line because start of array is too.Andreas Fischer2012-05-141-1/+2
| | * | [ticket/10605] Add parameter documentation to phpbb_delete_user_pmsJoas Schilling2012-04-131-0/+4
| | * | [ticket/10605] Fix left join usage.Oleg Pudeyev2012-04-051-1/+1
| | * | [ticket/10605] Add a section for updating from 3.0.10 to schema updates.Oleg Pudeyev2012-04-051-0/+2
| | * | [ticket/10605] Fix syntax error in database updater.Oleg Pudeyev2012-04-051-1/+1
| | * | [ticket/10605] Reset user“s pm count to 0 when deleting his PMsJoas Schilling2012-03-271-1/+11
| | * | [ticket/10605] Split query to be able to use indexesJoas Schilling2012-03-271-3/+31
| | * | [ticket/10605] Rename $delete_rows to $delete_ids.Andreas Fischer2012-03-271-9/+9
| | * | [ticket/10605] Break long comment into multiple lines 80 chars short.Andreas Fischer2012-03-271-1/+2
| | * | [ticket/10605] Remove unnecessary $delete_ids array.Andreas Fischer2012-03-271-5/+3
| | * | [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.Andreas Fischer2012-03-271-3/+3
| | * | [ticket/10605] Remove unused variable declarations.Andreas Fischer2012-03-271-1/+0
| | * | [ticket/10605] Turn $undelivered_user into a real array of counters.Andreas Fischer2012-03-271-4/+12
| | * | [ticket/10605] Use unset() instead of checking user_id over and over again.Andreas Fischer2012-03-271-5/+1
| | * | [ticket/10605] Prefix function with phpbb_ and use true instead of 1Joas Schilling2012-03-122-4/+4
| | * | [ticket/10605] Delete orphan private messages on updateJoas Schilling2012-02-271-0/+42
| | * | [ticket/10605] Check for orphan privmsgs when deleting a userJoas Schilling2012-02-182-54/+120
* | | | Merge remote-tracking branch 'github-hardolaf/ticket/10893' into developNils Adermann2012-05-141-3/+3
|\ \ \ \
| * | | | [ticket/10893] Update the usage of ComposerJoseph Warner2012-05-131-3/+3
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-132-2/+18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'p/ticket/10891' into develop-olympusAndreas Fischer2012-05-132-2/+18
| |\ \ \ \
| | * | | | [ticket/10891] Allow specifying test_config.php path via environment.Oleg Pudeyev2012-05-112-2/+18
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-131-9/+13
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch 'p/ticket/10892' into develop-olympusAndreas Fischer2012-05-131-9/+13
| |\ \ \ \
| | * | | | [ticket/10892] Update wiki link to mediawiki.Oleg Pudeyev2012-05-111-1/+1
| | * | | | [ticket/10892] Add empty lines for consistency.Oleg Pudeyev2012-05-111-0/+2
| | * | | | [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.Oleg Pudeyev2012-05-111-3/+3
| | * | | | [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.Patrick Webster2012-05-111-5/+7
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-112-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympusAndreas Fischer2012-05-112-0/+8
| |\ \ \ \
| | * | | | [ticket/10492] Skip functional tests on PHP 5.2 on travisNils Adermann2012-05-112-0/+8
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10889' into develop-olympusNils Adermann2012-05-111-1/+1
| |\ \ \ \
| | * | | | [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.Andreas Fischer2012-05-111-1/+1
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-112-45/+100
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'p/ticket/10887' into develop-olympusAndreas Fischer2012-05-112-45/+100
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/10887] Add spaces.Oleg Pudeyev2012-05-111-1/+1
| | * | | [ticket/10887] Split auto increment test from db tools test.Oleg Pudeyev2012-05-102-45/+100
* | | | | Merge PR #785 branch 'develop-olympus' into developOleg Pudeyev2012-05-113-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge PR #785 branch 'Senky/ticket/10835' into develop-olympusOleg Pudeyev2012-05-113-4/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1