Commit graph

11796 commits

Author SHA1 Message Date
Andreas Fischer
960b20e45b Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
2013-06-27 02:08:48 +02:00
Joseph Warner
8e575487ff [ticket/11618] Replace glob() with scandir() and string matching
Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
2013-06-26 19:51:52 -04:00
Andreas Fischer
e0c572d1d8 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:21:28 +02:00
Dhruv
fe4bfd02a3 [ticket/10838] Updated RUNNING_TESTS.md
PHPBB3-10838
2013-06-27 01:52:22 +05:30
Andy Chase
7ba81a293f [ticket/11615] Fix typo in creation_test
PHPBB3-11615
2013-06-26 11:49:37 -07:00
Andy Chase
4c432fecc7 [ticket/11615] Remove magic number in creation_test
Removing this magic number to its own variable
with clean multiplication makes it clear
what the number represents.

PHPBB3-11615
2013-06-26 11:49:36 -07:00
Andy Chase
c29cca1a75 [ticket/11615] Rename class in file to match
PHPBB3-11615
2013-06-26 11:49:35 -07:00
Andy Chase
a105a6d7a7 [ticket/11615] Rename init_test to creation_test for clarity
PHPBB3-11615
2013-06-26 11:49:34 -07:00
Joas Schilling
4828cb21cf Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympus
* dhruvgoel92/ticket/10776:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.
2013-06-21 16:32:59 +02:00
Dhruv
6cbb2d6136 [ticket/10776] update min php version 5.3.3 in readme
PHPBB3-10776
2013-06-21 18:24:06 +05:30
Dhruv
116888f567 Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticket/10776
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-20 21:39:13 +05:30
Joas Schilling
b9afc6f1a5 Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympus 2013-06-20 11:46:00 +02:00
Andreas Fischer
47241878d0 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
2013-06-20 11:41:46 +02:00
Andreas Fischer
f365c99f14 Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympus
* nickvergessen/ticket/11603:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
2013-06-20 11:29:21 +02:00
Joas Schilling
b362fb44d2 [ticket/11603] Fix out dated comment
PHPBB3-11603
2013-06-20 10:59:43 +02:00
Joas Schilling
5f4daba160 [ticket/11603] Fix usage note
PHPBB3-11603
2013-06-20 10:57:56 +02:00
Andreas Fischer
e47e36266d Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympus
* dhruvgoel92/ticket/11094:
  [ticket/11094] Add textbox for jabber while memberlist search
2013-06-20 01:16:21 +02:00
Andreas Fischer
1af6dc22e2 [ticket/11604] Skip installer step where config.php is created.
PHPBB3-11604
2013-06-19 17:03:41 +02:00
Joas Schilling
99e486dc82 [ticket/11603] Throw RuntimeExceptions instead of using exit()
PHPBB3-11603
2013-06-19 13:45:42 +02:00
Joas Schilling
1516ae7e7e [ticket/11603] Avoid using cURL
PHPBB3-11603
2013-06-19 13:38:03 +02:00
Andreas Fischer
21f839494d [ticket/11604] Fix case where config.php is not generated by phpBB.
PHPBB3-11604
2013-06-18 16:02:33 +02:00
Andreas Fischer
516581c41e [ticket/11604] Use variables for config.php filesnames.
PHPBB3-11604
2013-06-18 15:04:48 +02:00
Dhruv
50828e6d39 [ticket/11094] Add textbox for jabber while memberlist search
PHPBB3-11094
2013-06-15 18:41:43 +05:30
Joas Schilling
e19ed7d8b9 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820' into develop-olympus
* remotes/dhruvgoel92/ticket/10820:
  [ticket/10820] fix if condition to check for IE
  [ticket/10820] Add additional check for IE in condition
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8
2013-06-13 21:06:37 +02:00
Dhruv
de150cb4ad [ticket/10820] fix if condition to check for IE
PHPBB3-10820
2013-06-14 00:29:06 +05:30
Joas Schilling
a7af0134c0 [ticket/11603] Split api_request into two functions (query only vs. full url)
PHPBB3-11603
2013-06-13 18:43:04 +02:00
Joas Schilling
92c55ab111 [ticket/11603] Fix spacing and add some comments
PHPBB3-11603
2013-06-13 18:41:23 +02:00
Dhruv
48f764437f [ticket/10820] Add additional check for IE in condition
PHPBB3-10820
2013-06-13 21:47:37 +05:30
Joas Schilling
e4ccc5e6ea [ticket/11603] Fix github API calls
- Some URLs changed
- Response is a plain array now
- Added error messages when API limit is reached

