Commit graph

27209 commits

Author SHA1 Message Date
JoshyPHP
8a077e0e94 [ticket/13847] Move quote generation to text_formatter.utils
PHPBB3-13847
2015-05-25 21:33:17 +02:00
alf007
6025c40cab Merge pull request #1 from phpbb/develop-ascraeus
Develop ascraeus
2015-05-25 00:14:48 +02:00
David King
06d31abda9 [ticket/13769] Move environment check lower in phpbbcli.php
PHPBB3-13769
2015-05-23 17:26:52 -04:00
JoshyPHP
3f52429e3d [ticket/11742] Added test
PHPBB3-11742
2015-05-23 19:18:02 +02:00
JoshyPHP
ebda279bea [ticket/11742] Updated s9e\TextFormatter
PHPBB3-11742
2015-05-23 19:17:55 +02:00
Marc Alexander
622d5b2643 [ticket/12542] Do not use browser specific css for outline
Also, the CSS selector for the drag'n'drop was simplified to only use the
class.

PHPBB3-12542
2015-05-23 10:51:04 +02:00
JoshyPHP
adbc45b486 [ticket/11742] Removed whitespace collapsing in codebox [ci skip]
PHPBB3-11742
2015-05-23 01:55:05 +02:00
JoshyPHP
ad84a40c00 [ticket/11742] Updated default formatting tests to match the new default
PHPBB3-11742
2015-05-23 01:55:04 +02:00
JoshyPHP
92078dce33 [ticket/11742] Removed tabs-to-space conversion in [code]
PHPBB3-11742
2015-05-23 01:55:04 +02: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
Joas Schilling
077051fef5 [ticket/13844] Add events
PHPBB3-13844
2015-05-20 20:11:52 +02:00
Marc Alexander
b7a89187b5 [ticket/12542] Properly check if textarea is undefined or null
PHPBB3-12542
2015-05-20 15:47:26 +02: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
Marc Alexander
0e5d1decbf [ticket/13832] Use preg_replace_callback in check_flash_bbcodes
PHPBB3-13832
2015-05-20 09:03:59 +02:00
Marc Alexander
91cace06a5 [ticket/13832] Resolve minor coding issues
PHPBB3-13832
2015-05-20 08:59:19 +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
fda5a83b6d Merge pull request #3569 from s9e/ticket/13641
[ticket/13641] Proper parsing of custom BBCode for inline code
2015-05-20 00:21:59 +02:00
Nicofuma
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
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
b9ff0bbba4 [ticket/13849] Fix tests
PHPBB3-13849
2015-05-19 23:11:14 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs
PHPBB3-13790
2015-05-19 22:19:18 +02:00
Nicofuma
7a65b0cc4e [ticket/13849] Fix development environment
PHPBB3-13849
2015-05-19 21:59:41 +02:00
Marc Alexander
358c634153 [ticket/13832] Remove unused global from bbcode_init()
PHPBB3-13832
2015-05-19 17:26:01 +02:00
Marc Alexander
e8602d4203 [ticket/13832] Use preg_replace_callback in ucp_pm_options
PHPBB3-13832
2015-05-19 16:30:52 +02:00
Marc Alexander
3106195cdd [ticket/13832] Use preg_replace_callback in bbcode class
PHPBB3-13832
2015-05-19 16:29:50 +02:00
Marc Alexander
a430fef05b [ticket/13832] Use preg_replace_callback in acp_bbcodes
PHPBB3-13832
2015-05-19 16:29:10 +02:00
Marc Alexander
5796584611 [ticket/13832] Fix code sniffer errors in message_parser.php
PHPBB3-13832
2015-05-19 14:15:37 +02:00
JoshyPHP
2cc78b2c3b [ticket/11530] Fixed test description [ci skip]
PHPBB3-11530
2015-05-19 11:16: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
6dcc14bc58 [ticket/13844] Add unit tests for the help manager
PHPBB3-13844
2015-05-17 21:45:18 +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