1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

11679 Commits

Author SHA1 Message Date
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
Nils Adermann
a7e3a1b376 Merge pull request #1466 from nickvergessen/ticket/11590
[ticket/11590] Close database connections when tearDown() is called
2013-06-06 16:49:22 -07:00
Joas Schilling
228c1075b7 [ticket/11590] Close database connections when tearDown() is called
PHPBB3-11590
2013-06-07 01:31:20 +02:00
Nathaniel Guse
6b6a07560e Merge remote-tracking branch 'remotes/nickv/ticket/11568' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568:
  [ticket/11568] Split status code and html debug assertion into two methods
  [ticket/11568] Add comma at end of array key-value couple
  [ticket/11568] Invert logic for asserting the response
  [ticket/11568] Use static calls for static methods
  [ticket/11568] Remove unused method
  [ticket/11568] Only assert string when doctype is there at all
  [ticket/11568] Add method to get page content
  [ticket/11568] Allow different status codes
  [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
  [ticket/11568] Fix common_groups_test.php form handling
  [ticket/11568] Make CookieJar static aswell
  [ticket/11568] Remove manual calls to assert_response_success()
  [ticket/11568] Only use a static version of the client
  [ticket/11568] Any output before the doc type means there was an error
  [ticket/11568] Set client manually so we can increase the cURL timeout
  [ticket/11568] Use Goutte Client to install the board for functional tests
2013-06-06 16:49:38 -05:00
Joas Schilling
ba665412ea [ticket/11543] Use correct IP addresses and inject time for correct values
PHPBB3-11543
2013-06-06 22:54:18 +02:00
Joas Schilling
766be31f95 [ticket/11543] Add unit tests for obtain_users_online_string()
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Joas Schilling
3301b01f4c [ticket/11543] Add unit tests for obtain_users_online() with empty forum
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Joas Schilling
6b3758edd0 [ticket/11543] Add unit tests for obtain_users_online()
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Joas Schilling
057bbfa240 [ticket/11543] Add unit tests for obtain_guest_count()
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Nathaniel Guse
deaa263e0a Merge remote-tracking branch 'remotes/bantu/ticket/11588' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11588:
  [ticket/11588] Also use version.phpbb.com in install_update.php.
2013-06-06 12:52:46 -05:00
Andreas Fischer
55f7281f61 [ticket/11588] Also use version.phpbb.com in install_update.php.
PHPBB3-11588
2013-06-06 13:00:53 +02:00
Dhruv
ad8386a64a Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11583:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
2013-06-05 01:41:26 +05:30
Andreas Fischer
a3d1593804 Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympus
* erangamapa/ticket/11145:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:21 +02:00
Andreas Fischer
1cd6bb88a6 Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympus
* nickvergessen/ticket/10840:
  [ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:36:04 +02:00
Andreas Fischer
d925c8d0da [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
PHPBB3-11583
2013-06-03 15:16:57 +02:00
Andreas Fischer
6abe225f6c Merge remote-tracking branch 'nickvergessen/ticket/11122-2' into develop-olympus
* nickvergessen/ticket/11122-2:
  [ticket/11122] Add dhruv to active authors
  [ticket/11122] Remove Oleg and igorw from active authors
2013-06-03 15:05:02 +02:00
Joas Schilling
323bfbc78f [ticket/11122] Add dhruv to active authors
PHPBB3-11122
2013-06-03 11:08:50 +02:00
Joas Schilling
cb62b37bce [ticket/11122] Remove Oleg and igorw from active authors
PHPBB3-11122
2013-06-03 11:06:12 +02:00
Joas Schilling
0eae9eb75d [ticket/10840] Add check_form_key to acp_groups.php
PHPBB3-10840
2013-06-03 10:54:16 +02:00
Andreas Fischer
d0e45e17dd [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
PHPBB3-11583
2013-06-01 04:09:33 +02:00
Joas Schilling
6af5262fcc [ticket/11568] Split status code and html debug assertion into two methods
PHPBB3-11568
2013-05-31 16:27:52 +02:00
Joas Schilling
09a3877ae4 [ticket/11568] Add comma at end of array key-value couple
PHPBB3-11568
2013-05-31 16:20:20 +02:00
Joas Schilling
b2be82cd57 [ticket/11568] Invert logic for asserting the response
PHPBB3-11568
2013-05-31 16:19:19 +02:00
Joas Schilling
b7b81f6431 [ticket/11568] Use static calls for static methods
PHPBB3-11568
2013-05-31 16:16:41 +02:00
Joas Schilling
b4d23fa551 [ticket/11568] Remove unused method
PHPBB3-11568
2013-05-30 14:16:31 +02:00
Joas Schilling
45c91be970 [ticket/11568] Only assert string when doctype is there at all
PHPBB3-11568
2013-05-30 14:12:08 +02:00
Joas Schilling
e84fb0c6ca [ticket/11568] Add method to get page content
PHPBB3-11568
2013-05-28 14:47:24 +02:00
Joas Schilling
0dd1bbf084 [ticket/11568] Allow different status codes
PHPBB3-11568
2013-05-28 14:38:28 +02:00
Joas Schilling
3d6620f0db [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
PHPBB3-11568
2013-05-28 14:10:27 +02:00
Andreas Fischer
a997768627 Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympus
* nickvergessen/ticket/11580:
  [ticket/11580] Enable prefer-source option (should error way less)
  [ticket/11580] Enable --no-interaction option on composer for travis
2013-05-28 01:15:02 +02:00
Joas Schilling
65307f1382 [ticket/11580] Enable prefer-source option (should error way less)
PHPBB3-11580
2013-05-27 23:48:04 +02:00
Joas Schilling
2d0fb52eaa [ticket/11580] Enable --no-interaction option on composer for travis
There is no interaction available on travis ;)

PHPBB3-11580
2013-05-27 23:35:57 +02:00
Joas Schilling
9be57ec076 [ticket/11568] Fix common_groups_test.php form handling
PHPBB3-11568
2013-05-27 23:10:08 +02:00
Joas Schilling
da98866c24 [ticket/11568] Make CookieJar static aswell
PHPBB3-11568
2013-05-27 23:10:08 +02:00
Joas Schilling
e77c8ee4ef [ticket/11568] Remove manual calls to assert_response_success()
PHPBB3-11568
2013-05-27 23:10:07 +02:00
Joas Schilling
135139aca9 [ticket/11568] Only use a static version of the client
PHPBB3-11568
2013-05-27 23:10:07 +02:00
Joas Schilling
f25389f94a [ticket/11568] Any output before the doc type means there was an error
Change is needed to allow "Warning:" in the HTML body

PHPBB3-11568
2013-05-27 23:10:07 +02:00
Joas Schilling
a3e5efc634 [ticket/11568] Set client manually so we can increase the cURL timeout
PHPBB3-11568
2013-05-27 23:10:06 +02:00
Joas Schilling
5dcf028cf0 [ticket/11568] Use Goutte Client to install the board for functional tests
PHPBB3-11568
2013-05-27 23:10:06 +02:00
Joas Schilling
96b4066368 Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympus
* marc1706/ticket/11578:
  [ticket/11578] Add missing underscore after 'validate' function prefix
2013-05-27 23:07:00 +02:00
marc1706
b75f67231f [ticket/11578] Add missing underscore after 'validate' function prefix
The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.

PHPBB3-11578
2013-05-27 22:56:49 +02:00
Joas Schilling
cc68ea5f6f Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympus
* bantu/ticket/11576:
  [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
2013-05-27 18:17:07 +02:00
Joas Schilling
49149c0d41 Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympus
* bantu/ticket/11575:
  [ticket/11575] Correct test_cross_join() to test_order_lower().
2013-05-27 17:43:40 +02:00
Andreas Fischer
38022a6999 [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
PHPBB3-11576
2013-05-27 15:34:05 +02:00
Andreas Fischer
8a13fff2aa [ticket/11575] Correct test_cross_join() to test_order_lower().
This test does not do any cross joining, it only tests ORDER BY LOWER(...).

PHPBB3-11575
2013-05-27 13:33:41 +02:00
Joas Schilling
f77111fe0e Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympus
* remotes/bantu/ticket/11538:
  [ticket/11538] Cut functional tests down a bit as these are more expensive.
  [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
  [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
2013-05-27 11:51:26 +02:00
Andreas Fischer
3faae5c98c [ticket/11538] Cut functional tests down a bit as these are more expensive.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
401e9466bf [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
e84f5db4f5 [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
PHPBB3-11538
2013-05-26 19:24:09 +02:00