25611 Commits

Author	SHA1	Message	Date
Marc Alexander	a74658091b	Merge pull request #5102 from JoshyPHP/ticket/15527 ... [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration	2018-01-24 23:35:49 +01:00
Marc Alexander	3a8305e190	Merge pull request #5098 from VSEphpbb/ticket/15526 ... [ticket/15526] Cast bbcode id to INT in merge bbcodes migration	2018-01-24 19:19:29 +01:00
Marc Alexander	928a8c0e89	Merge pull request #5100 from senky/ticket/15528 ... [ticket/15528] Display style phpBB version	2018-01-24 19:16:24 +01:00
Marc Alexander	128a6e4c8d	Merge pull request #5101 from senky/ticket/15529 ... [ticket/15529] Color groups in ACP	2018-01-24 19:09:25 +01:00
Marc Alexander	532afbf83a	[ticket/15527] Remove "use" and specify full class name for exception ... PHPBB3-15527	2018-01-24 18:47:40 +01:00
Marc Alexander	23a1f3feda	Merge pull request #5106 from senky/ticket/15514 ... [ticket/15514] Improve SMTP_SERVER lang key	2018-01-24 18:31:37 +01:00
Marc Alexander	b9cb75bf60	Merge pull request #5099 from VSEphpbb/ticket/15525 ... [ticket/15525] Update to valid SPDX license name GPL-2.0-only	2018-01-24 18:12:02 +01:00
Jakub Senko	277f4efcc7	[ticket/15514] Improve SMTP_SERVER lang key ... PHPBB3-15514	2018-01-24 13:34:23 +01:00
Jakub Senko	233a07ceda	[ticket/15528] Rename column label ... PHPBB3-15528	2018-01-22 22:04:23 +01:00
JoshyPHP	5c8a667db2	[ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration ... PHPBB3-15527	2018-01-22 02:37:47 +01:00
Jakub Senko	875dc63c6f	[ticket/15529] Color groups in ACP ... PHPBB3-15529	2018-01-21 11:04:07 +01:00
Jakub Senko	abe218c34a	[ticket/15528] Display style phpBB version ... PHPBB3-15528	2018-01-21 10:54:07 +01:00
Marc Alexander	d0143bec88	Merge pull request #5084 from hubaishan/ticket/15510 ... [ticket/15510] Link Orphan attachments in ACP General to its page	2018-01-20 19:57:33 +01:00
Marc Alexander	55e13693b0	Merge pull request #5078 from Crizz0/ticket/15500 ... [ticket/15500] Updates PHP requirements to 5.4.7+ in docs/	2018-01-20 19:51:35 +01:00
Marc Alexander	5c989b1e8e	Merge pull request #5067 from hubaishan/ticket/15491 ... [ticket/15491] Fix out dated linkes in Installer support page	2018-01-20 19:50:11 +01:00
Marc Alexander	8f742fb7d5	Merge pull request #5097 from canonknipser/ticket/15513 ... [ticket/15513] Signature edit in acp gives error	2018-01-20 19:45:46 +01:00
Matt Friedman	f08887e277	[ticket/15526] Cast bbcode id to INT in merge bbcodes migration ... PHPBB3-15526	2018-01-20 09:54:45 -08:00
Matt Friedman	2d8b856a63	[ticket/15525] Update to valid SPDX license name GPL-2.0-only ... PHPBB3-15525	2018-01-20 09:52:14 -08:00
canonknipser	122f61e1ca	[ticket/15513] Signature edit in acp gives error ... When editing a users signature in acp, a error is thrown. PHPBB3-15513	2018-01-20 18:00:44 +01:00
kasimi	ce6adeea02	[ticket/15523] Fix AdBlocker causing JS error when using CookieConsent ... PHPBB3-15523	2018-01-19 18:41:58 +01:00
Christian Schnegelberger	bb442c498b	[ticket/15500] Adds 7.1 and 7.2 to tested versions ... PHPBB3-15500	2018-01-19 18:16:17 +01:00
hubaishan	ccc260b179	[ticket/15491] Add twitter and facebook ... Add twitter and facebook PHPBB3-15491	2018-01-19 19:07:16 +03:00
hubaishan	ede0a36076	[ticket/15510] Link Orphan attachments in ACP General to its page ... change `IF TOTAL_ORPHAN` to `IF TOTAL_ORPHAN > 0` PHPBB3-15510	2018-01-19 16:28:54 +03:00
Marc Alexander	adc75b700f	Merge pull request #5083 from JoshyPHP/ticket/15512 ... [ticket/15512] Avoid reparsing non-existent polls	2018-01-19 12:20:54 +01:00
Jakub Senko	84ff21a586	[ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS ... PHPBB3-15099	2018-01-17 18:30:21 +01:00
Christian Schnegelberger	1f80b668f1	[ticket/15500] Remove number from upper PHP limit ... PHPBB3-15500	2018-01-16 21:42:38 +01:00
Marc Alexander	1cd8bbac0c	Merge pull request #5071 from dsinn/ticket/15495 ... [ticket/15495] Use transaction in ACP move_forum	2018-01-16 21:34:20 +01:00
JoshyPHP	5878d66ebf	[ticket/15512] Avoid reparsing non-existent polls ... PHPBB3-15512	2018-01-12 16:28:37 +01:00
hubaishan	baabcad8ab	[ticket/15510] Link Orphan attachments in ACP General to its page ... Link Orphan attachments in ACP General to Orphaned attachments page if Orphan attachments>0 PHPBB3-15510	2018-01-12 18:23:16 +03:00
Derky	7f6ececf95	Merge pull request #5079 from rxu/ticket/15502 ... [ticket/15502] Fix migrations	2018-01-12 07:30:51 +01:00
Marc Alexander	350d4f3e6d	[ticket/15506] Assign attachrow_template_vars before foreach ... The attachrow_template_vars array needs to be defined once in front of the foreach instead of resetting the array on every iteration of the foreach. PHPBB3-15506	2018-01-11 21:00:19 +01:00
rxu	0391b48d7e	[ticket/15502] Fix migrations ... PHPBB3-15502	2018-01-09 01:01:49 +07:00
Christian Schnegelberger	81a8a76c59	[ticket/15500] Updates PHP requirements to 5.4.7+ in docs/ ... PHPBB3-15500	2018-01-07 22:22:41 +01:00
Marc Alexander	f26cf2dc1f	[3.2.x] Update versions to 3.2.3-dev	2018-01-07 18:51:18 +01:00
Marc Alexander	77b275181a	[prep-release-3.2.2] Add 3.1.12 to build and fix display of download box	2018-01-07 16:59:14 +01:00
Marc Alexander	e4fc82bee5	Merge branch 'prep-release-3.1.12' into prep-release-3.2.2	2018-01-07 11:52:38 +01:00
Marc Alexander	f38fce5ce5	[prep-release-3.1.12] Update changelog	2018-01-07 11:47:59 +01:00
Marc Alexander	f8180ca97b	[prep-release-3.2.2] Add migration for 3.2.2	2018-01-07 11:45:49 +01:00
Marc Alexander	e7c5fc32d2	[prep-release-3.2.2] Update changelog for 3.2.2 release	2018-01-07 11:43:54 +01:00
Marc Alexander	4aab9e792a	Merge pull request #5077 from marc1706/ticket/15353 ... [ticket/15353] Do not use empty to not offer empty archive for download	2018-01-07 11:06:18 +01:00
Marc Alexander	f26b2c00de	Merge pull request #5076 from marc1706/ticket/15496 ... [ticket/15496] Add sort key to SELECT in fulltext_postgres	2018-01-07 11:06:09 +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	c7b3407eb2	Merge pull request #5068 from Derky/ticket/15489 ... [ticket/15489] Remove NO_FORUMS message for categories with subforums	2018-01-07 11:04:22 +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	3ae0169542	Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2	2018-01-07 10:48:43 +01:00
Marc Alexander	57179fbb79	[ticket/15353] Do not use empty to not offer empty archive for download ... PHPBB3-15353	2018-01-06 19:59:55 +01:00
Marc Alexander	d05c7fd342	[ticket/15496] Add sort key to SELECT in fulltext_postgres ... Postgres requires that the column being ordered also appears in the SELECT part of the query. PHPBB3-15496	2018-01-06 16:06:59 +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
Derky	182a96f273	Merge pull request #4680 from marc1706/ticket/15055 ... [ticket/15055] Add appveyor file to allow running tests on appveyor as well	2018-01-05 22:44:34 +01:00
Derky	2119dee53d	[ticket/15489] Add NO_FORUMS_IN_CATEGORY message ... PHPBB3-15489	2018-01-04 21:09:39 +01:00