1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

26000 Commits

Author SHA1 Message Date
Andreas Fischer
10e625d30a Merge pull request #3609 from Nicofuma/ticket/13839
[ticket/13839] Don't be dependent on the phpBB root directory name in tests

* Nicofuma/ticket/13839:
  [ticket/13839] Don't be dependent on the phpBB root directory name in tests
2015-05-14 23:17:29 +02:00
Nicofuma
2b25c5bd35 [ticket/13770] Use dummy cache driver
PHPBB3-13770
2015-05-14 23:04:27 +02:00
Nicofuma
02af9385a1 [ticket/13770] Fix tests
PHPBB3-13770
2015-05-14 23:04:23 +02:00
Tristan Darricau
549fe66d90 [ticket/13770] Update tests
PHPBB3-13770
2015-05-14 23:04:18 +02:00
Tristan Darricau
c96e7ef171 [ticket/13770] Wither interface for container_builder
PHPBB3-13770
2015-05-14 23:04:03 +02:00
Marc Alexander
0b8632e750 Merge branch '3.1.x' 2015-05-14 18:14:34 +02:00
Marc Alexander
dcb36d572d Merge pull request #3607 from Nicofuma/ticket/13830
[ticket/13830] Fix unsused used statements and catch blocks
2015-05-14 18:14:26 +02:00
Joas Schilling
502214bf06 [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()
PHPBB3-13827
2015-05-14 17:13:47 +02:00
Nicofuma
a3e487e0f8 Merge pull request #3582 from s9e/ticket/13805
[ticket/13805] Updated generate_text_for_storage() to match message_parser
2015-05-14 17:13:33 +02:00
Nicofuma
ba9ac01dc0 Merge pull request #3581 from MateBartus/ticket/13804
[ticket/13804] Make template's user dependency optional
2015-05-14 17:03:12 +02:00
Nicofuma
a26ab86dc6 Merge pull request #3577 from MateBartus/ticket/13800
[ticket/13800] Make router's extension manager dependency optional
2015-05-14 16:47:18 +02:00
Nicofuma
737affcbb2 [ticket/13839] Don't be dependent on the phpBB root directory name in tests
PHPBB3-13839
2015-05-14 16:33:39 +02:00
Nicofuma
d48e95bb3a [ticket/13829] Don't fail if the cache isn't writeable
PHPBB3-13829
2015-05-14 16:08:21 +02:00
Nicofuma
3bc2b54128 [ticket/13830] Fix unsused used statements and catch blocks
PHPBB3-13830
2015-05-14 16:02:05 +02:00
Marc Alexander
11167f6060 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-05-14 15:57:41 +02:00
Marc Alexander
d004a1c6b8 Merge pull request #3540 from RMcGirr83/ticket/13699
[ticket/13699] Add event before and after forum title in viewforum
2015-05-14 15:56:05 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style
PHPBB3-13838
2015-05-14 15:43:44 +02:00
Nicofuma
e4b30c474b [ticket/13838] Check braces for control structures
PHPBB3-13838
2015-05-14 15:40:52 +02:00
Marc Alexander
2d9bb285f9 Merge branch '3.1.x' 2015-05-14 12:57:23 +02:00
Marc Alexander
4527789e50 Merge pull request #3605 from Nicofuma/ticket/13830
[ticket/13830] Check class used in catch statements
2015-05-14 12:53:29 +02:00
JoshyPHP
f31483242b [ticket/13614] Added phpbb_pcre_utf8_support() dummy for BC
PHPBB3-13614
2015-05-11 20:48:05 +02:00
JoshyPHP
8b7a42f338 [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code.

PHPBB3-13614
2015-05-11 20:43:47 +02:00
MateBartus
281f2ef2da [ticket/13804] Remove unnecessary array_merge
PHPBB3-13804
2015-05-11 16:59:26 +02:00
Nicofuma
084aa56777 [ticket/13830] Check class used in catch statements
PHPBB3-13830
2015-05-10 21:13:36 +02:00
Marc Alexander
799d887015 Merge pull request #3602 from s9e/ticket/13828
[ticket/13828] Renamed testing doubles to avoid PHP7 keywords
2015-05-10 11:22:37 +02:00
JoshyPHP
e2bc6c8024 [ticket/13828] Renamed testing doubles to avoid PHP7 keywords
PHPBB3-13828
2015-05-10 03:04:12 +02:00
Joas Schilling
66279e1a57 [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
PHPBB3-13827
2015-05-09 20:48:14 +02:00
dragosvr92
345c25c367 [ticket/13808] search_body_form_before
Extensions may be designed to add secondary search options,
such as Google search in the search_body.html.
There are no events in the searchbody, so this should be merged.

PHPBB3-13808
2015-05-09 16:41:18 +03:00
Nicofuma
98db63e8cc Merge pull request #3599 from marc1706/ticket/13825
[ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
2015-05-08 17:37:52 +02:00
brunoais
4119be5a3d [ticket/13672] Removed bogus sting concatenation
PHPBB3-13672
2015-05-08 10:43:48 +01:00
brunoais
d4fb3996d3 [ticket/13668] Removed bogus sting concatenation
PHPBB3-13668
2015-05-08 10:41:42 +01:00
Marc Alexander
83e9cdeebc Merge branch '3.1.x' 2015-05-08 11:19:59 +02:00
Marc Alexander
b3b7f8e925 Merge pull request #3530 from VSEphpbb/ticket/13753
[ticket/13753] Add template events to forum category row headers
2015-05-08 11:19:53 +02:00
Marc Alexander
ce3aafaf1b Merge branch '3.1.x' 2015-05-08 11:16:45 +02:00
Marc Alexander
7f5f5c216b Merge pull request #3529 from rxu/ticket/13752
[ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
2015-05-08 11:16:40 +02:00
Marc Alexander
2341b28f14 Merge branch '3.1.x' 2015-05-08 11:14:23 +02:00
Marc Alexander
d741ab57a8 Merge pull request #3526 from rxu/ticket/13750
[ticket/13750] Add core event to allow modifying navlinks text
2015-05-08 11:14:17 +02:00
Marc Alexander
b1a52a5ef3 Merge branch '3.1.x' 2015-05-08 11:07:56 +02:00
Marc Alexander
7a478b27dd Merge pull request #3459 from brunoais/ticket/13664
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
2015-05-08 11:07:50 +02:00
Marc Alexander
571f6dc9b5 [ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
PHPBB3-13825
2015-05-08 11:05:01 +02:00
Marc Alexander
3f84473306 Merge branch '3.1.x' 2015-05-08 11:00:22 +02:00
Marc Alexander
4fc6e7dbc7 Merge pull request #3598 from VSEphpbb/ticket/13822
[ticket/13822] Correctly display softdelete and post detail perms
2015-05-08 10:59:40 +02:00
Matt Friedman
350786c969 [ticket/13822] Correctly display softdelete and post detail perms
PHPBB3-13822
2015-05-07 21:10:16 -07:00
Marc Alexander
d275586689 Merge branch '3.1.x' 2015-05-08 00:17:24 +02:00
Marc Alexander
1e28748c0c Merge pull request #3455 from brunoais/ticket/13660
[ticket/13660] Allow changing the query for total reports in mcp_front
2015-05-08 00:17:10 +02:00
rxu
aa1b427e45 [ticket/13648] Allow extensions using custom bbcode validation methods
PHPBB3-13648
2015-05-07 22:01:10 +07:00
rxu
a67db63a18 [ticket/13750] Add core event to allow modifying navlinks text
Add generate_forum_nav() core event in includes/functions_display.php
to allow modifying navlinks text. Use case example: extension(s) implementing
multilanguage boards including translated forum names and so on.

PHPBB3-13750
2015-05-07 21:57:27 +07:00
Andreas Fischer
d73c5f1292 Merge pull request #3568 from s9e/ticket/10268
[ticket/10268] Added regression test

* s9e/ticket/10268:
  [ticket/10268] Added regression test
2015-05-07 15:59:21 +02:00
Andreas Fischer
25f3fdebfd Merge pull request #3573 from s9e/ticket/9073
[ticket/9073] Word censoring in URLs

* s9e/ticket/9073:
  [ticket/9073] Added regression test
2015-05-07 15:52:00 +02:00
Andreas Fischer
2ebf4aa151 Merge pull request #3571 from s9e/ticket/13425
[ticket/13425] Smiley code at start of text being quoted doesn't show smiley image in quote

* s9e/ticket/13425:
  [ticket/13425] Added regression test
2015-05-07 15:46:06 +02:00