b5b7f455b1
Merge pull request #3572 from s9e/ticket/8419
...
[ticket/8419] Custom tag eats up space character
2015-05-20 00:10:12 +02:00
15bec23770
Merge pull request #3578 from s9e/ticket/13801
...
[ticket/13801] Remove user dependency from text_formatter.s9e.parser
2015-05-20 00:02:41 +02:00
9ccc7f4d65
Merge pull request #3597 from s9e/ticket/13614
...
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
2015-05-19 23:53:27 +02:00
5e6c026527
Merge pull request #3617 from s9e/ticket/11530
...
[ticket/11530] Remove extra quotes when depth limit is exceeded
2015-05-19 23:35:58 +02:00
2cc78b2c3b
[ticket/11530] Fixed test description [ci skip]
...
PHPBB3-11530
2015-05-19 11:16:37 +02:00
d7e2f488a4
Merge branch '3.1.x'
2015-05-19 09:44:36 +02:00
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
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
e67c5850e4
[ticket/11530] Updated s9e\TextFormatter
...
PHPBB3-11530
2015-05-18 06:49:53 +02:00
c1777f4811
[ticket/11530] Remove extra quotes when depth limit is exceeded
...
PHPBB3-11530
2015-05-18 03:57:48 +02:00
5772e06b1a
[ticket/13801] Updated event description [ci skip]
...
PHPBB3-13801
2015-05-18 02:58:33 +02:00
7b552152b4
[ticket/13801] Updated comments for clarity
...
PHPBB3-13801
2015-05-18 02:58:33 +02:00
deadc06652
[ticket/13801] Removed user dependency from text_formatter.s9e.parser
...
PHPBB3-13801
2015-05-18 02:58:33 +02:00
c967ba7b9b
Merge branch '3.1.x'
2015-05-17 20:02:29 +02:00
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
3b91b243b0
Merge branch '3.1.x'
2015-05-16 13:40:07 +02:00
e52bc2d022
Merge pull request #3606 from Nicofuma/ticket/13838
...
[ticket/13838] Check braces for control structures
2015-05-16 13:39:45 +02:00
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
c1ab364e28
Merge branch '3.1.x'
2015-05-15 17:54:10 +02:00
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
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
0b8632e750
Merge branch '3.1.x'
2015-05-14 18:14:34 +02:00
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
502214bf06
[ticket/13827] Use JsonResponse instead of our hacky json_response with exit()
...
PHPBB3-13827
2015-05-14 17:13:47 +02:00
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
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
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
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
3bc2b54128
[ticket/13830] Fix unsused used statements and catch blocks
...
PHPBB3-13830
2015-05-14 16:02:05 +02:00
11167f6060
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
2015-05-14 15:57:41 +02:00
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
62e13e945c
[ticket/13838] Fix coding style
...
PHPBB3-13838
2015-05-14 15:43:44 +02:00
e4b30c474b
[ticket/13838] Check braces for control structures
...
PHPBB3-13838
2015-05-14 15:40:52 +02:00
2d9bb285f9
Merge branch '3.1.x'
2015-05-14 12:57:23 +02:00
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
f31483242b
[ticket/13614] Added phpbb_pcre_utf8_support() dummy for BC
...
PHPBB3-13614
2015-05-11 20:48:05 +02:00
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
281f2ef2da
[ticket/13804] Remove unnecessary array_merge
...
PHPBB3-13804
2015-05-11 16:59:26 +02:00
084aa56777
[ticket/13830] Check class used in catch statements
...
PHPBB3-13830
2015-05-10 21:13:36 +02:00
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
e2bc6c8024
[ticket/13828] Renamed testing doubles to avoid PHP7 keywords
...
PHPBB3-13828
2015-05-10 03:04:12 +02:00
66279e1a57
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
...
PHPBB3-13827
2015-05-09 20:48:14 +02:00
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
83e9cdeebc
Merge branch '3.1.x'
2015-05-08 11:19:59 +02:00
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
ce3aafaf1b
Merge branch '3.1.x'
2015-05-08 11:16:45 +02:00
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
2341b28f14
Merge branch '3.1.x'
2015-05-08 11:14:23 +02:00
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
b1a52a5ef3
Merge branch '3.1.x'
2015-05-08 11:07:56 +02:00
