36304 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Alexander	96273d5813	Merge branch '3.3.x'	2019-10-28 20:32:14 +01:00
Marc Alexander	404768a607	Merge branch '3.2.x' into 3.3.x	2019-10-28 20:32:08 +01:00
Marc Alexander	e95e387188	Merge pull request #5709 from mrgoldy/ticket/16181 ... [ticket/16181] Enforce string for OAuth provider id	2019-10-28 20:32:03 +01:00
mrgoldy	9cb1119d1e	[ticket/12539] Prevent cursor repositioning ... PHPBB3-12539	2019-10-28 20:29:51 +01:00
Marc Alexander	6e961a6954	Merge branch '3.3.x'	2019-10-28 20:23:02 +01:00
Marc Alexander	1e67ffee1d	Merge branch '3.2.x' into 3.3.x	2019-10-28 20:22:57 +01:00
Marc Alexander	c0eee6d153	Merge pull request #5682 from 3D-I/ticket/16151 ... [ticket/16151] Enable Emojis and rich text in forum name	2019-10-28 20:22:52 +01:00
Marc Alexander	885fca6a20	Merge branch '3.3.x'	2019-10-28 19:50:06 +01:00
Marc Alexander	40a69b8edf	Merge branch '3.2.x' into 3.3.x	2019-10-28 19:50:01 +01:00
Marc Alexander	1b20430399	Merge pull request #5672 from OxCom/ticket/16146 ... [ticket/16146] New core event: after move forum	2019-10-28 19:49:55 +01:00
Marc Alexander	9f293bfbc1	Merge branch '3.3.x'	2019-10-28 17:17:19 +01:00
Marc Alexander	0e8e8c7b14	Merge pull request #5721 from VSEphpbb/ticket/16192 ... [ticket/16192] Fix CLI extension not enableable messages	2019-10-28 17:17:12 +01:00
3D-I	2cdc2e751e	[ticket/16151] Enable Emojis and rich text in forum name ... Move to a new function() PHPBB3-16151	2019-10-28 02:36:35 +01:00
Matt Friedman	7ae8f98ec6	[ticket/16192] Fix CLI extension not enableable messages ... PHPBB3-16192	2019-10-27 16:22:24 -07:00
hanakin	eb0195dd7c	[ticket/16188] fix acp responsive stats ... PHPBB3-16188	2019-10-27 12:14:44 -10:00
Marc Alexander	6a5ae59ebf	Merge branch '3.3.x'	2019-10-26 21:50:55 +02:00
Marc Alexander	b6f400a014	Merge branch '3.2.x' into 3.3.x	2019-10-26 21:50:49 +02:00
Marc Alexander	28fd9457e9	Merge pull request #5695 from 3D-I/ticket/16161 ... [ticket/16161] Enable BBcodes without closing tag	2019-10-26 21:50:43 +02:00
Marc Alexander	55f6e93d1c	Merge branch '3.3.x'	2019-10-26 21:35:45 +02:00
Marc Alexander	b8616fe9ac	Merge branch '3.2.x' into 3.3.x	2019-10-26 21:35:39 +02:00
Marc Alexander	6a7ed40b05	Merge pull request #5681 from v12mike/ticket/16150 ... [ticket/16150] Make post subject link an absolute url	2019-10-26 21:35:32 +02:00
Marc Alexander	4e816b58c6	[ticket/16146] Fix typos in event description ... PHPBB3-16146	2019-10-26 21:26:00 +02:00
rubencm	f985f42dc2	[ticket/15958] Standarize create forums default options ... PHPBB3-15958	2019-10-24 21:15:23 +00:00
mrgoldy	a7ae904195	[ticket/15538] Include Icon function ... PHPBB3-15538	2019-10-24 18:26:28 +02:00
mrgoldy	ba5e73bfea	[ticket/15538] Revert back to Icon function ... PHPBB3-15538	2019-10-24 18:26:16 +02:00
mrgoldy	341266cc71	[ticket/15538] Readding macros and requested changes ... PHPBB3-15538	2019-10-24 18:26:08 +02:00
mrgoldy	23fae74bf2	[ticket/15538] Fixes unrelated to the error ... PHPBB3-15538	2019-10-24 18:25:54 +02:00
mrgoldy	971b905569	[ticket/15538] Split macros and add docblocks ... PHPBB3-15538	2019-10-24 18:24:51 +02:00
mrgoldy	a10087a717	[ticket/15538] Uncommit test files ... PHPBB3-15538	2019-10-24 18:24:44 +02:00
mrgoldy	d8274c19c8	[ticket/15538] Create macro and remove icons ... PHPBB3-15538	2019-10-24 18:24:37 +02:00
mrgoldy	094f0f663c	[ticket/15538] Capitalize function ... PHPBB3-15538	2019-10-24 18:24:22 +02:00
mrgoldy	5f62976d66	[ticket/15538] o-icon class and stylelint ... PHPBB3-15538	2019-10-24 18:24:16 +02:00
mrgoldy	2f4aef8689	[ticket/15538] Fix end of files ... PHPBB3-15538	2019-10-24 18:24:09 +02:00
mrgoldy	9122d1afd3	[ticket/15538] Twig icon function ... PHPBB3-15538	2019-10-24 18:23:54 +02:00
3D-I	734c1cd5bd	[ticket/16187] Correctly display registration using external services ... PHPBB3-16187	2019-10-24 07:08:41 +02:00
Marc Alexander	0bda740b37	Merge branch '3.3.x'	2019-10-23 21:03:55 +02:00
Marc Alexander	95880a5f49	[3.3.x] Update version numbers to 3.3.0-b2-dev	2019-10-23 21:00:50 +02:00
Marc Alexander	90a8e1dd1c	Merge branch 'prep-release-3.3.0-b1' into 3.3.x	2019-10-23 20:56:58 +02:00
mrgoldy	ade88f020e	[ticket/12539] Reposition ESC to be on top ... PHPBB3-12539	2019-10-22 22:20:27 +02:00
mrgoldy	fe7118aea0	[ticket/12539] Change let to var in jQuery ... PHPBB3-12539	2019-10-22 22:19:07 +02:00
Marc Alexander	396a8214db	[prep-release-3.3.0-b1] Add jquery update migration to 330b1 dependencies	2019-10-21 20:05:12 +02:00
Marc Alexander	b7fe147da8	Merge branch '3.3.x'	2019-10-21 17:51:34 +02:00
Marc Alexander	b0b3810aab	Merge branch '3.2.x' into 3.3.x	2019-10-21 17:51:29 +02:00
Marc Alexander	fa18778c91	Merge pull request #5711 from kasimi/ticket/16183 ... [ticket/16183] Add core.generate_smilies_count_sql_before	2019-10-21 17:51:23 +02:00
Marc Alexander	d19df70635	Merge branch '3.3.x'	2019-10-21 17:48:53 +02:00
Marc Alexander	a8fb843ded	Merge branch '3.2.x' into 3.3.x	2019-10-21 17:48:48 +02:00
Marc Alexander	6e757eea94	Merge pull request #5674 from JoshyPHP/ticket/16147 ... [ticket/16147] Updated tokens legend in BBCodes ACP	2019-10-21 17:48:41 +02:00
Marc Alexander	dfcc744275	Merge pull request #5716 from marc1706/ticket/15437 ... [ticket/15437] Update jQuery and cookie consent to latest	2019-10-21 17:38:53 +02:00
Marc Alexander	e78632767c	[ticket/15437] Rename jquery.min.js to jquery-3.4.1.min.js ... PHPBB3-15437	2019-10-20 21:35:45 +02:00
Marc Alexander	cf7c3dcab5	[ticket/15437] Add migration for updating jQuery to 3.4.1 ... PHPBB3-15437	2019-10-20 21:33:05 +02:00