aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12 from unknownbliss/feature/events-dispatcherIgor Wiedler2012-03-241-0/+2
|\
| * [feature/event-dispatcher] Add composer install to travisMichael Cullum2012-03-241-0/+2
|/
* Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-2323-66/+201
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2012-03-223-37/+59
| |\
| | * 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 branch 'develop-olympus' into developNils Adermann2012-03-221-3/+1
| |\ \ \ | | |/ /
| | * | 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 branch 'develop-olympus' into developNils Adermann2012-03-222-0/+12
| |\ \ \ \ | | |/ / /
| | * | | 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 branch 'ticket/unknownbliss/10719' into developNils Adermann2012-03-224-17/+1
| |\ \ \ \
| | * | | | [ticket/10719] Revert "Skip functional tests on PHP 5.2"Michael Cullum2012-03-224-17/+1
| * | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis-develop2' into ...Nils Adermann2012-03-221-2/+1
| |\ \ \ \ \
| | * | | | | [task/travis-develop2] Update version from 5.3 to 5.3.2Michael Cullum2012-03-221-1/+1
| | * | | | | [task/travis] Dropping support for 5.2 in develop branchMichael Cullum2012-03-221-1/+0
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2012-03-224-0/+92
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | 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 branch 'develop-olympus' into developAndreas Fischer2012-03-221-1/+1
| |\ \ \ \ | | |/ / /
| | * | | 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 'dhruvgoel92/ticket/10704' into developAndreas Fischer2012-03-221-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10704] minor typo in a commentDhruv Goel2012-03-221-1/+1
| * | | | | | Merge remote-tracking branch 'p/task/php54-ascraeus' into developAndreas Fischer2012-03-222-6/+18
| |\ \ \ \ \ \
| | * | | | | | [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.Oleg Pudeyev2012-03-162-6/+18
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-221-1/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2012-03-191-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | 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 branch 'develop-olympus' into developOleg Pudeyev2012-03-163-0/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| | | | |_|/ / | | | |/| | |