Commit graph

3890 commits

Author SHA1 Message Date
Joas Schilling
832c9f64e0 Merge pull request #3551 from rxu/ticket/13779
[ticket/13779] Set new auth options to the role only if matching the role type
2015-06-09 20:23:08 +02:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_main.php
2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685
[ticket/13685] Allow modifying the query for mysql native fulltext search
2015-06-09 14:27:13 +02:00
brunoais
3cb86cb6f1 [ticket/13685] Fix tests for fulltext search
PHPBB3-13685
2015-06-07 18:40:49 +01:00
Joas Schilling
6817418b06 Merge branch '3.1.x' 2015-06-07 17:11:10 +02:00
CHItA
32a2546c5d [ticket/sec-184] Fix tests
SECURITY-184
2015-06-07 16:43:27 +02:00
rxu
c221571963 [ticket/13779] Add permission set tests
PHPBB3-13779
2015-06-06 15:15:17 +07:00
Marc Alexander
49f2dd8c5e [ticket/13564] Fix user_delete_test on master
PHPBB3-13564
2015-06-04 19:26:56 +02:00
Joas Schilling
f3f82bd377 Merge branch '3.1.x' 2015-06-04 17:30:16 +02:00
Joas Schilling
9005711ad7 Merge pull request #3502 from marc1706/ticket/13564
[ticket/13564] Unlink user accounts upon deleting user
2015-06-04 17:30:09 +02:00
JoshyPHP
78eeb210e7 [ticket/13906] Renamed test
PHPBB3-13906
2015-06-02 22:46:14 +02:00
JoshyPHP
d37c995f4b [ticket/13906] Added test
PHPBB3-13906
2015-06-02 12:37:36 +02:00
MateBartus
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments
PHPBB3-13777
2015-05-31 16:03:11 +02:00
MateBartus
fcff3ee4ad [ticket/13777] Fix tests
PHPBB3-13777
2015-05-31 13:22:46 +02:00
JoshyPHP
6ac37145ec [ticket/8420] Added regression test
PHPBB3-8420
2015-05-31 10:13:20 +02:00
JoshyPHP
433021f429 [ticket/13901] Fixed test's expected result
PHPBB3-13901
2015-05-30 23:51:09 +02:00
JoshyPHP
b69e33c2b0 [ticket/13901] Add whitespace to short, multiline quotes for readability
PHPBB3-13901
2015-05-30 22:20:52 +02:00
JoshyPHP
2f0d11ba3c [ticket/13901] Add more whitespace to long quotes for readability
PHPBB3-13901
2015-05-30 22:17:14 +02:00
JoshyPHP
132282634f [ticket/13803] Moved tests to a subdir
PHPBB3-13803
2015-05-30 17:26:13 +02:00
JoshyPHP
c8052ea823 [ticket/13803] Set up a global $user for tests
PHPBB3-13803
2015-05-30 17:26:13 +02:00
JoshyPHP
54b18df084 [ticket/13803] Added contact_admin_info tests
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
3827a131ae [ticket/13803] Rewrote the poll_option plugin
As it turns out, poll_option_id is not a primary key.

PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
7a8ac4bb71 [ticket/13803] Added get_max_id() tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
2dc19cec9d [ticket/13803] Added poll_option tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
8ef15d10e6 [ticket/13803] Added poll_title tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b0eb63e5b9 [ticket/13803] Added group_description tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
a870f8f860 [ticket/13803] Added user_signature tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
d42b2fe795 [ticket/13803] Sort test rows in SQL to match the expected result
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
6ab524f8dc [ticket/13803] Added tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
70cd911281 [ticket/13803] Added tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
9bf0f794b5 [ticket/13803] Added pm_text tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
459f1d4c1f [ticket/13803] Refactored test
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b5911281ae [ticket/13803] Added tests, fixed param order in generate_text_for_storage()
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
986af43f37 [ticket/13803] Added plugins
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
e11ae7e9cd [ticket/13803] Hyphenated class names
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
de52580a78 [ticket/13803] WIP implementation
PHPBB3-13803
2015-05-30 17:26:00 +02:00
Nils Adermann
073f3e6fdc Merge pull request #3592 from Nicofuma/ticket/13388
[ticket/13388] Integrate routing and di parameters resolution
2015-05-30 13:21:22 +02:00
Andreas Fischer
3f4206e012 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test
2015-05-29 22:46:34 +02:00
Andreas Fischer
b5fed65fe3 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test

Conflicts:
	tests/lint_test.php
2015-05-29 22:46:28 +02:00
Tristan Darricau
66c0e0c6a8 [ticket/13388] Integrate routing and di parameters resolution
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Oliver Schramm
13955a3e13 Merge pull request #3660 from Nicofuma/ticket/13890
[ticket/13890] Fix di tests
2015-05-29 16:40:42 +02:00
Tristan Darricau
86ad1a92c8 Merge pull request #3561 from s9e/ticket/10922
[ticket/10922] Added support for body and subject in email BBCode
2015-05-29 16:15:04 +02:00
Tristan Darricau
2aecb94068 Merge pull request #3383 from nickvergessen/ticket/9109
Ticket/9109 Properly document and calculate the group settings with value 0
2015-05-29 16:04:56 +02:00
Tristan Darricau
a3d46575c7 Merge pull request #3613 from nickvergessen/ticket/13844
Ticket/13844 Better FAQ language files
2015-05-29 15:44:39 +02:00
Tristan Darricau
f5dbc3b6f2 Merge pull request #3616 from s9e/ticket/13847
[ticket/13847] Move quote generation to text_formatter.utils
2015-05-29 15:42:14 +02:00
Tristan Darricau
6641ed6478 [ticket/13890] Fix di tests
PHPBB3-13890
2015-05-29 14:54:08 +02:00
Tristan Darricau
3c3b099f88 Merge pull request #3622 from s9e/ticket/13860
[ticket/13860] Fixed array-to-string conversion
2015-05-29 13:15:33 +02:00
Tristan Darricau
835a2ebcb8 Merge pull request #3625 from s9e/ticket/11742
[ticket/11742] Remove tabs-to-space conversion in [code]
2015-05-29 13:03:12 +02:00
Joas Schilling
0e48d250d3 Merge pull request #3648 from marc1706/ticket/13872
[ticket/13872] Remove subsilver2 from md exporter test
2015-05-29 11:41:31 +02:00
Nils Adermann
da68f62d4f Merge pull request #3554 from Nicofuma/ticket/13770
[ticket/13770] Wither interface for container_builder
2015-05-29 10:56:54 +02:00