aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-264-4/+96
|\
| * Merge pull request #2492 from nickvergessen/ticket/12570Andreas Fischer2014-05-264-4/+96
| |\
| | * [ticket/12570] Keep MySQLi proceduralJoas Schilling2014-05-261-2/+2
| | * [ticket/12570] Remove test for affected rows after SELECTJoas Schilling2014-05-261-10/+1
| | * [ticket/12570] Add a test for set_array() and updating with the same valueJoas Schilling2014-05-261-0/+2
| | * [ticket/12570] Fix MySQL affectedrowsJoas Schilling2014-05-261-1/+20
| | * [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWSJoas Schilling2014-05-261-1/+2
| | * [ticket/12570] Add a unit test to show broken sql_affectedrows()Joas Schilling2014-05-261-0/+73
| | * [ticket/12570] Add test for updating a config with the same valueJoas Schilling2014-05-261-2/+8
| |/
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-265-9/+53
|\ \ | |/
| * Merge pull request #2496 from bantu/ticket/12592Joas Schilling2014-05-265-9/+53
| |\
| | * [ticket/12592] Add PHP 5.4 environment using mysql driver.Andreas Fischer2014-05-263-1/+45
| | * [ticket/12592] Rename mysql environment to mysqli.Andreas Fischer2014-05-264-5/+5
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-267-2/+36
|\ \ \ | |/ /
| * | Merge pull request #2429 from Nicofuma/ticket/12074Joas Schilling2014-05-267-2/+36
| |\ \ | | |/ | |/|
| | * [ticket/12074] Update the visibility of the constructorTristan Darricau2014-05-091-1/+1
| | * [ticket/12074] Don't log errorsTristan Darricau2014-05-095-30/+1
| | * [ticket/12074] Managing extensions doesn't produce any log entryTristan Darricau2014-05-097-2/+65
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-7/+56
|\ \ \ | |/ /
| * | Merge pull request #2487 from n-aleha/ticket/12583Joas Schilling2014-05-261-7/+56
| |\ \
| | * | [ticket/12583] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | * | [ticket/12583] Add event core.mcp_warn_post_before/aftern-aleha2014-05-231-5/+50
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-261-7/+52
|\ \ \ \ | |/ / /
| * | | Merge pull request #2488 from n-aleha/ticket/12584Joas Schilling2014-05-261-7/+52
| |\ \ \
| | * | | [ticket/12584] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | * | | [ticket/12584] Add event core.mcp_warn_user_before/aftern-aleha2014-05-251-5/+46
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-262-26/+59
|\ \ \ \ | |/ / /
| * | | Merge pull request #2134 from marcosbc/ticket/12270Joas Schilling2014-05-262-26/+59
| |\ \ \
| | * | | [ticket/12270] Fixed topic counting bug and testsmarcosbc2014-05-241-0/+3
| | * | | [ticket/12270] Fixed tests not workingmarcosbc2014-05-211-6/+11
| | * | | [ticket/12270] No quote notif and double poster notification fixmarcosbc2014-05-101-10/+14
| | * | | [ticket/12270] Fixed testsmarcosbc2014-05-091-2/+1
| | * | | [ticket/12270] Fixed rebase conflictsmarcosbc2014-05-031-21/+14
| | * | | [ticket/12270] Correct confirm approval message for topicsmarcosbc2014-05-031-5/+17
| | * | | [ticket/12270] Correcting to follow phpBB coding standardsmarcosbc2014-05-031-1/+3
| | * | | [ticket/12270] Better structured code and no debug error messagemarcosbc2014-05-031-7/+11
| | * | | [ticket/12270] Correct notifications for posts/topics now workingmarcosbc2014-05-031-10/+14
| | * | | [ticket/12270] Reverted templatesmarcosbc2014-05-032-7/+2
| | * | | [ticket/12270] Correct post&topic approval msg, no template changesmarcosbc2014-05-032-6/+9
| | * | | [ticket/12270] Corrent post and topic approval notification messagemarcosbc2014-05-032-2/+11
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-241-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2458 from prototech/ticket/12543Joas Schilling2014-05-241-2/+2
| |\ \ \ \
| | * | | | [ticket/12543] Only take over ENTER and ESC keys when alert box is active.Cesar G2014-05-131-2/+2
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-241-10/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2199 from Zoddo/ticket/12275Joas Schilling2014-05-241-10/+16
| |\ \ \ \ \
| | * | | | | [ticket/12275] Change if (empty) to if (!isset)Zoddo2014-04-141-1/+1
| | * | | | | [ticket/12275] Fix a bug on the event "core.modify_username_string"Zoddo2014-04-011-10/+16
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-05-245-7/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #2444 from VSEphpbb/ticket/12531Joas Schilling2014-05-245-7/+9
| |\ \ \ \ \ \
| | * | | | | | [ticket/12531] Add some line breaks to really long linesMatt Friedman2014-05-232-4/+7