aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-191-2/+3
* [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
* Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-133-16/+218
|\
| * Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-143-13/+217
| |\
| | * [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-123-2/+2
| | * [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | * [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-051-6/+6
| | * [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | * [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | * [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | * [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-051-3/+108
| | * [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | * [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-042-87/+103
| | * [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | * [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | * [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | * [ticket/11162] Clarify that only the two tables actually work.Oleg Pudeyev2012-12-011-0/+2
| | * [ticket/11162] Uncomment transactions.Oleg Pudeyev2012-12-011-2/+2
| | * [ticket/11162] An implementation that actually works.Oleg Pudeyev2012-12-011-5/+68
| | * [ticket/11162] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-021-1/+23
* | | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
* | | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
* | | [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
* | | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
* | | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
* | | [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
* | | [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
|/ /
* | Merge remote-tracking branch 'p/ticket/10205' into develop-olympusAndreas Fischer2012-12-087-76/+253
|\ \
| * | [ticket/10205] Reduce nesting in mysql drivers.Oleg Pudeyev2012-12-042-28/+22
| * | [ticket/10205] Rewrite _sql_error implementations to have a single return.Oleg Pudeyev2012-12-045-20/+34
| * | [ticket/10205] Cosmetic changes.Oleg Pudeyev2012-12-045-8/+8
| * | [ticket/10205] Check for function existence in mssql connect method.Oleg Pudeyev2012-12-041-0/+8
| * | [ticket/10205] Convert mssqlnative driver to the same logic.Oleg Pudeyev2012-12-041-20/+32
| * | [ticket/10205] Fix a parse error in oracle driver.Oleg Pudeyev2012-12-041-1/+1
| * | [ticket/10205] Fix remaining db drivers.Oleg Pudeyev2012-12-045-43/+93
| * | [ticket/10205] Avoid calling mysqli functions when mysqli is missing.Oleg Pudeyev2012-12-041-4/+14
| * | [ticket/10205] Account for potentially missing extensions in dbal.Oleg Pudeyev2012-12-045-4/+93
* | | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
* | | [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
* | | [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
* | | [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-051-0/+30
* | | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
* | | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
|/ /
* | [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-299-13/+13
* | [ticket/11192] Update $value parameter description to support other types.Andreas Fischer2012-11-161-1/+2
* | [ticket/11192] Mark negative byte numbers as unsupported.Andreas Fischer2012-11-161-1/+1
* | [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-111-0/+6
* | Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into develop...Nils Adermann2012-11-091-1/+1
|\ \ | |/ |/|
| * [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]Igor Wiedler2012-11-091-1/+1
* | [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-291-1/+1