28673 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tristan Darricau	fdd4f68aea	Merge pull request #4455 from marc1706/ticket/14484-rhea ... [ticket/14484] Add possibility to use extensions in UI tests * marc1706/ticket/14484-rhea: [ticket/14484] Remove duplicate methods and no longer needed calls [ticket/14484] Remove invalid code caused by merge conflict [ticket/14484] Properly enable extensions in UI tests [ticket/14484] Move facebook/webdriver back to tests dir composer.json [ticket/14484] Move facebook webdriver to main composer.json	2016-09-24 10:31:27 +02:00
Marc Alexander	1fff455862	Merge branch '3.1.x' into 3.2.x	2016-09-24 10:28:39 +02:00
Marc Alexander	18f9c9f6e2	Merge pull request #3527 from Elsensee/ticket/13709 ... [ticket/13709] Add fallback for email templates used by extensions	2016-09-24 10:28:37 +02:00
Marc Alexander	e02dc7a9c1	Merge branch '3.1.x' into 3.2.x	2016-09-24 10:03:58 +02:00
Marc Alexander	931582aad9	Merge pull request #4432 from Senky/ticket/14762 ... [ticket/14762] Add core event to session.php	2016-09-24 10:02:41 +02:00
Marc Alexander	4db52518a9	Merge branch '3.1.x' into 3.2.x	2016-09-24 09:56:30 +02:00
Marc Alexander	3910387ee5	Merge pull request #4433 from Senky/ticket/14747 ... [ticket/14747] Add post_data to core.modify_posting_auth	2016-09-24 09:56:25 +02:00
Marc Alexander	73d150db80	Merge branch '3.1.x' into 3.2.x	2016-09-24 09:41:54 +02:00
Marc Alexander	d2f95ef875	Merge pull request #4460 from marc1706/ticket/14784 ... [ticket/14784] missing rewrite for lighttpd	2016-09-24 09:39:01 +02:00
Marc Alexander	dcc7118c0d	Merge pull request #4460 from marc1706/ticket/14784 ... [ticket/14784] missing rewrite for lighttpd	2016-09-24 09:36:04 +02:00
Tobi Schäfer	537dca0892	[ticket/14784] missing rewrite for lighttpd ... PHPBB3-14784	2016-09-24 08:21:27 +02:00
Marc Alexander	9a64bffd68	Merge pull request #4459 from rxu/ticket/14794 ... [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility	2016-09-23 21:10:26 +02:00
Marc Alexander	77e14c3030	Merge pull request #4457 from rxu/ticket/14793 ... [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+	2016-09-23 20:55:21 +02:00
rxu	a5ccdc7997	[ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility ... PHPBB3-14794	2016-09-23 19:47:05 +07:00
rxu	becb1e1fff	[ticket/14793] Merge branch 'ticket/14748' of https://github.com/marc1706/phpbb ... PHPBB3-14793	2016-09-23 05:52:47 +07:00
Marc Alexander	bc6dc9f173	Merge branch '3.1.x' into 3.2.x	2016-09-22 21:26:35 +02:00
Marc Alexander	2436af94e3	Merge pull request #4392 from ErnadoO/PHPBB3-14592 ... [ticket/14592] [PHP] core.search_backend_search_after	2016-09-22 21:26:31 +02:00
Marc Alexander	430c266eb2	Merge branch '3.1.x' into 3.2.x	2016-09-22 21:23:58 +02:00
Marc Alexander	75f57fa407	Merge pull request #4454 from rxu/tcket/14787-1 ... [ticket/14787] Add more parameters to the core.search_modify_url_parameters	2016-09-22 21:23:55 +02:00
rxu	35c62d1e74	[ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+ ... PHPBB3-14793	2016-09-22 22:29:18 +07:00
Máté Bartus	6ae405f743	Merge pull request #4456 from marc1706/ticket/14791 ... [ticket/14791] Get form tokens from correct button in search test base	2016-09-22 10:15:28 +02:00
Marc Alexander	65ef56ed71	[ticket/14791] Get form tokens from correct button in search test base ... PHPBB3-14791	2016-09-21 21:36:03 +02:00
Marc Alexander	2b22adbcac	[ticket/14484] Remove duplicate methods and no longer needed calls ... PHPBB3-14484	2016-09-21 21:09:55 +02:00
Marc Alexander	6242698a84	[ticket/14484] Remove invalid code caused by merge conflict ... PHPBB3-14484	2016-09-18 21:52:11 +02:00
rxu	a078336cb1	[ticket/14787] Add more parameters to the core.search_modify_url_parameters ... PHPBB3-14787	2016-09-19 02:48:23 +07:00
Marc Alexander	229472cb07	Merge branch 'ticket/14484' into ticket/14484-rhea	2016-09-18 21:46:32 +02:00
Tristan Darricau	e0d9f2aad6	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14787] Add more parameters to the core.search_modify_url_parameters	2016-09-18 21:25:17 +02:00
Tristan Darricau	4da479d47f	Merge pull request #4450 from rxu/ticket/14787 ... [ticket/14787] Add more parameters to the core.search_modify_url_pameters * rxu/ticket/14787: [ticket/14787] Add more parameters to the core.search_modify_url_parameters	2016-09-18 21:25:14 +02:00
Tristan Darricau	19bbbfe0f3	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons	2016-09-18 21:14:47 +02:00
Tristan Darricau	bc08813866	Merge pull request #4452 from marc1706/ticket/14789 ... [ticket/14789] Further harden ACP link and form checks * marc1706/ticket/14789: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons	2016-09-18 21:12:19 +02:00
Erwan Nader	6b435cbf13	[ticket/14592] Fix variable type ... PHPBB3-14592	2016-09-18 19:55:00 +02:00
Marc Alexander	72f6241aa2	[ticket/14789] Add form tokens to tests and uncomment add_form_key ... PHPBB3-14789	2016-09-18 15:30:25 +02:00
Marc Alexander	585a3ed863	[ticket/14789] Add link hashes and form tokens to all acp links/buttons ... This will further harden the ACP security by adding link hashes to links and form tokens to forms that did not have these yet and result in modified settings or write action on the filesystem or database. These few links and forms were still relying on the global ACP protection, mainly due to them not posing further risks of compromising data. After this change these will now also be properly protected against tampering. PHPBB3-14789	2016-09-18 15:29:50 +02:00
Jakub Senko	abb01946bd	[ticket/14762] Add core event to session.php ... PHPBB3-14762	2016-09-18 13:32:10 +02:00
Tristan Darricau	47d2f34a1b	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14788] Update CREDITS.txt	2016-09-18 13:28:39 +02:00
Tristan Darricau	27e33f39f7	Merge pull request #4451 from marc1706/ticket/14788 ... [ticket/14788] Update CREDITS.txt * marc1706/ticket/14788: [ticket/14788] Update CREDITS.txt	2016-09-18 13:28:36 +02:00
Marc Alexander	631b0f2dba	Merge branch '3.1.x' into 3.2.x	2016-09-18 13:08:35 +02:00
Marc Alexander	c3578bc3e3	Merge pull request #4442 from rxu/ticket/14781 ... [ticket/14781] Add core event to the function group_user_attributes()	2016-09-18 13:07:47 +02:00
Marc Alexander	0d3ca3883e	[ticket/14788] Update CREDITS.txt ... PHPBB3-14788	2016-09-18 12:16:44 +02:00
rxu	a084b07495	[ticket/14787] Add more parameters to the core.search_modify_url_parameters ... PHPBB3-14787	2016-09-18 14:02:49 +07:00
Marc Alexander	e76ea47fb8	Merge branch '3.1.x' into 3.2.x	2016-09-17 16:27:25 +02:00
Marc Alexander	bf397cb985	Merge pull request #4398 from wesleyfok/ticket/14638-3.1.x ... Ticket/14638 3.1.x New UCP hooks for subscriptions	2016-09-17 13:04:32 +02:00
Marc Alexander	b0ff957684	Merge branch '3.1.x' into 3.2.x	2016-09-17 12:59:56 +02:00
Marc Alexander	73b9327631	Merge pull request #4403 from rxu/ticket/14738 ... [ticket/14738] Add core events to improve modifying forum lists	2016-09-17 12:58:18 +02:00
Marc Alexander	aa95636a4d	Merge branch '3.1.x' into 3.2.x	2016-09-17 08:54:04 +02:00
Marc Alexander	bd59241110	Merge pull request #4406 from rmcgirr83/ticket/14581 ... [ticket/14581] Add core events to content_visibility	2016-09-17 08:54:00 +02:00
Marc Alexander	2dbc9e1016	Merge branch '3.1.x' into 3.2.x	2016-09-17 00:05:09 +02:00
Marc Alexander	33584f12f0	Merge pull request #4449 from DavidIQ/ticket/14782 ... [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS'	2016-09-17 00:04:59 +02:00
DavidIQ	2ae08dc3ba	[ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS'	2016-09-16 17:05:20 -04:00
Andreas Fischer	271e8b43f9	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14782] Use the $select variable in "Your Posts" search	2016-09-15 19:30:44 +02:00