4040 Commits

Author	SHA1	Message	Date
Marc Alexander	1656ca4011	Merge branch '3.2.x'	2017-12-27 18:16:29 +01:00
Marc Alexander	9632294730	Merge pull request #5046 from JoshyPHP/ticket/15457 ... [ticket/15457] Updated s9e/text-formatter dependency	2017-12-27 18:11:18 +01:00
Marc Alexander	93beaa8a3a	Merge branch '3.2.x'	2017-12-27 14:39:46 +01:00
Marc Alexander	6acfe2a0cb	Merge pull request #4868 from javiexin/ticket/15266 ... [ticket/15266] Fix events in content_visibility	2017-12-27 14:15:27 +01:00
Marc Alexander	dc48f28da1	[ticket/15266] Update since, add changed, and use empty where applicable ... PHPBB3-15266	2017-12-27 13:28:04 +01:00
javiexin	bd81af3b9e	[ticket/15266] Expand functionality of content_visibility ... Added new function "is_visible", and replaced several immediate uses of the above, including a single event in the new function to handle change in all places consistently, and much simpler. PHPBB3-15266	2017-12-27 13:27:38 +01:00
Oliver Schramm	1702219629	Merge branch 'ticket/15339' into ticket/15339-33	2017-12-24 19:55:46 +01:00
Oliver Schramm	2b16b7cada	[ticket/15339] Fix tests ... PHPBB3-15339	2017-12-24 19:55:03 +01:00
hubaishan	34d52a131b	[ticket/14857] Throw S from dateformat for non English languages ... Throw `S` (ordinal suffix) from dateformat for non English languages PHPBB3-14857	2017-12-24 10:31:30 +01:00
Marc Alexander	843586a93f	Merge branch '3.2.x'	2017-12-23 13:23:07 +01:00
Marc Alexander	cb233c862b	Merge pull request #5036 from JoshyPHP/ticket/15442 ... [ticket/15442] Allow unsafe HTML in bbcode.html	2017-12-23 13:23:01 +01:00
Marc Alexander	7ef4be39a5	Merge branch '3.2.x'	2017-12-22 19:52:21 +01:00
Marc Alexander	e2e47a87c3	Merge pull request #5032 from rxu/ticket/15224 ... [ticket/15224] Fix some MySQL fulltext index searching errors	2017-12-22 19:45:16 +01:00
Marc Alexander	4e045ed767	[ticket/15322] Try to make new email setting more readable ... PHPBB3-15322	2017-12-13 21:31:07 +01:00
Marc Alexander	9f055e1af3	[ticket/15322] Add config setting for -f parameter & remove mail function name ... The -f parameter can now be added via configuration in the ACP. Addtionally, the config setting for the mail function name has been removed. PHPBB3-15322	2017-12-11 21:56:21 +01:00
JoshyPHP	485a4a75b2	[ticket/15444] Add a migration to merge duplicate BBCodes ... PHPBB3-15444	2017-12-10 04:00:18 +01:00
JoshyPHP	75e7e7b293	[ticket/15468] Add a service to merge duplicate BBCodes ... PHPBB3-15468	2017-12-10 02:57:07 +01:00
JoshyPHP	b9dce3fa65	[ticket/15457] Updated s9e/text-formatter dependency ... PHPBB3-15457	2017-12-10 02:55:10 +01:00
Derk	9a5d03ce72	Merge pull request #4962 from rubencm/ticket/14972 ... [ticket/14972] replace all occurrences of sizeof() with the count()	2017-12-03 23:58:34 +01:00
Marc Alexander	0568c4a502	Merge branch '3.2.x'	2017-12-03 17:49:43 +01:00
Marc Alexander	551c3fd511	Merge pull request #5025 from hubaishan/ticket/15433 ... [ticket/15433] Fix phpbbcli can enable non-existent extension	2017-12-03 17:49:39 +01:00
hubaishan	03b3b38db1	[ticket/15433] Fix phpbbcli can enable non-existent extension ... Fix phpbbcli can enable non-existent extension PHPBB3-15433	2017-12-03 15:01:31 +01:00
Marc Alexander	206c6b2185	Merge branch '3.2.x'	2017-11-26 18:33:59 +01:00
JoshyPHP	a7664811dd	[ticket/15464] Detect BBCodes in uppercase when reparsing ... PHPBB3-15464	2017-11-23 16:25:48 +01:00
Oliver Schramm	719a49d387	[ticket/15339] Free sql results in migration module tool ... PHPBB3-15339	2017-11-17 01:31:31 +01:00
Oliver Schramm	aa961991fd	[ticket/15339] Allow a module to have multiple parents ... Also restore old behaviour from Olympus regarding re-sorting modules PHPBB3-15339	2017-11-17 01:29:38 +01:00
Marc Alexander	c123254242	Merge branch '3.2.x'	2017-11-16 22:11:11 +01:00
Marc Alexander	0517e43dff	Merge pull request #4976 from rubencm/ticket/15171 ... [ticket/15171] Replace all BBCode templates by default	2017-11-16 21:56:57 +01:00
Máté Bartus	cd757469a6	Merge branch '3.2.x'	2017-11-15 21:45:10 +01:00
Máté Bartus	1a1a2dc046	Merge pull request #4949 from marc1706/ticket/15353 ... [ticket/15353] Make sure users can continue update after merging file diff	2017-11-15 21:44:53 +01:00
JoshyPHP	288def143c	[ticket/15442] Allow unsafe HTML in bbcode.html ... PHPBB3-15442	2017-11-07 10:34:11 +01:00
rxu	f9b9d659a1	[ticket/15224] Fix some MySQL fulltext index searching errors ... PHPBB3-15224	2017-11-04 19:14:04 +07:00
Marc Alexander	c309b4cd8d	Merge branch '3.2.x'	2017-11-01 18:02:14 +01:00
Marc Alexander	22e97296af	Merge pull request #5019 from marc1706/ticket/14994 ... [ticket/14994] Refactor template->assign_block_var	2017-11-01 17:23:33 +01:00
Marc Alexander	a3fd51ae47	Merge branch '3.2.x'	2017-11-01 15:59:09 +01:00
Marc Alexander	44277d6a0d	Merge pull request #5013 from rxu/ticket/15419 ... [ticket/15419] Fix Sphinx UTF8 search in delta index	2017-11-01 15:59:05 +01:00
javiexin	a30693a594	[ticket/14994] Refactor template->assign_block_var ... Refactor assign_block_var to use the same block selection mechanism as is used in alter_block_array. This allows creating new blocks at any position in the template structure, not only on the last block. Allows selecting a block as outer[2].middle. Added tests. Added PHP 7.2 compatibility. PHPBB3-14994	2017-11-01 12:29:49 +01:00
javiexin	c2043e47da	[ticket/14994] Refactor template->assign_block_var ... Refactor assign_block_var to use the same block selection mechanism as is used in alter_block_array. This allows creating new blocks at any position in the template structure, not only on the last block. Allows selecting a block as outer[2].middle. Added tests. Added PHP 7.2 compatibility. PHPBB3-14994	2017-11-01 12:29:49 +01:00
Marc Alexander	e157d8890b	Merge pull request #5020 from marc1706/ticket/15424 ... [ticket/15424] Multiple typo fixes in docs & comments	2017-11-01 12:27:13 +01:00
Marc Alexander	14cb1b9cfc	Merge branch '3.2.x'	2017-11-01 12:19:46 +01:00
Marc Alexander	c14cc433b7	Merge pull request #4988 from Elsensee/ticket/15389 ... [ticket/15389] Allow arrays in event dispatcher	2017-11-01 12:00:23 +01:00
Marc Alexander	6259789e02	Merge branch '3.2.x'	2017-11-01 10:40:01 +01:00
Marc Alexander	a6c5204cbd	Merge pull request #4973 from DavidIQ/ticket/15372 ... [ticket/15372] Add permission for listing topics without being able to read them	2017-11-01 10:39:56 +01:00
Marc Alexander	28df230f8d	Merge branch '3.2.x'	2017-10-31 16:13:39 +01:00
Marc Alexander	131c264492	Merge pull request #4985 from senky/ticket/13150 ... [ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after	2017-10-31 16:13:34 +01:00
Rubén Calvo	4bf0f4a50f	[ticket/15171] Add migration ... PHPBB3-15171	2017-10-31 14:37:36 +01:00
Rubén Calvo	3bfd006e77	[ticket/15171] Fix texformatter ... PHPBB3-15171	2017-10-31 14:30:45 +01:00
Marc Alexander	ea23d456d5	Merge branch '3.2.x'	2017-10-31 09:58:33 +01:00
Marc Alexander	fbbd1713d7	Merge pull request #4969 from Elsensee/ticket/15245 ... [ticket/15245] Fix images in feeds when accessing via app.php	2017-10-31 09:58:29 +01:00
Marc Alexander	0c009e3feb	Merge pull request #4959 from rubencm/ticket/15366 ... [ticket/15366] Remove useless code	2017-10-29 22:09:49 +01:00