aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/10354' into develop-olympusIgor Wiedler2011-09-051-2/+3
|\ | | | | | | | | * p/ticket/10354: [ticket/10354] Include cache directory path in unwritable message.
| * [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
| | | | | | | | | | | | | | | | When template tests are skipped because cache directory is not writable, include path to the cache directory into the message saying it is not writable. PHPBB3-10354
* | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusIgor Wiedler2011-09-053-0/+123
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added optionset to mock_user in the tests. [ticket/10240] Fixed copyright year in censor_text_test.php. [ticket/10240] Fixed censor_text test assetEquals param order. [ticket/10240] Added censor_text tests for special characters. [ticket/10240] Added censor_text tests.
| * | [ticket/10240] Added optionset to mock_user in the tests.Callum Macrae2011-08-232-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | Also made optionset use the value set by optionset. We're not checking whether the option is set or not, because we would just throw an error if it wasn't set, and it throws an error anyway. PHPBB3-10240
| * | [ticket/10240] Fixed copyright year in censor_text_test.php.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | PHPBB3-10240
| * | [ticket/10240] Fixed censor_text test assetEquals param order.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | Before, expected and input were the wrong way round. PHPBB3-10240
| * | [ticket/10240] Added censor_text tests for special characters.Callum Macrae2011-08-231-0/+10
| | | | | | | | | | | | PHPBB3-10240
| * | [ticket/10240] Added censor_text tests.Callum Macrae2011-08-223-0/+107
| | | | | | | | | | | | PHPBB-10240
* | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-052-0/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | | [ticket/10321] Add descriptions to the unit testsJoas Schilling2011-08-211-15/+15
| | | | | | | | | | | | | | | | PHPBB3-10321
| * | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-212-0/+57
| | | | | | | | | | | | | | | | PHPBB3-10321
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10339: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| * | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| |/ / / | | | | | | | | | | | | PHPBB3-10339
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10334: [ticket/10334] Require permissions to view the birthday-list on board index
| * | | | [ticket/10334] Require permissions to view the birthday-list on board indexJoas Schilling2011-08-231-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10334
* | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ↵Joas Schilling2011-08-292-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/bantu/10341 * remotes/bantu/ticket/10341: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| * | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
| | |/ / | |/| | | | | | | | | | PHPBB3-10341
* | | | Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346Joas Schilling2011-08-292-0/+77
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * remotes/naderman/ticket/10346: [ticket/10346] Add drop_tables to perform_schema_changes and add tests
| * | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-292-0/+77
|/ / / | | | | | | | | | PHPBB3-10346
* | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10253: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| * | | [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.Joas Schilling2011-07-303-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since IE9 IE supports textarea.selectionStart and window.getSelection. The only problem is, that the values are still incorrect. Therefore we need to ensure that it is still treated the old way, until IE fixes this completely. PHPBB3-10253
* | | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-262-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10335: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| * | | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-242-0/+12
| | |/ / | |/| | | | | | | | | | PHPBB3-10335
* | | | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-253-24/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10320: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| * | | | [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10320
| * | | | [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-252-23/+35
| |/ / / | | | | | | | | | | | | PHPBB3-10320
* | | | Merge remote-tracking branch 'github-bantu/ticket/9995' into develop-olympusNils Adermann2011-08-251-17/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/9995: [ticket/9995] Do not run forum SQL query when marking the whole board read. [ticket/9995] Always continue when harvesting $forum_ids for markread(). [ticket/9995] Remove useless statement from display_forums()
| * | | | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| * | | | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| * | | | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $forum_ids array is only used if $mark_read == 'forums'. When $mark_read == 'forums', we either continue when $auth->acl_get('f_list', $forum_id) is false or true. So this statement is never useful. PHPBB3-9995
* | | | Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympusNils Adermann2011-08-251-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * github-bantu/ticket/10222: [ticket/10222] Also build language and styles changes in diff/patch format.
| * | | [ticket/10222] Also build language and styles changes in diff/patch format.Andreas Fischer2011-08-251-0/+9
|/ / / | | | | | | | | | PHPBB3-10222
* | | Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympusAndreas Fischer2011-08-211-1/+9
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/8177: [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
| * | | [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.Joas Schilling2011-08-211-1/+9
| | |/ | |/| | | | | | | PHPBB3-8177
* | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusAndreas Fischer2011-08-211-3/+0
|\ \ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Reverted a commit which added buggy code.
| * | | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
* | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-212-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/10309: [ticket/10309] Update .gitignore and move .gitkeep.
| * | | [ticket/10309] Update .gitignore and move .gitkeep.Oleg Pudeyev2011-08-202-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10309
* | | | Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into ↵Andreas Fischer2011-08-215-7/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * 'develop-olympus' of git://github.com/phpbb/phpbb3: [ticket/9978] Added semicolons to JavaScript in overall_header. [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
| * | | Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympusOleg Pudeyev2011-08-201-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/9978: [ticket/9978] Added semicolons to JavaScript in overall_header.
| | * | | [ticket/9978] Added semicolons to JavaScript in overall_header.Callum Macrae2011-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semicolons have been added to the anonymous functions in the javascript in overall_header.html. This makes JSLint happier, and also makes the code easier to minify. PHPBB3-9978
| * | | | Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympusNils Adermann2011-08-184-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/8571: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
| | * | | | [ticket/8571] Show age as 0 in birthday list when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8571
| | * | | | [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8571
| | * | | | [ticket/8571] Also display age on memberlist/viewprofile when age is 0.Andreas Fischer2011-07-202-3/+3
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-8571
* | | | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-161-4/+7
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | * p/ticket/10309: [ticket/10309] Coding guidelines fix. [ticket/10309] Write unicode data to tests/tmp.
| * | | [ticket/10309] Coding guidelines fix.Oleg Pudeyev2011-08-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10309
| * | | [ticket/10309] Write unicode data to tests/tmp.Oleg Pudeyev2011-08-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the tests are run by a different user than the one which owns phpbb source tree, writes will go into a single, known directory. PHPBB3-10309
* | | | Merge remote-tracking branch 'p/ticket/9976' into develop-olympusAndreas Fischer2011-08-161-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/9976: [ticket/9976] Fix link to post when two posts have the same post_time.
| * | | | [ticket/9976] Fix link to post when two posts have the same post_time.Joas Schilling2011-07-301-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When two posts have the same post_time, a link to the first post being on page 1, leads you to the second post with the same timestamp on page two. So in case the post_times are equal, we need to use the post_id to correctly order the posts. PHPBB3-9976
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 06:40:06 +0000