aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-161-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10689' into develop-olympusOleg Pudeyev2012-03-161-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/10689] Fix "First character"-option in "Find a member"-searchJoas Schilling2012-03-121-0/+1
| | |/ /
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10690' into developOleg Pudeyev2012-03-163-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queueJoas Schilling2012-03-143-2/+3
|/ / /
* | | Merge branch 'develop-olympus' into developDavid King2012-03-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'unknownbliss/ticket/10697' into develop-olympusDavid King2012-03-111-0/+2
| |\ \
| | * | [ticket/10697] Updating gitignore to match develop branchMichael Cullum2012-03-111-0/+2
| |/ /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-091-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'p/ticket/7432' into develop-olympusAndreas Fischer2012-03-091-1/+1
| |\ \
| | * | [ticket/7432] Delete redundant reference to "appropriate menu item".Oleg Pudeyev2012-03-071-1/+1
| | * | [ticket/7432] Explain what users are inactive in more detail.Oleg Pudeyev2011-12-231-1/+1
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-092-6/+33
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympusOleg Pudeyev2012-03-092-6/+33
| |\ \ \
| | * | | [ticket/9831] Fix saving unchecked checkbox field valuerxu2012-02-051-0/+8
| | * | | [ticket/9831] Correctly store checkbox default value for boolean CPF.rxu2012-01-182-6/+25
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-091-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympusOleg Pudeyev2012-03-091-1/+6
| |\ \ \ \
| | * | | | [ticket/9084] Explain the logic.Oleg Pudeyev2012-03-091-0/+5
| | * | | | [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not requiredrxu2012-02-101-1/+1
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-086-16/+203
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympusOleg Pudeyev2012-03-086-16/+203
| |\ \ \ \ \
| | * | | | | [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_countAndreas Fischer2012-03-082-2/+2
| | * | | | | [ticket/9813] Only get posts table row count if we detected a fulltext index.Andreas Fischer2012-03-081-1/+1
| | * | | | | [ticket/9813] Also use estimated row count of posts table for fulltext mysql.Andreas Fischer2012-03-051-5/+1