Marc Alexander
|
cdc86b3540
|
Merge branch '3.1.x'
Conflicts:
phpBB/docs/events.md
|
2015-05-28 12:42:56 +02:00 |
|
Marc Alexander
|
16deefa7f8
|
Merge pull request #3635 from nickvergessen/ticket/13808
[ticket/13808] Fix version
|
2015-05-28 12:40:29 +02:00 |
|
Joas Schilling
|
0daa999fd0
|
[ticket/13808] Fix version
PHPBB3-13808
|
2015-05-28 12:34:21 +02:00 |
|
Cesar G
|
0f040225d6
|
[ticket/13871] Fix call to undefined member function on non-object error.
PHPBB3-13871
|
2015-05-28 11:53:35 +02:00 |
|
Cesar G
|
30d39687de
|
Merge branch '3.1.x'
* 3.1.x:
[ticket/13787] Remove duplicate entry of poll_delete in prosilver template
|
2015-05-28 11:17:20 +02:00 |
|
Cesar G
|
080690073a
|
Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.x
* Wolfsblvt/ticket/13787:
[ticket/13787] Remove duplicate entry of poll_delete in prosilver template
|
2015-05-28 11:16:22 +02:00 |
|
Joas Schilling
|
c5b2822cf5
|
Merge branch '3.1.x'
* 3.1.x:
[ticket/13808] search_body_form_before
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
|
2015-05-28 11:09:24 +02:00 |
|
Joas Schilling
|
8fda16527e
|
Merge pull request #3600 from dragosvr92/ticket/13808
[ticket/13808] search_body_form_before
|
2015-05-28 11:05:32 +02:00 |
|
Joas Schilling
|
95b3b4605a
|
Merge branch '3.1.x'
|
2015-05-28 10:49:45 +02:00 |
|
Joas Schilling
|
7580798a5a
|
Merge pull request #3435 from rxu/ticket/13648
[ticket/13648] Allow extensions using custom bbcode validation methods
|
2015-05-28 10:49:33 +02:00 |
|
Marc Alexander
|
2ee9baa3d0
|
Merge branch '3.1.x'
|
2015-05-28 10:42:43 +02:00 |
|
rxu
|
33239183ae
|
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
PHPBB3-13868
|
2015-05-27 02:15:12 +07:00 |
|
David King
|
06d31abda9
|
[ticket/13769] Move environment check lower in phpbbcli.php
PHPBB3-13769
|
2015-05-23 17:26:52 -04:00 |
|
Marc Alexander
|
6337407192
|
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
|
2015-05-22 11:51:25 +02:00 |
|
Marc Alexander
|
5ca77df084
|
Merge pull request #3624 from VSEphpbb/ticket/13861
[ticket/13861] Fix undefined variables in style update migration
|
2015-05-22 11:49:07 +02:00 |
|
Matt Friedman
|
67502c0d22
|
[ticket/13861] Fix undefined variables in style update migration
PHPBB3-13861
|
2015-05-21 15:23:17 -07:00 |
|
Marc Alexander
|
466b710235
|
Merge pull request #3608 from Nicofuma/ticket/13829
[ticket/13829] Don't fail if the cache isn't writeable
|
2015-05-20 10:53:16 +02:00 |
|
Marc Alexander
|
023f15f5fe
|
Merge pull request #3621 from Nicofuma/ticket/13849
[ticket/13849] Fix development environment
|
2015-05-20 09:32:10 +02:00 |
|
Nicofuma
|
c5493c2bb8
|
Merge pull request #3586 from s9e/ticket/13680
[ticket/13680] Updated quote notifications
|
2015-05-20 00:38:49 +02:00 |
|
Nicofuma
|
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 |
|
Nicofuma
|
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 |
|
Nicofuma
|
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 |
|
Nicofuma
|
7a65b0cc4e
|
[ticket/13849] Fix development environment
PHPBB3-13849
|
2015-05-19 21:59:41 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|