Andreas Fischer
50e3173e8c
[ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
...
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Marc Alexander
c2bc82ebfd
[ticket/11579] Move simple tests into seperate files
...
PHPBB3-11579
2013-06-03 16:15:08 +02:00
Andreas Fischer
11c80c0402
[ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
...
PHPBB3-11586
2013-06-03 16:14:22 +02:00
Andreas Fischer
cb54f56c3d
[ticket/11586] Combine administrator/moderator checks together.
...
PHPBB3-11586
2013-06-03 16:07:19 +02:00
Marc Alexander
3487b70cc0
[ticket/11579] Use test case helper class and use assert prefix for method
...
PHPBB3-11579
2013-06-03 16:06:11 +02:00
Andreas Fischer
99d089ce9f
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:32 +02:00
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
a20a0e06c2
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:39:07 +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
fe4f0ef42c
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11122] Add dhruv to active authors
[ticket/11122] Remove Oleg and igorw from active authors
2013-06-03 15:05:09 +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
David King
4b61178d05
Merge remote-tracking branch 'nickvergessen/ticket/11549' into develop
...
* nickvergessen/ticket/11549:
[ticket/11549] Add functional test for ACP Extension Module with Template
[ticket/11549] Do not set extension dir path for style in adm/index.php
2013-05-31 22:39:40 -04: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
69e1b402df
Merge remote-tracking branch 'Elsensee/ticket/11409' into develop
...
* Elsensee/ticket/11409:
[ticket/11409] Add success message after updating group position settings
2013-05-31 18:08:26 +02:00
Joas Schilling
cae1f8bc86
Merge remote-tracking branch 'EXreaction/ticket/11387' into develop
...
* EXreaction/ticket/11387:
[ticket/11387] Log module added only after it has been added
2013-05-31 17:21:00 +02:00
Oliver Schramm
faf804c70f
[ticket/11409] Add success message after updating group position settings
...
PHPBB3-11409
2013-05-31 17:16:15 +02:00
Joas Schilling
8c4670eeb1
Merge branch 'ticket/11568' into ticket/11568-develop
...
* 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
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
2013-05-31 16:45:06 +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
48036c6eda
[ticket/11549] Add functional test for ACP Extension Module with Template
...
PHPBB3-11549
2013-05-31 14:25:47 +02:00
Joas Schilling
399d9ee5e1
Merge remote-tracking branch 'Elsensee/ticket/11570' into develop
...
* Elsensee/ticket/11570:
[ticket/11570] Fix link and make the notice more conspiciuous
[ticket/11570] Add link back to update process
2013-05-31 13:14:50 +02:00
Oliver Schramm
ec2cdbed61
[ticket/11570] Fix link and make the notice more conspiciuous
...
PHPBB3-11570
2013-05-31 12:18:03 +02:00
Joas Schilling
7917e5a589
[ticket/11549] Do not set extension dir path for style in adm/index.php
...
As we don't want style files in adm/adm/style/ we should not prepend the adm/
by setting it. Note, we did that correctly in adm/swatch.php.
PHPBB3-11549
2013-05-31 00:18:39 +02:00
Oliver Schramm
8b0a6fd2cd
[ticket/11570] Add link back to update process
...
PHPBB3-11570
2013-05-30 21:30:09 +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
Joas Schilling
5c046b9493
[ticket/develop/11568] Remove unneccessary second call with wrong arguments
...
PHPBB3-11568
2013-05-30 16:16:49 +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
9e438bd266
Merge branch 'ticket/11568' into ticket/11568-develop
...
* ticket/11568:
[ticket/11568] Remove unused method
[ticket/11568] Only assert string when doctype is there at all
2013-05-30 14:17:22 +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
a36defb10f
[ticket/develop/11568] Fix some more tests in 3.1
...
PHPBB3-11568
2013-05-30 13:26:16 +02:00
Joas Schilling
4f6b12ae1d
[ticket/develop/11568] Remove php extension parameter
...
We don't support that in 3.1 anymore
PHPBB3-11568
2013-05-30 10:49:13 +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
b3b92b7b18
Merge remote-tracking branch 'Elsensee/ticket/11569' into develop
...
* Elsensee/ticket/11569:
[ticket/11569] Add type parameter and fix language variable
[ticket/11569] Add parameter to URL and remove comment
[ticket/11569] Fixing link to continue update
2013-05-29 13:46:25 +02:00
Oliver Schramm
a79e229c25
[ticket/11569] Add type parameter and fix language variable
...
PHPBB3-11569
2013-05-29 13:27:15 +02:00
Oliver Schramm
c65617479d
[ticket/11569] Add parameter to URL and remove comment
...
PHPBB3-11569
2013-05-29 13:20:47 +02:00
Matt Friedman
dccd605a42
[ticket/11577] Correct over-sized Topic Rows
...
Fixes a change made in PR 1331 that oversized topic rows.
Icons in topic rows, in Prosilver, are only 27px high, so we do not need
a min-height as high as 40px. Setting it to 30px is more conservative
and reclaims the original height of topic rows from before PR 1331.
http://tracker.phpbb.com/browse/PHPBB3-11577
PHPBB3-11577
2013-05-28 19:07:28 -07:00
Joas Schilling
f1523944a0
[ticket/develop/11568] Remove unneccessary calls to assert_response_success()
...
PHPBB3-11568
2013-05-28 14:58:40 +02:00
Joas Schilling
467c4d62c4
[ticket/develop/11568] Do not directly access $client from tests
...
PHPBB3-11568
2013-05-28 14:55:04 +02:00
Joas Schilling
6d9888be65
Merge branch 'ticket/11568' into ticket/11568-develop
...
* ticket/11568:
[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
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
2013-05-28 14:51:06 +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