1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00

3210 Commits

Author SHA1 Message Date
Tristan Darricau
487fea8cff [ticket/12692] Move the language strings to cli.php
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
d517ed846b [ticket/12692] Add unit test
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Matt Friedman
80f91da9b9 [ticket/13995] Fix errors in tests from merge conflict
PHPBB3-13995
2015-07-08 15:11:10 -07:00
Marc Alexander
01097a24b5 Merge branch '3.1.x'
Conflicts:
	tests/template/template_includecss_test.php
2015-07-08 22:54:26 +02:00
Matt Friedman
23db3d0b83 [ticket/13995] Remove projection from tests
PHPBB3-13995
2015-07-08 08:11:04 -07:00
Tristan Darricau
2fbfb0e004 Merge pull request #3744 from s9e/ticket/13987
[ticket/13987] Add --dry-run option to reparser CLI
2015-07-07 17:25:28 +02:00
Tristan Darricau
d54aa190f1 Merge pull request #3623 from s9e/ticket/10620
[ticket/10620] Quote improvements
2015-07-07 09:46:36 +02:00
JoshyPHP
cf4cdcda58 [ticket/13987] Replaced optional parameter with explicit API
Added disable_save() and enable_save() to toggle a dry run

PHPBB3-13987
2015-07-06 23:45:38 +02:00
JoshyPHP
7ccb638912 [ticket/13987] Add --dry-run option to reparser CLI
PHPBB3-13987
2015-07-06 23:45:20 +02:00
Tristan Darricau
ca5d4fd310 Merge pull request #3726 from CHItA/ticket/13961
[ticket/13961] Add orderable service collections
2015-07-06 23:31:35 +02:00
Tristan Darricau
193c6d58b0 Merge pull request #3743 from s9e/ticket/13985
[ticket/13985] Updated s9e\TextFormatter
2015-07-06 23:30:20 +02:00
JoshyPHP
a44711e574 [ticket/13990] Reparse markup inside of forum rules/description
PHPBB3-13990
2015-07-06 19:17:40 +02:00
JoshyPHP
57a07f4ff7 [ticket/13985] Updated s9e\TextFormatter
PHPBB3-13985
2015-07-06 01:15:18 +02:00
JoshyPHP
353b3b4cfd [ticket/13970] Save the value of the optional [code] parameter
PHPBB3-13970
2015-06-27 12:33:44 +02:00
JoshyPHP
817db2f135 [ticket/13880] Automatically remove quotes that are nested too deep
PHPBB3-13880
2015-06-27 02:52:26 +02:00
Mate Bartus
b09293d5ff [ticket/13961] Move back service_collections under original namespace
PHPBB3-13961
2015-06-26 01:04:36 +02:00
JoshyPHP
9d364aee4a [ticket/10620] Moved quote's date to the upper corner
PHPBB3-10620
2015-06-25 22:51:44 +02:00
JoshyPHP
1f6b9bc048 [ticket/10620] Fixed functional tests to account for newlines
PHPBB3-10620
2015-06-25 22:51:43 +02:00
JoshyPHP
7ce2d996a8 [ticket/10620] Added tests
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
4f1b25706f [ticket/10620] Removed extraneous quotes from attribute values
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
f02cc27014 [ticket/10620] Implemented quote improvements
PHPBB3-10620
2015-06-25 03:11:55 +02:00
Tristan Darricau
8747c7a2c1 Merge pull request #3579 from s9e/ticket/13803
[ticket/13803] Implement a generic and scalable way to reparse rich text
2015-06-24 16:58:41 +02:00
Tristan Darricau
d430acb568 Merge pull request #3669 from s9e/ticket/13901
[ticket/13901] Add more whitespace to long quotes for readability
2015-06-24 16:34:53 +02:00
Tristan Darricau
c1b1693098 Merge pull request #3683 from s9e/ticket/13921
[ticket/13921] Fix block BBCodes inside of inline BBCodes
2015-06-24 16:28:57 +02:00
Mate Bartus
f5b476b221 [ticket/13961] Add tests for ordered collections
PHPBB3-13961
2015-06-24 13:13:13 +02:00
Mate Bartus
9dbd8f4f9b [ticket/13961] Add test to service_collection
PHPBB3-13961
2015-06-23 14:35:45 +02:00
Mate Bartus
98cb70f5d2 [ticket/13961] Move service_collection to di/service_collection namespace
PHPBB3-13961
2015-06-23 14:31:18 +02:00
Andreas Fischer
beb830df71 Merge pull request #3675 from s9e/ticket/13906
[ticket/13906] Fixed old signatures in post preview

* s9e/ticket/13906:
  [ticket/13906] Renamed test
  [ticket/13906] Added test
  [ticket/13906] Fixed old signatures in post preview
2015-06-16 14:34:44 +02:00
Andreas Fischer
65d44923b4 Merge branch '3.1.x'
* 3.1.x:
  [ticket/12952] Check obvious errors before status in functional tests
2015-06-16 14:24:35 +02:00
Marc Alexander
2503723e2f [ticket/12952] Check obvious errors before status in functional tests
This will change the output from just saying that the status did not match
the expected one to actually showing any errors before complaining about a
possible difference in the status code.

PHPBB3-12952
2015-06-16 11:10:22 +02:00
JoshyPHP
eb11c80b23 [ticket/13921] Fix block BBCodes inside of inline BBCodes
PHPBB3-13921
2015-06-13 14:27:12 +02:00
Joas Schilling
00c15c76c3 Merge branch '3.1.x' 2015-06-09 20:23:29 +02:00
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