1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

26390 Commits

Author SHA1 Message Date
Tristan Darricau
385a0bb790 Merge pull request #3730 from s9e/ticket/13970
[ticket/13970] Save the value of the optional [code] parameter
2015-06-29 11:31:29 +02:00
Joas Schilling
de14c3563b Merge branch '3.1.x' 2015-06-27 14:57:30 +02:00
Joas Schilling
7b903919bf Merge pull request #3620 from VSEphpbb/ticket/13818
[ticket/13818] Add Extension and Style CDB Links into ACP Management pages
2015-06-27 14:54:33 +02:00
Mate Bartus
c80cf87b90 [ticket/13961] Allow the collection to be modified runtime
PHPBB3-13961
2015-06-27 12:49:10 +02:00
JoshyPHP
353b3b4cfd [ticket/13970] Save the value of the optional [code] parameter
PHPBB3-13970
2015-06-27 12:33:44 +02:00
Joas Schilling
8510faa767 Merge branch '3.1.x' 2015-06-27 11:14:50 +02:00
Joas Schilling
7b93df1522 Merge pull request #3714 from marc1706/ticket/13951
[ticket/13951] Make sure the page number is an integer
2015-06-27 11:14:23 +02:00
Joas Schilling
03b1b63520 Merge branch '3.1.x' 2015-06-27 11:06:30 +02:00
Joas Schilling
2237030398 Merge pull request #3725 from RMcGirr83/ticket/13962
[ticket/13962] MCP Queue dropdown for forum selection
2015-06-27 11:01:47 +02:00
Joas Schilling
5b7dab01f9 Merge branch '3.1.x' 2015-06-27 10:53:50 +02:00
Joas Schilling
dbd653327c Merge pull request #3729 from Zoddo/ticket/13967
[ticket/13967] Use HTTPS on phpbb.com links
2015-06-27 10:53:36 +02:00
JoshyPHP
d9db021af4 [ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-master
PHPBB3-13880
2015-06-27 04:34:12 +02:00
JoshyPHP
ae2237f640 [ticket/13880] Replaced the quote regexp to allow brackets
This matches the regexp used in bbcode::bbcode_cache_init()

PHPBB3-13880
2015-06-27 04:25:54 +02:00
JoshyPHP
817db2f135 [ticket/13880] Automatically remove quotes that are nested too deep
PHPBB3-13880
2015-06-27 02:52:26 +02:00
Zoddo
8bb48b575d [ticket/13967] Use HTTPS on phpbb.com links
This fix the HTTPS breaking issue on the BBCode FAQ.

PHPBB3-13967
2015-06-26 14:53:05 +02:00
Marc Alexander
9e117a9eeb Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_post.php
2015-06-26 10:25:10 +02:00
Marc Alexander
7d7b536874 Merge pull request #3728 from Crizz0/ticket/13966
[ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_…
2015-06-26 10:19:58 +02:00
Mate Bartus
b09293d5ff [ticket/13961] Move back service_collections under original namespace
PHPBB3-13961
2015-06-26 01:04:36 +02:00
JoshyPHP
9d364aee4a [ticket/10620] Moved quote's date to the upper corner
PHPBB3-10620
2015-06-25 22:51:44 +02:00
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