Commit graph

25179 commits

Author SHA1 Message Date
Marc Alexander
5796584611 [ticket/13832] Fix code sniffer errors in message_parser.php
PHPBB3-13832
2015-05-19 14:15:37 +02:00
Tristan Darricau
d7e2f488a4 Merge branch '3.1.x' 2015-05-19 09:44:36 +02:00
Tristan Darricau
1d2a127144 Merge pull request #3619 from javiexin/ticket/13852
[ticket/13852] Consistent tab navigation when login in
2015-05-19 09:43:29 +02:00
Marc Alexander
1494c54803 [ticket/13832] Do not use e modifier for bbcodes in message_parser
PHPBB3-13832
2015-05-18 21:43:25 +02:00
javiexin
cb12a065df [ticket/13852] Consistent tab navigation when login in
Added tabindex attribute to input elements in index_body.html to make
tab navigation consistent with that of login_body.html.

PHPBB3-13852
2015-05-18 19:38:48 +02:00
Marc Alexander
2911c01683 [ticket/13832] Remove e modifier from bold bbcode
PHPBB3-13832
2015-05-18 19:03:25 +02:00
Marc Alexander
8a5c0965d3 [ticket/13832] Allow callables for matching bbcodes
PHPBB3-13832
2015-05-18 19:02:49 +02:00
Marc Alexander
1076b562dd [ticket/13832] Do not use e modifier in message_parser
PHPBB3-13832
2015-05-18 17:59:21 +02:00
Marc Alexander
71f5c9c327 [ticket/13832] Use preg_replace_callback instead of /e modifier
PHPBB3-13832
2015-05-18 17:19:29 +02:00
JoshyPHP
e67c5850e4 [ticket/11530] Updated s9e\TextFormatter
PHPBB3-11530
2015-05-18 06:49:53 +02:00
JoshyPHP
c1777f4811 [ticket/11530] Remove extra quotes when depth limit is exceeded
PHPBB3-11530
2015-05-18 03:57:48 +02:00
JoshyPHP
5772e06b1a [ticket/13801] Updated event description [ci skip]
PHPBB3-13801
2015-05-18 02:58:33 +02:00
JoshyPHP
7b552152b4 [ticket/13801] Updated comments for clarity
PHPBB3-13801
2015-05-18 02:58:33 +02:00
JoshyPHP
deadc06652 [ticket/13801] Removed user dependency from text_formatter.s9e.parser
PHPBB3-13801
2015-05-18 02:58:33 +02:00
Joas Schilling
8ce0a64a16 [ticket/13844] Remove hacky code for the help array
PHPBB3-13844
2015-05-17 21:18:17 +02:00
Nicofuma
c967ba7b9b Merge branch '3.1.x' 2015-05-17 20:02:29 +02:00
Nicofuma
309a6b9313 Merge pull request #3601 from nickvergessen/ticket/13827
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
2015-05-17 20:01:18 +02:00
rxu
73fd75abf1 [ticket/13846] Fix softdelete feature workflow in viewtopic
Changes:
- For permanent deletion of softdeleted post, disapprove mode has been changed
to delete mode;
- If post delete and softdelete are allowed, delete button triggers softdelete
mode;
- If a user can't permanently delete posts but can restore softdeleted posts,
delete button won't be displayed for softdeleted posts.
Subsilver2 is unaffected.

PHPBB3-13846
2015-05-17 21:52:30 +07:00
Joas Schilling
80be642a0b [ticket/13844] Fix language file so the tests pass
PHPBB3-13844
2015-05-16 23:13:50 +02:00
Joas Schilling
07231e7943 [ticket/13844] FAQ in new controller format
PHPBB3-13844
2015-05-16 22:09:05 +02:00
Joas Schilling
ff7e9dc912 [ticket/13844] Refactor bbcode help to the new system
PHPBB3-13844
2015-05-16 22:09:04 +02:00
Joas Schilling
5586cbbcfe [ticket/13844] Add new versions of the old help_* files
PHPBB3-13844
2015-05-16 22:09:02 +02:00
Joas Schilling
e7321c9e55 [ticket/13844] Add a little develop script to migrate the files
PHPBB3-13844
2015-05-16 22:09:00 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Joas Schilling
e52bc2d022 Merge pull request #3606 from Nicofuma/ticket/13838
[ticket/13838] Check braces for control structures
2015-05-16 13:39:45 +02:00
Oliver Schramm
cddecec146 Merge pull request #3591 from Nicofuma/ticket/12632
[ticket/12632] Add twig.debug and twig.auto_reload in config.yml
2015-05-16 00:30:19 +02:00
Oliver Schramm
c1ab364e28 Merge branch '3.1.x' 2015-05-15 17:54:10 +02:00
Oliver Schramm
1c0c9c1bca Merge pull request #3563 from rxu/ticket/13791
[ticket/13791] Add more post buttons template events to viewtopic_body.html
2015-05-15 17:52:44 +02:00
JoshyPHP
f7ad2c2b32 [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authors
PHPBB3-13680
2015-05-15 02:12:52 +02:00
JoshyPHP
f5ce9f2738 [ticket/13680] Updated quote notifications
Added get_quote_authors() to text_formatter.utils service to retrieve
the names used in first-level quotes

PHPBB3-13680
2015-05-15 02:10:46 +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
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
d48e95bb3a [ticket/13829] Don't fail if the cache isn't writeable
PHPBB3-13829
2015-05-14 16:08:21 +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
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
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