aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/10354' into develop-olympusIgor Wiedler2011-09-051-2/+3
|\
| * [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
* | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusIgor Wiedler2011-09-053-0/+123
|\ \
| * | [ticket/10240] Added optionset to mock_user in the tests.Callum Macrae2011-08-232-6/+12
| * | [ticket/10240] Fixed copyright year in censor_text_test.php.Callum Macrae2011-08-231-1/+1
| * | [ticket/10240] Fixed censor_text test assetEquals param order.Callum Macrae2011-08-231-1/+1
| * | [ticket/10240] Added censor_text tests for special characters.Callum Macrae2011-08-231-0/+10
| * | [ticket/10240] Added censor_text tests.Callum Macrae2011-08-223-0/+107
* | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-052-0/+57
|\ \ \
| * | | [ticket/10321] Add descriptions to the unit testsJoas Schilling2011-08-211-15/+15
| * | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-212-0/+57
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
|\ \ \ \
| * | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| |/ / /
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
|\ \ \ \
| * | | | [ticket/10334] Require permissions to view the birthday-list on board indexJoas Schilling2011-08-231-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/1...Joas Schilling2011-08-292-4/+4
|\ \ \ \
| * | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346Joas Schilling2011-08-292-0/+77
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-292-0/+77
|/ / /
* | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
|\ \ \
| * | | [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.Joas Schilling2011-07-303-9/+15
* | | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-262-0/+12
|\ \ \ \
| * | | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-242-0/+12
| | |/ / | |/| |
* | | | 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