10089 Commits

Author	SHA1	Message	Date
Marc Alexander	39f3313534	Merge branch '3.1.x'	2015-07-17 16:15:25 +02:00
Marc Alexander	56251adc24	Merge pull request #3732 from kinerity/ticket/13974 ... [ticket/13974] Add core.mcp_change_poster_after event	2015-07-17 16:15:22 +02:00
Marc Alexander	e6e54430b9	Merge branch '3.1.x'	2015-07-16 08:35:12 +02:00
Zoddo	2e10961fff	[ticket/14014] Add core.mcp_forum_view_before event ... This event can be used to get some data in order to execute other actions. PHPBB3-14014	2015-07-15 15:55:55 +02:00
Tristan Darricau	06077d9970	[ticket/11444] BC layer ... PHPBB3-11444	2015-07-13 22:41:14 +02:00
Nicofuma	be0d4e20d4	[ticket/11444] Moving the in-board notifications to a method class ... Currently the in-board method for the notifications is hardcoded and cannot be disabled. This method should be in his own class extending `phpbb\notification\method\method_interface`. It also add the possibility, for each method, to be enabled by default (ie: no entry in the DB => notification enabled). https://tracker.phpbb.com/browse/PHPBB3-11444 https://tracker.phpbb.com/browse/PHPBB3-11967 PHPBB3-11444	2015-07-13 22:41:13 +02:00
Tristan Darricau	58d1d37c16	Merge pull request #3747 from rxu/ticket/13377 ... [ticket/13377] Fix decoding for www type URLs in function decode_message()	2015-07-13 17:36:35 +02:00
Zoddo	e69d23dc88	[ticket/14006] Add core.ucp_register_agreement event ... It allows to execute code before the agreements are displayed. PHPBB3-14006	2015-07-12 19:25:05 +02:00
Richard McGirr	629a826f5b	[ticket/14004] Add user_info to core event ... PHPBB3-14004	2015-07-12 08:30:49 -04:00
Marc Alexander	01097a24b5	Merge branch '3.1.x' ... Conflicts: tests/template/template_includecss_test.php	2015-07-08 22:54:26 +02:00
Matt Friedman	04d34e6c8b	[ticket/13995] Invalid avatar HTML missing space between elements ... PHPBB3-13995	2015-07-07 20:10:18 -07:00
CHItA	c53ce3d5fb	[ticket/13740] Fix CS and extend phpbb extensions ... [ci skip] PHPBB3-13740	2015-07-08 01:28:04 +02:00
MateBartus	5afc632bca	[ticket/13740] Core file workarounds ... [ci skip] PHPBB3-13740	2015-07-08 01:27:55 +02:00
rxu	1365519283	[ticket/13377] Fix decoding for www type URLs in function decode_message() ... PHPBB3-13377	2015-07-07 22:30:20 +07:00
Tristan Darricau	d54aa190f1	Merge pull request #3623 from s9e/ticket/10620 ... [ticket/10620] Quote improvements	2015-07-07 09:46:36 +02:00
Tristan Darricau	e4696318bd	Merge pull request #3689 from s9e/ticket/13880-fix-master ... [ticket/13880] Merge branch 'fix-3.1' into fix-master	2015-06-29 11:33:20 +02:00
Tristan Darricau	2be39c5a8f	Merge pull request #3654 from s9e/ticket/13880 ... [ticket/13880] Automatically remove quotes that are nested too deep	2015-06-29 11:33:00 +02:00
Kailey Truscott	cc23ac887c	[ticket/13974] Change userdata type from string to array ... Change the docblock for userdata from string to array. PHPBB3-13974	2015-06-28 14:31:02 -04:00
Kailey Truscott	607f2e791f	[ticket/13974] Add core.mcp_change_poster_after event ... Create a new event to perform additional tasks after chainging a post's poster. PHPBB3-13974	2015-06-28 01:14:08 -04:00
javiexin	d0cf674f33	[ticket/13911] Add events to configure options for profile fields ... Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number again. PHPBB3-13911	2015-06-27 12:45:56 +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
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
Marc Alexander	9e117a9eeb	Merge branch '3.1.x' ... Conflicts: phpBB/includes/mcp/mcp_post.php	2015-06-26 10:25:10 +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	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	f02cc27014	[ticket/10620] Implemented quote improvements ... PHPBB3-10620	2015-06-25 03:11:55 +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
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
javiexin	bd40f2f619	[ticket/13960] Profile field validation breaks ACP ... Make sure new step is calculated only if no error has been identified during validation. Also, cleanup redundant code in acp_profile.php. PHPBB3-13960	2015-06-23 11:02:08 +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
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
Marc Alexander	ef890e3363	Merge branch '3.1.x'	2015-06-17 15:39:12 +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
Marc Alexander	80768b526b	Merge branch '3.1.x' ... Conflicts: phpBB/phpbb/user_loader.php	2015-06-16 12:35:51 +02:00
Marc Alexander	dc9245dd7a	Merge pull request #3653 from callumacrae/ticket/13882 ... [ticket/13882] Lazy load the notification avatars.	2015-06-16 12:33:17 +02:00
Andreas Fischer	2eceaaddf6	Merge branch '3.1.x' ... * 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table	2015-06-13 16:27:44 +02:00
Andreas Fischer	89f7fc63e8	Merge pull request #3703 from javiexin/ticket/10711 ... [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table	2015-06-13 16:27:44 +02:00
javiexin	7b026eff79	[ticket/10711] Duplicate key error on forum_tracks_table ... In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY' in the forums_track table is produced when marking forums read (viewforum.php?f=xx&mark=forums). The problem happens when there are duplicates in the forum_id array. The solution is to remove those duplicates. PHPBB3-10711	2015-06-13 01:08:18 +02:00
Joas Schilling	9238d28353	[3.1.x] Update dev version to 3.1.6-RC1	2015-06-11 23:25:43 +02:00
Joas Schilling	7bb617eeb6	Merge branch 'prep-release-3.1.5' into 3.1.x	2015-06-11 23:24:02 +02:00