mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
10,593 Commits 17 Branches 190 Tags
Commit Graph

10593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Wiedler
85bdc65df1 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus 
* 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.
 2011-09-05 09:07:52 +02:00
Oleg Pudeyev
cf5f0cce83 Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus 
* nickvergessen/ticket/10321:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:42:41 -04:00
Andreas Fischer
8e5eacf692 Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympus 
* nickvergessen/ticket/10339:
  [ticket/10339] Remove invalid template loop variable from mcp_front.html
 2011-08-30 01:52:17 +02:00
Andreas Fischer
1daefc6177 Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympus 
* nickvergessen/ticket/10334:
  [ticket/10334] Require permissions to view the birthday-list on board index
 2011-08-30 01:39:14 +02:00
Joas Schilling
a73bc353d6 Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/10341 
* remotes/bantu/ticket/10341:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
 2011-08-29 22:27:20 +02:00
Joas Schilling
6cde745e28 Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346 
* remotes/naderman/ticket/10346:
  [ticket/10346] Add drop_tables to perform_schema_changes and add tests
 2011-08-29 20:56:06 +02:00
Nils Adermann
0f2e45800e [ticket/10346] Add drop_tables to perform_schema_changes and add tests 
PHPBB3-10346
 2011-08-29 14:24:50 -04:00
Oleg Pudeyev
0d41385344 Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus 
* nickvergessen/ticket/10253:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
 2011-08-27 17:38:27 -04:00
Nils Adermann
dc9a771473 Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus 
* github-bantu/ticket/10335:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
 2011-08-26 05:59:13 -04:00
Nils Adermann
0d4089da7f Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus 
* 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.
 2011-08-25 23:20:55 -04:00
Nils Adermann
d602f74866 Merge remote-tracking branch 'github-bantu/ticket/9995' into develop-olympus 
* 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()
 2011-08-25 23:12:22 -04:00
Nils Adermann
34491f5569 Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympus 
* github-bantu/ticket/10222:
  [ticket/10222] Also build language and styles changes in diff/patch format.
 2011-08-25 22:57:39 -04:00
Andreas Fischer
7ae871dfae [ticket/9995] Do not run forum SQL query when marking the whole board read. 
PHPBB3-9995
 2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d [ticket/9995] Always continue when harvesting $forum_ids for markread(). 
PHPBB3-9995
 2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f [ticket/9995] Remove useless statement from display_forums() 
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
 2011-08-26 03:29:05 +02:00
Andreas Fischer
d221d2f7e8 [ticket/10222] Also build language and styles changes in diff/patch format. 
PHPBB3-10222
 2011-08-25 19:35:01 +02:00
Andreas Fischer
4499be5795 [ticket/10341] Also show forum/topic name of "0" as most active forum/topic. 
PHPBB3-10341
 2011-08-25 17:44:45 +02:00
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic". 
PHPBB3-10320
 2011-08-25 17:33:39 +02:00
