aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-312-1/+9
|\
| * [Ticket/10675] Correct language string ATTACH_DISK_FULLRichard Foote2012-03-311-1/+1
| * [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-192-1/+9
* | Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympusIgor Wiedler2012-03-301-0/+1
|\ \
| * | [feature/event-dispatcher] Adding composer.phar to .gitignore for olympusMichael Cullum2012-03-301-0/+1
* | | Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-ol...David King2012-03-301-0/+1
|\ \ \
| * | | [feature/events-dispatcher] Adding phpBB/vendor to .gitignoreMichael Cullum2012-03-211-0/+1
* | | | Merge branch 'harderthanfire/ticket/10129' into develop-olympusDavid King2012-03-292-10/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> permi...HTF2012-03-242-10/+10
* | | | Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympusOleg Pudeyev2012-03-281-1/+1
|\ \ \ \
| * | | | [ticket/10730] Added label tag around "select" text in post splitting UIJan Schejbal2012-03-291-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympusAndreas Fischer2012-03-291-1/+1
|\ \ \ \
| * | | | [ticket/10708] Check converted passwords for multi-byte charactersRichard Foote2012-03-191-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #664 from imkingdavid/ticket/10732Igor Wiedler2012-03-281-0/+2
|\ \ \ \
| * | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignoreDavid King2012-03-281-0/+2
|/ / / /
* | | | Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympusAndreas Fischer2012-03-261-2/+2
|\ \ \ \
| * | | | [ticket/10694] Adjusting details link to 5.3 announcementMichael Cullum2012-03-101-1/+1
| * | | | [ticket/10694] Update PHP warning to 5.3.2Michael Cullum2012-03-091-1/+1
* | | | | Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympusAndreas Fischer2012-03-242-14/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/10723] Stop Travis running all tests on sqliteMichael Cullum2012-03-232-14/+14
|/ / / /
* | | | Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympusAndreas Fischer2012-03-223-37/+59
|\ \ \ \
| * | | | [ticket/10684] Adjust function and parameter name, minor changes.rxu2012-03-223-9/+9
| * | | | [ticket/10684] Rename function phpbb_get_banned_users_ids() parameterrxu2012-03-121-4/+4
| * | | | [ticket/10684] Remove intval mapping for array keysrxu2012-03-121-1/+1
| * | | | [ticket/10684] Adjust pm_notifications() to handle stale bansrxu2012-03-122-16/+15
| * | | | [ticket/10684] Cast user_id to integerrxu2012-03-111-5/+7
| * | | | [ticket/10684] Refactor $sql_ignore_users array updaterxu2012-03-101-10/+3
| * | | | [ticket/10684] Remove isset() for $sql_ignore_users updaterxu2012-03-091-4/+1
| * | | | [ticket/10684] Fix 2 typos in comment lines.rxu2012-03-092-2/+2
| * | | | [ticket/10684] Send notifications for users with stale bansrxu2012-03-082-17/+48
* | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-o...Nils Adermann2012-03-221-3/+1
|\ \ \ \ \
| * | | | | [task/travis] Refactor php version check for dbunit installMichael Cullum2012-03-221-3/+1
* | | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-o...Nils Adermann2012-03-222-0/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [task/travis] Exclude functional and slow testsMichael Cullum2012-03-222-0/+12
* | | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-o...Nils Adermann2012-03-224-0/+92
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [task/travis] Some more small travis fixesMichael Cullum2012-03-222-7/+1
| * | | | | [task/travis] Rename travis phpunit config filesMichael Cullum2012-03-223-1/+1
| * | | | | [task/travis] Fixing some travis issuesMichael Cullum2012-03-222-3/+3
| * | | | | [task/travis] Add automated testing to readmeMichael Cullum2012-03-221-0/+6
| * | | | | [task/travis] Removing development informationMichael Cullum2012-03-221-2/+3
| * | | | | [task/travis] Adding Travis Continuous Intergration SupportMichael Cullum2012-03-223-0/+91
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympusAndreas Fischer2012-03-221-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/10717] Fix profile field sample in prosilver“s memberlist_view.htmlJoas Schilling2012-03-201-1/+1
* | | | | | | Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympusAndreas Fischer2012-03-221-1/+17
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.Oleg Pudeyev2012-03-151-0/+15
| * | | | | | [task/php54] Refactor error_reporting call slightly.Oleg Pudeyev2012-03-151-1/+2
* | | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10691' into develop-olympusAndreas Fischer2012-03-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ticket/10691] Fixed the speed of creating search indexDhruv Goel2012-03-191-1/+1
|/ / / / / /
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympusOleg Pudeyev2012-03-163-0/+13
|\ \ \ \ \ \
| * | | | | | [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-233-0/+13
| | |/ / / / | |/| | | |