Marc Alexander
abef078ab9
[ticket/12542] Use more specific CSS for drag-n-drop
...
Otherwise the CSS gets overwritten by other CSS rules.
PHPBB3-12542
2015-05-28 11:04:22 +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
Marc Alexander
cc134d5fed
Merge pull request #3631 from rxu/ticket/13868
...
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
2015-05-28 10:42:40 +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
Andreas Fischer
e62eafb77b
Merge pull request #3627 from imkingdavid/ticket/13769
...
[ticket/13769] Move environment check in phpbbcli.php lower
* imkingdavid/ticket/13769:
[ticket/13769] Move environment check lower in phpbbcli.php
2015-05-26 20:44:26 +02:00
JoshyPHP
64e1824abd
[ticket/13847] Updated ucp_pm_compose to use utils when forwarding
...
PHPBB3-13847
2015-05-25 21:33:17 +02:00
JoshyPHP
2a7a06da2a
[ticket/13847] Updated ucp_pm_compose to use the utils service
...
...when quoting a post
PHPBB3-13847
2015-05-25 21:33:17 +02:00
JoshyPHP
e50d9186ce
[ticket/13847] Changed enquote() logic to use whichever is the shortest
...
Will enclose attribute values in single- or double- quotes depending on
whichever requires the least escaping. Characters that need to be escaped
are always escaped regardless.
PHPBB3-13847
2015-05-25 21:33:17 +02:00
JoshyPHP
8a077e0e94
[ticket/13847] Move quote generation to text_formatter.utils
...
PHPBB3-13847
2015-05-25 21:33:17 +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
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
Nicofuma
7a65b0cc4e
[ticket/13849] Fix development environment
...
PHPBB3-13849
2015-05-19 21:59:41 +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
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
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
Joas Schilling
80be642a0b
[ticket/13844] Fix language file so the tests pass
...
PHPBB3-13844
2015-05-16 23:13:50 +02:00
Joas Schilling
f6c246f889
[ticket/13844] Add a functional test that browses the help pages
...
PHPBB3-13844
2015-05-16 23:08:42 +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