Andreas Fischer
4491746c73 [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class. 
PHPBB3-10320
 2011-08-25 17:12:42 +02:00
Andreas Fischer
7a36c3b34b [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots. 
PHPBB3-10335
 2011-08-24 14:51:37 +02:00
Joas Schilling
53e0e3240c [ticket/10339] Remove invalid template loop variable from mcp_front.html 
PHPBB3-10339
 2011-08-24 10:33:12 +02:00
Joas Schilling
efc443aac9 [ticket/10334] Require permissions to view the birthday-list on board index 
PHPBB3-10334
 2011-08-23 14:49:50 +02:00
Callum Macrae
03da3c7c4c [ticket/10240] Added optionset to mock_user in the tests. 
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
 2011-08-23 13:28:42 +01:00
Callum Macrae
d4f1b92479 [ticket/10240] Fixed copyright year in censor_text_test.php. 
PHPBB3-10240
 2011-08-23 11:38:59 +01:00
Callum Macrae
0d104b00c8 [ticket/10240] Fixed censor_text test assetEquals param order. 
Before, expected and input were the wrong way round.

PHPBB3-10240
 2011-08-23 11:32:35 +01:00
Callum Macrae
e7ab7f5f7a [ticket/10240] Added censor_text tests for special characters. 
PHPBB3-10240
 2011-08-23 11:30:32 +01:00
Callum Macrae
fa5c7f6440 [ticket/10240] Added censor_text tests. 
PHPBB-10240
 2011-08-22 19:02:27 +01:00
Joas Schilling
5d66faafc1 [ticket/10321] Add descriptions to the unit tests 
PHPBB3-10321
 2011-08-21 18:56:47 +02:00
Andreas Fischer
540ca1a8d8 Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympus 
* nickvergessen/ticket/8177:
  [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
 2011-08-21 15:17:51 +02:00
Andreas Fischer
91b415dd01 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus 
* callumacrae/ticket/10240:
  [ticket/10240] Reverted a commit which added buggy code.
 2011-08-21 14:26:24 +02:00
Callum Macrae
4592076366 [ticket/10240] Reverted a commit which added buggy code. 
This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888.

The code which was added also removed new lines and tabs.

PHPBB3-10240
 2011-08-21 13:16:50 +01:00
Andreas Fischer
9f9e4ad3d8 Merge remote-tracking branch 'p/ticket/10309' into develop-olympus 
* p/ticket/10309:
  [ticket/10309] Update .gitignore and move .gitkeep.
 2011-08-21 14:11:10 +02:00
Andreas Fischer
15d0fe7d9f Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into 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.
 2011-08-21 14:11:06 +02:00
Joas Schilling
dc149a43e4 [ticket/10321] Do not append the ? if the param-list is empty anyway. 
PHPBB3-10321
 2011-08-21 13:16:05 +02:00
Joas Schilling
3c7dfc7e19 [ticket/8177] Display birthdays of 29th february on 28th in non-leap years. 
PHPBB3-8177
 2011-08-21 01:46:47 +02:00
Oleg Pudeyev
57accade85 [ticket/10309] Update .gitignore and move .gitkeep. 
PHPBB3-10309
 2011-08-20 14:34:02 -04:00
Oleg Pudeyev
1680b3a2a7 Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympus 
* callumacrae/ticket/9978:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
 2011-08-20 14:17:31 -04:00
Callum Macrae
b18b3363e9 [ticket/9978] Added semicolons to JavaScript in overall_header. 
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
 2011-08-20 11:20:30 +01:00
Nils Adermann
6330153937 Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympus 
* 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.
 2011-08-18 17:43:24 -04:00
Andreas Fischer
106cec9a92 Merge remote-tracking branch 'p/ticket/10309' into develop-olympus 
* p/ticket/10309:
  [ticket/10309] Coding guidelines fix.
  [ticket/10309] Write unicode data to tests/tmp.
 2011-08-16 18:39:59 +02:00
Andreas Fischer
a91131c55e Merge remote-tracking branch 'p/ticket/9976' into develop-olympus 
* p/ticket/9976:
  [ticket/9976] Fix link to post when two posts have the same post_time.
 2011-08-16 18:09:21 +02:00
Oleg Pudeyev
a6dd3d0c65 Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympus 
* bantu/ticket/9297:
  [ticket/9297] Add network to class name of unit tests.
  [ticket/9297] Fix typo in localhost.
  [ticket/9297] Rename test class to reflect its contents.
  [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.
  [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.
  [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.
  [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.
  [ticket/9297] Update copyright year of unit test file.
  [ticket/9297] Make EPSV unit tests work without IPv6.
  [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.
  [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
 2011-08-14 15:52:01 -04:00
Andreas Fischer
02a8cebd65 [ticket/9297] Add network to class name of unit tests. 
PHPBB3-9297
 2011-08-14 21:40:02 +02:00
Andreas Fischer
702985c927 [ticket/9297] Fix typo in localhost. 
PHPBB3-9297
 2011-08-14 20:55:21 +02:00
Oleg Pudeyev
a7e709d920 [ticket/9297] Rename test class to reflect its contents. 
setUpBeforeClass logic makes this test specific to PASV/EPSV tests.

PHPBB3-9297
 2011-08-14 14:47:16 -04:00
Oleg Pudeyev
2a0c9e4026 [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. 
Looks like IPv6-encapsulated IPv4 addresses do not actually work if
the host has no IPv6 connectivity.

PHPBB3-9297
 2011-08-14 14:42:53 -04:00
Oleg Pudeyev
c211492092 [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. 
Need to use the static version here.

PHPBB3-9297
 2011-08-14 14:33:00 -04:00
Oleg Pudeyev
2973ccbd48 [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. 
It is possible to configure PHP without IPv6, in which case
IPv6-encapsulated IPv4 addresses won't be accepted by PHP.
Instead of failing the test suite on such setups, skip the
offending test.

PHPBB3-9297
 2011-08-14 14:11:58 -04:00
Oleg Pudeyev
386883cda1 [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. 
PHPBB3-9297
 2011-08-14 13:19:09 -04:00
Andreas Fischer
7a40ab8f7a [ticket/9297] Update copyright year of unit test file. 
PHPBB3-9297
 2011-08-14 18:17:16 +02:00