1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

11829 Commits

Author SHA1 Message Date
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
6206d4aa4e [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
The explanation now states that links are prefixed with the board URL.

PHPBB3-8319
2013-06-03 12:37:58 +02:00
Joas Schilling
24bfaa1327 [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the
second_pass_replace value, so that needs updating for existing ones.

PHPBB3-8319
2013-06-03 12:37:57 +02:00
Joas Schilling
c0e0c13cf1 [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
PHPBB3-8319
2013-06-03 12:37:54 +02:00
Joas Schilling
81140ec887 [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
The description says:
"The URL must be relative to the topic page and cannot contain a server name
or protocol."
We now enforce this and will add a new token with the current behaviour back.

PHPBB3-8319
2013-06-03 12:37:54 +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
Marc Alexander
33a0859f4a [ticket/11579] Move tests into seperate files depending on needed fixture
PHPBB3-11579
2013-05-30 20:34:21 +02:00
Marc Alexander
6d5da402ec [ticket/11579] Remove unnecessary globals from validate_password()
The globals $db and $user are not used in that function.

PHPBB3-11579
2013-05-30 16:09:06 +02:00
Marc Alexander
3f657bc63e [ticket/11579] Add remaining unit tests for validate_data functions
This now includes tests for usernames, passwords, emails, and jabber
addresses. A few small changes had to be applied to phpbb_mock_cache
and phpbb_mock_user in order to incorporate needed methods.

PHPBB3-11579
2013-05-30 16:05:19 +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
Marc Alexander
3d625ab0cf [ticket/11579] Add basic set of unit tests for validate_data()
This currently includes tests for the string, num, date, match, and
language iso validation functions.

PHPBB3-11579
2013-05-29 18:24:54 +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
Andreas Fischer
2b356e766f Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympus
* marc1706/ticket/11538:
  [ticket/11538] Add optional switch as argument to hex colour validation
  [ticket/11538] Modify test colour values
  [ticket/11538] Limit comment in acp_groups to 80 characters per line
  [ticket/11538] Move group ID into abstract test class and add more test cases
  [ticket/11538] Merge calls to validate_data() in acp_groups
  [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
  [ticket/11538] Use abstract class for functional test cases for group colour
  [ticket/11538] Add function phpbb_validate_colour for validating colours
  [ticket/11538] Make sure regex doesn't allow multiple color values
  [ticket/11538] Add tests for acp group manage page
  [ticket/11538] Simplify colour value check and remove support for '#'
  [ticket/11538] Fix incorrect regex and test for duplicate # in color string
  [ticket/11538] Use regex for testing color value and improve tests
  [ticket/11538] Make sure group color can't exceed maximum of 6 characters
2013-05-26 18:24:29 +02:00
erangamapa
8191755cca [ticket/11145] Wrong error thrown when uploading a bigger image.
When attaching an image to a post with a size larger than maximum defined in
php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is
returning false value when image size is too large. Therefore, moved
not image test down after image size test.

PHPBB3-11145
2013-05-25 10:50:43 +05:30
Nathan Guse
4a93560870 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11551' into develop-olympus
# By David King
# Via David King
* remotes/imkingdavid/ticket/11551:
  [ticket/11551] Fix error in system tab if get_remote_file returns empty string
2013-05-20 11:54:22 -05:00
David King
901955e452 [ticket/11551] Fix error in system tab if get_remote_file returns empty string
Currently a debug error is thrown. With this patch, it fails without keeping
the admin from being able to access the rest of the System modules by showing
a nicer error "Failed to obtain latest version information."

PHPBB3-11551
2013-05-20 12:20:55 -04:00
Marc Alexander
cd1da92d85 [ticket/11538] Add optional switch as argument to hex colour validation
The value of $optional will decide whether an empty string will be
treated as incorrect input or if it is allowed. The optional argument
will default to false and therefore treat an empty string as incorrect
unless explicitly told to not do so.

PHPBB3-11538
2013-05-19 17:45:45 +02:00