1640 Commits

Author	SHA1	Message	Date
Marc Alexander	6e9c5c6769	Merge pull request #5336 from rubencm/ticket/12629 ... [ticket/12629] Add debug.errors_show	2018-12-03 21:18:59 +01:00
Marc Alexander	06a3bfd203	Merge branch '3.2.x'	2018-11-11 14:03:27 +01:00
Ruben Calvo	31703585cb	[ticket/15860] Unique_id() return 16 characters again ... PHPBB3-15860	2018-10-31 10:41:57 +00:00
Ruben Calvo	1f14f7c327	[ticket/15860] Fix format of backup files ... PHPBB3-15860	2018-10-30 11:18:34 +00:00
Marc Alexander	ecf343f577	Merge branch 'master' into ticket/12629	2018-10-26 10:16:04 +02:00
Marc Alexander	fbe0f81718	Merge branch '3.2.x'	2018-10-13 16:31:09 -07:00
Marc Alexander	2fcf49c839	Merge pull request #5381 from senky/ticket/15616 ... [ticket/15616] Remove jumpbox from login_forum.html	2018-10-13 16:31:02 -07:00
Marc Alexander	a70aa74dd1	Merge branch '3.2.x'	2018-10-10 22:49:14 +02:00
Marc Alexander	40332ecfcc	Merge pull request #5374 from senky/ticket/15758 ... [ticket/15758] Show translated msg for INSECURE_REDIRECT	2018-10-10 22:49:08 +02:00
Marc Alexander	8b6eddd50b	Merge branch '3.2.x'	2018-10-09 22:59:16 +02:00
Marc Alexander	6087f0347c	Merge pull request #5377 from senky/ticket/15700 ... [ticket/15700] Use correct T_THEME_LANG_NAME	2018-10-09 22:58:32 +02:00
Marc Alexander	466d331fec	Merge pull request #5313 from senky/ticket/12628 ... [ticket/12628] Introduce debug.memory	2018-10-09 14:05:42 +02:00
Marc Alexander	0b16ded3ca	Merge branch '3.2.x'	2018-10-08 22:28:06 +02:00
Marc Alexander	6e61804e45	Merge pull request #5370 from senky/ticket/15805 ... [ticket/15805] Add result to core.login_box_redirect	2018-10-08 22:27:55 +02:00
Jakub Senko	d29d4389f9	[ticket/15758] Show translated msg for INSECURE_REDIRECT ... PHPBB3-15758	2018-09-28 12:27:55 +02:00
Jakub Senko	f82e0a83d1	[ticket/15616] Add jumpbox to login_forum.html ... PHPBB3-15616	2018-09-26 16:29:43 +02:00
Jakub Senko	dab4c10c2f	[ticket/15700] Use correct T_THEME_LANG_NAME ... PHPBB3-15700	2018-09-25 15:24:34 +02:00
Jakub Senko	1d0fdc446f	[ticket/15805] Add result to core.login_box_redirect ... PHPBB3-15805	2018-09-24 16:09:51 +02:00
Marc Alexander	ca04dca6e9	Merge branch '3.2.x'	2018-09-17 21:01:51 +02:00
rubencm	06a8affd66	[ticket/12629] Rename errors_show to show_errors ... PHPBB3-12629	2018-09-13 14:40:47 +00:00
Rubén Calvo	43141a0d92	[ticket/12629] Add debug.errors_show ... PHPBB3-12629	2018-09-01 01:47:10 +02:00
Rubén Calvo	ced8599e30	[ticket/15723] Rewrite unique_id too ... PHPBB3-15723	2018-08-08 20:36:16 +02:00
Jakub Senko	204f798f76	[ticket/12628] Introduce debug.memory ... Also fix one debug.sql_explain missing from the previous PR PHPBB3-12628	2018-08-02 09:21:25 +02:00
Rubén Calvo	7ccecf6f77	[ticket/15413] Login redirect to previous page ... PHPBB3-15413	2018-07-25 22:02:50 +02:00
Rubén Calvo	ffcfec044b	[ticket/15723] Rewrite gen_rand_string() and gen_rand_string_friendly() ... PHPBB3-15723	2018-07-14 11:42:32 +02:00
Tristan Darricau	e247a0f6ea	Merge branch '3.2.x' ... * 3.2.x: [ticket/15618] Display The team link only to users with permission	2018-07-08 18:41:04 +02:00
Tristan Darricau	078d076526	Merge pull request #5253 from senky/ticket/15618 ... [ticket/15618] Display The team link only to users with permission * github.com:/phpbb/phpbb: [ticket/15618] Display The team link only to users with permission	2018-07-08 18:41:04 +02:00
Tristan Darricau	f6301ea85a	Merge pull request #5266 from senky/ticket/12624 ... [ticket/12624] Add debug.load_time parameter * github.com:/phpbb/phpbb: [ticket/12624] Add debug.load_time parameter	2018-07-08 18:32:45 +02:00
Tristan Darricau	7cf35eafb5	Merge pull request #5267 from senky/ticket/12627 ... [ticket/12627] Add debug.sql_explain parameter * github.com:/phpbb/phpbb: [ticket/12627] Add debug.sql_explain parameter	2018-07-08 18:26:52 +02:00
Tristan Darricau	4829dfe487	Merge branch '3.2.x' ... * 3.2.x: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY	2018-07-08 17:40:26 +02:00
Tristan Darricau	bc7b998632	Merge branch 'prep-release-3.2.3' into 3.2.x ... * prep-release-3.2.3: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY	2018-07-08 17:38:27 +02:00
Jakub Senko	bdff0f5590	[ticket/12627] Add debug.sql_explain parameter ... PHPBB3-12627	2018-07-06 17:17:48 +02:00
Jakub Senko	fcc3dd996d	[ticket/12624] Add debug.load_time parameter ... PHPBB3-12624	2018-07-06 17:01:15 +02:00
Marc Alexander	857b55dd20	Merge branch '3.2.x'	2018-06-19 13:32:49 +02:00
Rubén Calvo	d4d8aec02a	[ticket/15695] Fix gen_rand_string returning less characters than expected ... PHPBB3-15695	2018-06-18 22:38:14 +02:00
Jakub Senko	c61b9358ff	[ticket/15618] Display The team link only to users with permission ... PHPBB3-15618	2018-06-18 12:55:24 +02:00
Marc Alexander	1d0046437b	Merge branch '3.2.x'	2018-06-17 15:44:33 +02:00
Marc Alexander	9e50e52fa5	[ticket/15693] Update tests to reflect changes to gen_rand_string() ... PHPBB3-15693	2018-06-17 11:01:11 +02:00
Rubén Calvo	f75c400db4	[ticket/15693] Fix get_rand_string() ... PHPBB3-15693	2018-06-15 19:22:35 +02:00
Marc Alexander	25a46ef4b3	[ticket/15676] Simplify link text and use privacy link in cookie notice ... PHPBB3-15676	2018-05-31 22:15:36 +02:00
Marc Alexander	c6a35237a2	[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY ... PHPBB3-15676	2018-05-31 09:31:33 +02:00
Rubén Calvo	ef43dbdcca	[ticket/15286] Update use storage in avatars ... PHPBB3-15286	2018-05-01 10:47:11 +02:00
Marc Alexander	6b221ae4cb	Merge branch '3.2.x'	2018-01-07 19:30:41 +01:00
Marc Alexander	69a168bcb2	Merge pull request #5074 from marc1706/ticket/15498 ... [ticket/15498] Do not pass whether URL uses router to is_route	2018-01-07 11:04:37 +01:00
Marc Alexander	1b4bad6583	Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2	2018-01-07 11:02:31 +01:00
Marc Alexander	e31474542d	[ticket/15498] Do not pass whether URL uses router to is_route ... is_route expects a flag of whether this is a route that was generated with the router as opposed to is_router_used() which returns whether the router will be used via app.php. PHPBB3-15498	2018-01-06 10:53:12 +01:00
rxu	8c3808e9e7	[ticket/14972] Fix sizeof calls ... As of PHP 7.2, only arrays and objects implementing the Countable interface should be passed as a count() or sizeof() parameter. See https://github.com/php/php-src/blob/php-7.2.0alpha2/UPGRADING#L197-L198 Also, sizeof() seems to be sheduled for deprecation, see https://wiki.php.net/rfc/deprecations_php_7_2#suggested_deprecations PHPBB3-14972	2018-01-01 13:08:12 +01:00
Marc Alexander	bf5f11e11a	Merge branch 'ticket/security/211' into ticket/security/211-rhea	2018-01-01 11:54:37 +01:00
Marc Alexander	f2f1037e8d	Merge branch '3.2.x'	2017-10-17 21:16:15 +02:00
Marc Alexander	0e9a1e0d54	Merge pull request #4910 from javiexin/ticket/15331_B ... [ticket/15331] Allow gravatars to be overridden by existing event - B	2017-10-17 21:13:40 +02:00