aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-253-24/+40
|\
| * [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| * [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-252-23/+35
* | Merge remote-tracking branch 'github-bantu/ticket/9995' into develop-olympusNils Adermann2011-08-251-17/+29
|\ \
| * | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| * | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| * | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
| |/
* | Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympusNils Adermann2011-08-251-0/+9
|\ \ | |/ |/|
| * [ticket/10222] Also build language and styles changes in diff/patch format.Andreas Fischer2011-08-251-0/+9
|/
* Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympusAndreas Fischer2011-08-211-1/+9
|\
| * [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.Joas Schilling2011-08-211-1/+9
* | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusAndreas Fischer2011-08-211-3/+0
|\ \
| * | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| |/
* | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-212-1/+1
|\ \
| * | [ticket/10309] Update .gitignore and move .gitkeep.Oleg Pudeyev2011-08-202-1/+1
* | | Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into develop-...Andreas Fischer2011-08-215-7/+7
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympusOleg Pudeyev2011-08-201-2/+2
| |\ \
| | * | [ticket/9978] Added semicolons to JavaScript in overall_header.Callum Macrae2011-08-201-2/+2
| * | | Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympusNils Adermann2011-08-184-5/+5
| |\ \ \
| | * | | [ticket/8571] Show age as 0 in birthday list when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | * | | [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | * | | [ticket/8571] Also display age on memberlist/viewprofile when age is 0.Andreas Fischer2011-07-202-3/+3
| | |/ /
* | | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-161-4/+7
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | [ticket/10309] Coding guidelines fix.Oleg Pudeyev2011-08-091-1/+1
| * | [ticket/10309] Write unicode data to tests/tmp.Oleg Pudeyev2011-08-071-4/+7
* | | Merge remote-tracking branch 'p/ticket/9976' into develop-olympusAndreas Fischer2011-08-161-3/+11
|\ \ \
| * | | [ticket/9976] Fix link to post when two posts have the same post_time.Joas Schilling2011-07-301-3/+11
* | | | Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympusOleg Pudeyev2011-08-142-11/+107
|\ \ \ \
| * | | | [ticket/9297] Add network to class name of unit tests.Andreas Fischer2011-08-141-1/+1
| * | | | [ticket/9297] Fix typo in localhost.Andreas Fischer2011-08-141-1/+1
| * | | | [ticket/9297] Rename test class to reflect its contents.Oleg Pudeyev2011-08-141-1/+1
| * | | | [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.Oleg Pudeyev2011-08-141-5/+3
| * | | | [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.Oleg Pudeyev2011-08-141-1/+1
| * | | | [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.Oleg Pudeyev2011-08-141-1/+10
| * | | | [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.Oleg Pudeyev2011-08-141-4/+13
| * | | | [ticket/9297] Update copyright year of unit test file.Andreas Fischer2011-08-141-1/+1
| * | | | [ticket/9297] Make EPSV unit tests work without IPv6.Andreas Fischer2011-08-111-10/+9
| * | | | [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.Andreas Fischer2011-08-111-0/+48
| * | | | [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.Andreas Fischer2011-08-111-11/+44
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusOleg Pudeyev2011-08-091-0/+3
|\ \ \ \
| * | | | [ticket/10240] Added code to strip control characters from messages.Callum Macrae2011-08-081-0/+3
* | | | | Merge branch 'ticket/naderman/10313' into develop-olympusNils Adermann2011-08-071-13/+9
|\ \ \ \ \
| * | | | | [ticket/10313] Create a separate build task for slow tests.Nils Adermann2011-08-071-13/+9
|/ / / / /
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10313' into develop-olympusNils Adermann2011-08-071-0/+1
|\ \ \ \ \
| * | | | | [ticket/10313] Include slow unit tests when running build script.Andreas Fischer2011-08-081-0/+1
| | |_|/ / | |/| | |
* | | | | Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympusOleg Pudeyev2011-08-071-1/+1
|\ \ \ \ \
| * | | | | [ticket/10298] Properly close embed tag for QuickTime in subsilver2.Andreas Fischer2011-07-301-1/+1
* | | | | | Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympusOleg Pudeyev2011-08-071-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | [ticket/8937] Keep space characters in front of [code] bbcode contentNils Adermann2011-07-171-0/+7
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympusOleg Pudeyev2011-08-041-1/+1
|\ \ \ \ \