aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-02-271-0/+1
|\
| * Merge branch 'ticket/naderman/9984' into develop-olympusNils Adermann2011-02-271-0/+1
| |\
| | * [ticket/9984] Add a phing target that does not create packages.Nils Adermann2011-02-271-0/+1
| |/
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-272-17/+45
|\ \ | |/
| * Merge branch 'task/session-tests' into develop-olympusIgor Wiedler2011-02-272-17/+45
| |\
| | * [task/session-tests] Make result check independent of returned row order.Nils Adermann2011-02-271-3/+4
| | * [task/session-tests] By default the cache check now skips over db server infoNils Adermann2011-02-271-2/+9
| | * [task/session-tests] Correctly display message on session continue test failureNils Adermann2011-02-271-1/+1
| | * [task/session-tests] Make the session id replacement of dataset values clearerNils Adermann2011-02-271-12/+32
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-271-19/+27
|\ \ \ | |/ /
| * | Merge branch 'ticket/bantu/10009' into develop-olympusIgor Wiedler2011-02-271-19/+27
| |\ \ | | |/ | |/|
| | * [ticket/10009] Entries are always posts, update fields accordingly.Andreas Fischer2011-02-211-7/+5
| | * [ticket/10009] Always show 'published' data in feed item statistics.Andreas Fischer2011-02-211-2/+2
| | * [ticket/10009] Make atom:update output unconditional and before atom:publishedKevin Locke2011-02-211-9/+2
| | * [ticket/10009] Send atom:updated whenever possibleKevin Locke2011-02-211-0/+4
| | * [ticket/10009] Differentiate published from updated in Atom feedKevin Locke2011-02-211-14/+27
* | | Merge branch 'ticket/p/8641' into developAndreas Fischer2011-02-261-7/+7
|\ \ \
| * | | [ticket/8641] Added/removed several commas for consistency in acp_board.php.mtrs2011-02-261-7/+7
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-261-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'ticket/nickvergessen/10036' into develop-olympusAndreas Fischer2011-02-261-1/+1
| |\ \
| | * | [ticket/10036] Use image from configuration file for displaying online-status.Joas Schilling2011-02-241-1/+1
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-261-6/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/bantu/9912' into develop-olympusOleg Pudeyev2011-02-261-6/+7
| |\ \ \
| | * | | [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.Andreas Fischer2011-02-251-6/+7
| |/ / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-251-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/igorw/10060' into develop-olympusAndreas Fischer2011-02-251-1/+1
| |\ \ \
| | * | | [ticket/10060] Fix test suite under MySQLIgor Wiedler2011-02-251-1/+1
| |/ / /
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-247-56/+22
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/callumacrae/7834' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \ \
| | * | | [ticket/7834] Topic time didn't update when first post was deletedCallum Macrae2011-02-241-2/+2
| * | | | Merge branch 'ticket/callumacrae/9872' into develop-olympusOleg Pudeyev2011-02-241-38/+0
| |\ \ \ \
| | * | | | [ticket/9872] Removed some useless code that broke delete_postsCallum Macrae2011-02-241-38/+0
| | |/ / /
| * | | | Merge branch 'ticket/callumacrae/9997' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \ \ \
| | * | | | [ticket/9997] Fixed an inconsistency in the Moderator Control PanelCallum Macrae2011-02-241-2/+2
| | |/ / /
| * | | | Merge branch 'ticket/nickvergessen/9874' into develop-olympusOleg Pudeyev2011-02-244-14/+18
| |\ \ \ \
| | * | | | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-254-14/+18
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-241-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/p/10058' into develop-olympusIgor Wiedler2011-02-241-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.Oleg Pudeyev2011-02-241-0/+1
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-243-1/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/p/10041' into develop-olympusAndreas Fischer2011-02-241-0/+12
| |\ \ \ \
| | * | | | [ticket/10041] Use send_status_line more in download/file.phpOleg Pudeyev2011-02-231-0/+12
| * | | | | Merge branch 'ticket/p/10056' into develop-olympusAndreas Fischer2011-02-241-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/10056] Corrected a typo in Firebird name.Oleg Pudeyev2011-02-231-1/+1
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-2310-10/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/erikfrerejean/7778' into develop-olympusOleg Pudeyev2011-02-2310-10/+20
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/7778] Update all the schema filesErik Frèrejean2011-02-235-5/+5
| | * | | [ticket/7778] Add the column change to `mysql_upgrader.php`Erik Frèrejean2011-02-231-1/+1
| | * | | [ticket/7778] BBCode single limitErik Frèrejean2011-02-234-4/+14
| |/ / /
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-02-246-78/+274
|\ \ \ \ | |/ / /