32880 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Alexander	7e0dc646f0	Merge branch '3.3.x'	2019-07-29 21:31:38 +02:00
Marc Alexander	d4e623ffee	Merge branch '3.2.x' into 3.3.x	2019-07-29 21:31:12 +02:00
Marc Alexander	f4697666ec	Merge pull request #5640 from marc1706/ticket/16112-master ... [ticket/16112] Update composer dependencies in master	2019-07-29 21:30:59 +02:00
Marc Alexander	6078f58343	Merge pull request #5639 from marc1706/ticket/16112-3.3.x ... [ticket/16112] Update composer dependencies for 3.3.x	2019-07-29 21:30:56 +02:00
Marc Alexander	6440f97a4f	Merge pull request #5638 from marc1706/ticket/16112 ... [ticket/16112] Update composer dependencies for 3.2.x	2019-07-29 21:30:53 +02:00
Marc Alexander	e8b24f2ab2	Merge branch '3.3.x'	2019-07-29 20:48:33 +02:00
Marc Alexander	be3a58aff1	Merge branch '3.2.x' into 3.3.x	2019-07-29 20:48:28 +02:00
Marc Alexander	0ffd0d1924	Merge pull request #5627 from senky/ticket/16097 ... [ticket/16097] Add core.viewtopic_gen_sort_selects_before	2019-07-29 20:48:23 +02:00
Marc Alexander	47161de032	Merge branch 'ticket/16112-3.3.x' into ticket/16112-master	2019-07-29 20:47:09 +02:00
Jakub Senko	cd6a0026d5	[ticket/16097] Correctly classify sort_days as int ... PHPBB3-16097	2019-07-29 08:22:19 +02:00
Marc Alexander	365bb80089	Merge branch '3.3.x'	2019-07-29 08:21:16 +02:00
Marc Alexander	189f3fd68e	Merge pull request #5636 from marc1706/ticket/15886 ... [ticket/15886] Use getMockBuilder instead of removed getMock()	2019-07-29 08:21:10 +02:00
Marc Alexander	7543508570	Merge branch 'ticket/16112' into ticket/16112-3.3.x	2019-07-28 23:11:52 +02:00
Marc Alexander	4084939620	[ticket/16112] Update composer dependencies for 3.2.x ... PHPBB3-16112	2019-07-28 22:33:47 +02:00
Marc Alexander	e1962acd4e	[ticket/15886] Use getMockBuilder instead of removed getMock() ... PHPBB3-15886	2019-07-28 21:53:04 +02:00
Marc Alexander	5412be9563	Merge branch '3.3.x'	2019-07-28 17:55:34 +02:00
Marc Alexander	710a0b3ea3	Merge branch '3.2.x' into 3.3.x	2019-07-28 17:55:30 +02:00
Marc Alexander	b53f95e577	Merge pull request #5494 from mrgoldy/ticket/15885 ... [ticket/15885] Display group rank on memberlist_body	2019-07-28 17:55:25 +02:00
Marc Alexander	d6f62c8764	Merge branch '3.3.x'	2019-07-28 17:19:27 +02:00
Marc Alexander	2df9230902	Merge branch '3.2.x' into 3.3.x	2019-07-28 17:18:40 +02:00
Marc Alexander	f567b2bb69	Merge pull request #5459 from mrgoldy/ticket/15886 ... [ticket/15886] Group helper functions	2019-07-28 15:31:09 +02:00
Marc Alexander	cf96967677	[ticket/15886] Fix minor code style issues ... PHPBB3-15886	2019-07-28 12:21:46 +02:00
Marc Alexander	29a116aea1	Merge branch '3.3.x'	2019-07-28 10:41:03 +02:00
Marc Alexander	423345d517	Merge pull request #5557 from senky/ticket/15088 ... [ticket/15088] Avoid code repetitions in extension manager	2019-07-28 10:40:58 +02:00
Marc Alexander	c41efac6b7	Merge branch '3.3.x'	2019-07-28 10:38:42 +02:00
Marc Alexander	5a76d541a2	Merge branch '3.2.x' into 3.3.x	2019-07-28 10:38:38 +02:00
Marc Alexander	ae62bc4642	Merge pull request #5575 from rubencm/ticket/14459 ... [ticket/14459] Check language input for group and fix template logic	2019-07-28 10:38:33 +02:00
rubencm	c281604d0b	[ticket/14459] Use language property ... PHPBB3-14459	2019-07-27 23:52:01 +00:00
Marc Alexander	065feb3ff9	[ticket/15088] Ensure phpBB version is set in tests ... PHPBB3-15088	2019-07-27 21:32:54 +02:00
rubencm	acb5794d50	[ticket/14459] Rename variable ... PHPBB3-14459	2019-07-27 15:15:58 +00:00
Jakub Senko	b0334d6b4f	[ticket/15088] Avoid code repetitions in extension manager ... PHPBB3-15088	2019-07-27 16:51:56 +02:00
Marc Alexander	5c472e4a9c	Merge branch '3.3.x'	2019-07-27 16:30:30 +02:00
Marc Alexander	ee51bf26fa	Merge pull request #5566 from JoshyPHP/ticket/16017 ... [ticket/16017] Add support for Argon2id as default password hashing	2019-07-27 16:30:25 +02:00
Marc Alexander	f3cad544e7	Merge branch '3.3.x'	2019-07-27 16:21:03 +02:00
Marc Alexander	812edebfb7	Merge branch '3.2.x' into 3.3.x	2019-07-27 16:20:58 +02:00
Marc Alexander	65ff149fc9	Merge pull request #5601 from senky/ticket/16013 ... [ticket/16013] Allow admins to use disallowed username	2019-07-27 16:20:53 +02:00
Marc Alexander	5526ddeeaf	Merge branch '3.3.x'	2019-07-27 16:18:46 +02:00
Marc Alexander	31192fc08e	Merge branch '3.2.x' into 3.3.x	2019-07-27 16:18:41 +02:00
Marc Alexander	79bcb20ac5	Merge pull request #5626 from cpeel/ticket/16096 ... [ticket/16096] Use InnoDB fulltext limits for InnoDB tables	2019-07-27 16:18:37 +02:00
Marc Alexander	703f86941c	Merge branch '3.3.x'	2019-07-27 14:57:39 +02:00
Marc Alexander	3433f61ccb	Merge branch '3.2.x' into 3.3.x	2019-07-27 14:57:34 +02:00
Marc Alexander	d06e9745c2	Merge pull request #5631 from kasimi/ticket/16106 ... [ticket/16106] Add core.mcp_main_before	2019-07-27 14:57:30 +02:00
Marc Alexander	c8d07fef5e	Merge branch '3.3.x'	2019-07-27 14:38:09 +02:00
Marc Alexander	84fdba604d	Merge branch '3.2.x' into 3.3.x	2019-07-27 14:38:02 +02:00
Marc Alexander	1b4f82cd1d	Merge pull request #5630 from 3D-I/ticket/16103 ... [ticket/16103] Add core.pm_modify_message_subject	2019-07-27 14:37:58 +02:00
Marc Alexander	38999e2606	Merge branch '3.3.x'	2019-07-27 14:30:40 +02:00
Marc Alexander	b12405dbc7	Merge branch '3.2.x' into 3.3.x	2019-07-27 14:30:35 +02:00
Marc Alexander	978d1976b0	Merge pull request #5629 from 3D-I/ticket/16102 ... [ticket/16102] Add core.posting_modify_post_subject	2019-07-27 14:30:30 +02:00
Marc Alexander	3e9682fe49	[ticket/16017] Add missing passwords.driver tag to argon2id ... PHPBB3-16017	2019-07-26 22:46:22 +02:00
Marc Alexander	d6fd2b4e2f	Merge branch '3.3.x'	2019-07-26 18:20:38 +02:00