PHPBB3-11603
2013-06-13 16:17:17 +02:00
Joas Schilling
bcc98ae3e7 [ticket/11603] Rename network to forks and fix handling
PHPBB3-11603
2013-06-13 16:16:58 +02:00
Joas Schilling
e633ace072 [ticket/11603] Fix github api url and use curl with valid user agent
PHPBB3-11603
2013-06-13 16:16:44 +02:00
Dhruv
e0b9cdf708 [ticket/10820] Fix function docblock
PHPBB3-10820
2013-06-12 20:22:48 +05:30
Dhruv
11cd9f901e [ticket/10820] Inject IE version in function
PHPBB3-10820
2013-06-12 20:22:47 +05:30
Dhruv
6b5780b753 [ticket/10820] fix regex
Extract IE version from user agent string and then compare it with 7

PHPBB3-10820
2013-06-12 20:22:46 +05:30
Dhruv
8f733cc658 [ticket/10820] remove unnecessary parentheses
PHPBB3-10820
2013-06-12 20:22:45 +05:30
Dhruv
5ebebbd719 [ticket/10820] fix docblock
PHPBB3-10820
2013-06-12 20:22:44 +05:30
Dhruv
ea7ece5d25 [ticket/10820] add param and return to function
Add param and return in function docblock. Rename function
parameter to $user_agent.

PHPBB3-10820
2013-06-12 20:22:43 +05:30
Dhruv
687b04bcfc [ticket/10820] simplify regex and escape dot
PHPBB3-10820
2013-06-12 20:22:42 +05:30
Dhruv
364828de24 [ticket/10820] Use singular return
PHPBB3-10820
2013-06-12 20:22:40 +05:30
Dhruv
07c62dd64f [ticket/10820] remove unnecessary condition checks
PHPBB3-10820
2013-06-12 20:22:39 +05:30
Dhruv
8759147674 [ticket/10820] add function docblock
PHPBB3-10820
2013-06-12 20:22:38 +05:30
Dhruv
9236f12577 [ticket/10820] fix IE check function
Add phpbb_ prefix to function name and return boolean value.

PHPBB3-10820
2013-06-12 20:22:37 +05:30
Dhruv
80d164b121 [ticket/10820] proper usage of global and local variable browser
PHPBB3-10820
2013-06-12 20:22:36 +05:30
riadhchtara
fbebc2874f [ticket/10820] Image downloader recognize new version of ie
When a user download image attachement using ie8, the file is displayed.
However, when he uses ie version greater than 8, the image is download.
A changes are made to phpbb/download/file.php to solve the problem.
We check now if the ie version is greater or equal to 8 and not only equal
to 8

PHPBB3-10820
2013-06-12 20:22:35 +05:30
Andreas Fischer
30801e1f0a Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-11 18:34:36 +02:00
Andreas Fischer
949a443bfe Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympus
* nickvergessen/ticket/11601:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:43 +02:00
Joas Schilling
33bce3fac6 [ticket/11601] Add protected method for database sync and call it
PHPBB3-11601
2013-06-11 13:26:17 +02:00
Joas Schilling
5e8054f045 [ticket/11601] Split post_setup_synchronisation logic from xml parsing
PHPBB3-11601
2013-06-11 13:24:55 +02:00
Nathaniel Guse
2dcf703493 Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11543:
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
2013-06-07 09:07:48 -05:00
Joas Schilling
d39ed5afc1 [ticket/11543] Add more users so #hidden <> #normal
PHPBB3-11543
2013-06-07 14:48:50 +02:00