Commit graph

26371 commits

Author SHA1 Message Date
JoshyPHP
1f6b9bc048 [ticket/10620] Fixed functional tests to account for newlines
PHPBB3-10620
2015-06-25 22:51:43 +02:00
JoshyPHP
5a55ce3f68 [ticket/10620] Add more whitespace to long quotes in JS
PHPBB3-10620
2015-06-25 22:51:43 +02:00
JoshyPHP
4c9507e20a [ticket/10620] Fixed some stylistic issues in JS
PHPBB3-10620
2015-06-25 22:51:40 +02:00
Crizzo
ef6af2682b [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post
PHPBB3-13966
2015-06-25 22:22:56 +02:00
JoshyPHP
7ce2d996a8 [ticket/10620] Added tests
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
4f1b25706f [ticket/10620] Removed extraneous quotes from attribute values
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
129b3375ae [ticket/10620] Added enhanced quotes in pm history
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
06936bda05 [ticket/10620] Added enhanced quotes in topic review
Added support for enhanced quotes in topic_review's quote button.
NOTE: the UI doesn't appear to be testable via PhantomJS.

PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
c934b8f150 [ticket/10620] Updated docblock
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
f02cc27014 [ticket/10620] Implemented quote improvements
PHPBB3-10620
2015-06-25 03:11:55 +02:00
Tristan Darricau
8747c7a2c1 Merge pull request #3579 from s9e/ticket/13803
[ticket/13803] Implement a generic and scalable way to reparse rich text
2015-06-24 16:58:41 +02:00
Tristan Darricau
6bcf12a558 Merge pull request #3618 from marc1706/ticket/13832
[ticket/13832] Use preg_replace_callback instead of /e modifier
2015-06-24 16:36:15 +02:00
Tristan Darricau
d430acb568 Merge pull request #3669 from s9e/ticket/13901
[ticket/13901] Add more whitespace to long quotes for readability
2015-06-24 16:34:53 +02:00
Tristan Darricau
c1b1693098 Merge pull request #3683 from s9e/ticket/13921
[ticket/13921] Fix block BBCodes inside of inline BBCodes
2015-06-24 16:28:57 +02:00
Mate Bartus
050de400d7 [ticket/13961] Fix compatibility issue with parent class
PHPBB3-13961
2015-06-24 15:35:47 +02:00
Mate Bartus
a34a65afdc [ticket/13691] Add services when the iterator requested
PHPBB3-13691
2015-06-24 15:15:38 +02:00
Mate Bartus
f5b476b221 [ticket/13961] Add tests for ordered collections
PHPBB3-13961
2015-06-24 13:13:13 +02:00
Mate Bartus
a91c4e4f96 [ticket/13961] Add ordered service collection
PHPBB3-13961
2015-06-24 13:08:19 +02:00
Marc Alexander
510f704bc8 Merge branch '3.1.x' 2015-06-24 08:54:50 +02:00
Marc Alexander
84bbd4490e Merge pull request #3538 from RMcGirr83/ticket/13759
[ticket/13759] Take post_time into account
2015-06-24 08:54:45 +02:00
Marc Alexander
58b40945b0 Merge branch '3.1.x' 2015-06-24 08:52:05 +02:00
Marc Alexander
11e312f41c Merge pull request #3528 from RMcGirr83/ticket/13598
[ticket/13598] Allow topic lock on topic creation
2015-06-24 08:51:57 +02:00
RMcGirr83
2ec5c5de17 [ticket/13962] MCP Queue dropdown for forum selection
PHPBB3-13962
2015-06-23 13:26:47 -04:00
Mate Bartus
9dbd8f4f9b [ticket/13961] Add test to service_collection
PHPBB3-13961
2015-06-23 14:35:45 +02:00
Mate Bartus
98cb70f5d2 [ticket/13961] Move service_collection to di/service_collection namespace
PHPBB3-13961
2015-06-23 14:31:18 +02:00
Andreas Fischer
8213f24b35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13952] Fix docblocks
  [ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
Andreas Fischer
d43da6cee9 Merge pull request #3721 from rxu/ticket/13952
[ticket/13952] Inject event dispatcher dependency to the tidy search cron task

* rxu/ticket/13952:
  [ticket/13952] Fix docblocks
  [ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
Andreas Fischer
759eb29215 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13948] Correctly forwarding to the RIR for whois feature
2015-06-21 21:53:03 +02:00
Andreas Fischer
abf98f92e6 Merge pull request #3722 from rxu/ticket/13948
[ticket/13948] Correctly forwarding to the RIR for whois feature

* rxu/ticket/13948:
  [ticket/13948] Correctly forwarding to the RIR for whois feature
2015-06-21 21:53:03 +02:00
rxu
bcac964cd0 [ticket/13948] Correctly forwarding to the RIR for whois feature
Allow any space count in the ReferralServer string for whois services response.

PHPBB3-13948
2015-06-21 15:48:28 +07:00
rxu
e0476d4f53 [ticket/13952] Fix docblocks
PHPBB3-13952
2015-06-20 23:41:53 +07:00
rxu
a8fe3926dc [ticket/13952] Inject dispatcher dependency to the tidy search cron task
PHPBB3-13952
2015-06-20 21:39:06 +07:00
Marc Alexander
4aba193131 Merge branch '3.1.x' 2015-06-19 10:39:40 +02:00
Marc Alexander
da7b24449d Merge pull request #3715 from marc1706/ticket/13949
[ticket/13949] Replace colon with colon lang key in memberlist search page
2015-06-19 10:39:33 +02:00
Raphaël M
c083a4adda [ticket/13949] Replace colon with colon lang key in memberlist search page
[ticket/13949] Replace colon with colon lang key in memberlist search
page

PHPBB3-13949
2015-06-19 09:52:33 +02:00
Marc Alexander
783a156bd2 [ticket/13951] Make sure the page number is an integer
PHPBB3-13951
2015-06-18 09:22:07 +02:00
Marc Alexander
1b354ae468 Merge branch '3.1.x' 2015-06-17 16:02:47 +02:00
Marc Alexander
a259d61f57 Merge pull request #3649 from callumacrae/ticket/13879
[ticket/13879] Replaced px with em where appropriate.
2015-06-17 16:02:41 +02:00
Marc Alexander
ef890e3363 Merge branch '3.1.x' 2015-06-17 15:39:12 +02:00
Marc Alexander
8b28881aa2 Merge pull request #3712 from VSEphpbb/ticket/13882
[ticket/13882] Add lazy load avatars to phpbb avatar wrappers
2015-06-17 15:39:06 +02:00
Marc Alexander
9f17e224c4 Merge pull request #3708 from s9e/ticket/13946
[ticket/13946] Increase the CSS margin around [code] and [list]
2015-06-17 15:32:29 +02:00
Tristan Darricau
ceed27fe27 Merge pull request #3661 from marc1706/ticket/6466
[ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
2015-06-17 10:07:12 +02:00
Matt Friedman
4f05364eb9 [ticket/13882] Add lazy load avatars to phpbb wrappers
PHPBB3-13882
2015-06-16 11:58:31 -07:00
Andreas Fischer
9296c75738 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13903] Replacing regexp path naming for container by md5.

Conflicts:
	phpBB/phpbb/di/container_builder.php
2015-06-16 20:06:28 +02:00
Andreas Fischer
0bab5db1dd Merge pull request #3711 from bantu/ticket/13903
[ticket/13903] Replacing regexp path naming for container by md5.

* bantu/ticket/13903:
  [ticket/13903] Replacing regexp path naming for container by md5.
2015-06-16 20:03:31 +02:00
Wardormeur
08a6f663de [ticket/13903] Replacing regexp path naming for container by md5.
Replacement of the path creation based on a blacklist by a md5 filename to
support broader configurations

PHPBB3-13903
2015-06-16 18:29:41 +02:00
JoshyPHP
4be0730898 [ticket/13946] Changed [list] margin to match [code]
PHPBB3-13946
2015-06-16 17:20:14 +02:00
Andreas Fischer
beb830df71 Merge pull request #3675 from s9e/ticket/13906
[ticket/13906] Fixed old signatures in post preview

* s9e/ticket/13906:
  [ticket/13906] Renamed test
  [ticket/13906] Added test
  [ticket/13906] Fixed old signatures in post preview
2015-06-16 14:34:44 +02:00
Andreas Fischer
65fef50869 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13931] Wrong order in docs/events.md

Conflicts:
	phpBB/docs/events.md
2015-06-16 14:32:01 +02:00
Andreas Fischer
e8769fd561 Merge pull request #3695 from javiexin/ticket/13931
[ticket/13931] Wrong order in docs/events.md

* javiexin/ticket/13931:
  [ticket/13931] Wrong order in docs/events.md

Conflicts:
	phpBB/docs/events.md
2015-06-16 14:29:18 +02:00