24655 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marc Alexander	4ee05b1c17	[ticket/security-171] Add tests for retrieved remote data in version_helper ... SECURITY-171	2014-11-21 22:32:28 +01:00
Marc Alexander	34004612ac	[ticket/security-171] Sanitize data from composer.json ... SECURITY-171	2014-11-21 22:32:28 +01:00
Marc Alexander	da1888a7fa	[ticket/security-171] Use type cast helper for json data ... SECURITY-171	2014-11-21 22:32:28 +01:00
Joas Schilling	3c8d11f6cc	Merge branch 'develop-ascraeus' into develop	2014-11-21 22:29:08 +01:00
Joas Schilling	d7d4f681ca	Merge pull request #3156 from prototech/ticket/13316 ... [ticket/13316] Ensure Recaptcha image uses https when necessary.	2014-11-21 22:29:02 +01:00
Cesar G	8d8c2930d2	[ticket/13354] Fix incorrect column name when deleting all topic logs. ... PHPBB3-13354	2014-11-21 12:48:26 -08:00
Marc Alexander	352648f173	[ticket/13358] Fix tests and use exceptions instead of user object ... PHPBB3-13358	2014-11-21 21:37:43 +01:00
Marc Alexander	f6e7a94bd5	[ticket/13358] Use file_downloader in get_remote_file() ... get_remote_file() has been marked as deprecated. PHPBB3-13358	2014-11-21 21:37:43 +01:00
Marc Alexander	2793f9c078	[ticket/13358] Add file_downloader to version_helper ... PHPBB3-13358	2014-11-21 21:37:43 +01:00
Marc Alexander	a080173010	[ticket/13358] Add file_downloader as replacement for get_remote_file ... PHPBB3-13358	2014-11-21 21:37:43 +01:00
Cesar G	f3373e1e32	[ticket/13316] Ensure Recaptcha image uses https when necessary. ... PHPBB3-13316	2014-11-21 12:17:04 -08:00
Joas Schilling	b104bf5791	Merge branch 'develop-ascraeus' into develop	2014-11-21 21:05:35 +01:00
Joas Schilling	f719803fdc	Merge pull request #3144 from marc1706/ticket/13337 ... [ticket/13337] Do not use SQL IN comparison with empty array	2014-11-21 21:04:11 +01:00
Joas Schilling	1104f788c3	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/confirm_delete_body.html	2014-11-21 21:00:00 +01:00
Joas Schilling	d56da0d68f	Merge pull request #3044 from Elsensee/ticket/13100 ... [ticket/13100] Display only confirmation buttons when deleting shadow topic	2014-11-21 20:59:22 +01:00
Joas Schilling	95a8f40052	Merge branch 'develop-ascraeus' into develop	2014-11-21 20:41:14 +01:00
Joas Schilling	1689191f29	Merge pull request #3023 from Nicofuma/ticket/13133 ... [ticket/13133] Allow @vendor_name for includecss	2014-11-21 20:36:41 +01:00
Joas Schilling	a191708601	Merge branch 'develop-ascraeus' into develop	2014-11-21 20:20:45 +01:00
Joas Schilling	973c2a9a3a	Merge pull request #2765 from Elsensee/ticket/11863 ... [ticket/11863] Set require_activation to none if emails are disabled	2014-11-21 20:18:15 +01:00
Joas Schilling	90a5d29523	Merge branch 'develop-ascraeus' into develop	2014-11-21 20:15:09 +01:00
Joas Schilling	707a85b6c1	Merge pull request #3043 from rxu/ticket/13182 ... [ticket/13182] Add posting.php core event to allow modifying the message text	2014-11-21 20:14:36 +01:00
Joas Schilling	73f1cfd583	Merge branch 'develop-ascraeus' into develop	2014-11-21 20:09:27 +01:00
Joas Schilling	71a015557f	Merge pull request #3150 from omniError/ticket/13347 ... [ticket/13347] missing acp_forums template events Conflicts: phpBB/docs/events.md	2014-11-21 20:09:13 +01:00
Joas Schilling	d311fa2c5e	Merge branch 'develop-ascraeus' into develop	2014-11-21 20:05:37 +01:00
Joas Schilling	bc52a84998	Merge pull request #3131 from omniError/ticket/13328 ... [ticket/13328] add core.mcp_view_forum_modify_sql	2014-11-21 20:05:19 +01:00
Joas Schilling	f7051a958c	Merge branch 'develop-ascraeus' into develop	2014-11-21 19:58:49 +01:00
Joas Schilling	d6e8cce44b	Merge pull request #3130 from omniError/ticket/13326 ... [ticket/13326] add viewtopic_url to event	2014-11-21 19:58:43 +01:00
Joas Schilling	ac33ee2290	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/index_body.html	2014-11-21 19:54:44 +01:00
Joas Schilling	2d6734cb0a	Merge pull request #3126 from VSEphpbb/ticket/13290 ... [ticket/13290] Add EVENT index_body_forumlist_body_after	2014-11-21 19:53:15 +01:00
Joas Schilling	462664b4b4	Merge branch 'develop-ascraeus' into develop	2014-11-21 19:42:28 +01:00
Joas Schilling	7bc1917908	Merge pull request #3122 from Elsensee/ticket/13309 ... [ticket/13309] Add event acp_email_options_after	2014-11-21 19:42:14 +01:00
rxu	bb75cd40f5	[ticket/13182] Add posting.php core event to allow modifying the message text ... posting.php core event to allow modifying the message before parsing would be needed for some extensions, like for adding topic title to the topic URL etc. Also removed 'delete' var from core.posting_modify_template_vars and core.modify_posting_parameters as it does not exist. PHPBB3-13182	2014-11-22 01:33:12 +07:00
Joas Schilling	2ba391d04a	Merge branch 'develop-ascraeus' into develop	2014-11-21 19:32:42 +01:00
Joas Schilling	4bf3dcbebd	Merge pull request #3114 from rxu/ticket/13294 ... [ticket/13294] Add function parse() core event for additional message checks	2014-11-21 19:28:07 +01:00
Joas Schilling	987bd7b3a7	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/memberlist_search.html	2014-11-21 19:25:32 +01:00
Joas Schilling	c31b53942d	Merge pull request #3071 from rxu/ticket/13220 ... [ticket/13220] Add template events to memberlist_search.html	2014-11-21 19:23:10 +01:00
Nils Adermann	040d451dcc	Merge pull request #2883 from Nicofuma/ticket/12620 ... [ticket/12620] Allow the user to define multiples environments	2014-11-21 18:20:19 +01:00
Tristan Darricau	54d5299940	[ticket/12620] Fix tests ... PHPBB3-12620	2014-11-21 17:38:13 +01:00
Tristan Darricau	5e2896bb00	[ticket/12620] Remove the old includes/functions_url_matcher.php file ... PHPBB3-12620	2014-11-21 16:42:01 +01:00
Tristan Darricau	f5c5f7df75	[ticket/12620] Fix functionnal tests ... PHPBB3-12620	2014-11-21 08:26:19 +01:00
Tristan Darricau	677b5b2cd4	[ticket/12620] Fix rebase ... PHPBB3-12620	2014-11-20 23:15:49 +01:00
Tristan Darricau	93f61a4a7d	[ticket/12620] Use the right environment while installing ... PHPBB3-12620	2014-11-20 21:13:30 +01:00
Tristan Darricau	48950be82b	[ticket/12620] Fix tests ... PHPBB3-12620	2014-11-20 21:13:26 +01:00
Tristan Darricau	ac0ff219c6	[ticket/12620] Move the routing.yml file to routing/environment.yml ... PHPBB3-12620	2014-11-20 21:13:21 +01:00
Tristan Darricau	dd4f2387fd	[ticket/12620] Use the test environment for the tests ... PHPBB3-12620	2014-11-20 21:12:22 +01:00
Tristan Darricau	91daa73663	[ticket/12620] Fix session tests ... PHPBB3-12620	2014-11-20 21:09:44 +01:00
Tristan Darricau	6019e51fed	[ticket/12620] Fix coding style ... PHPBB3-12620	2014-11-20 21:09:40 +01:00
Tristan Darricau	0a1db77ea8	[ticket/12620] Add a test using a custom DI extension in an extension ... PHPBB3-12620	2014-11-20 21:01:03 +01:00
Tristan Darricau	acc91a2bbf	[ticket/12620] Use the container to get the environment name ... PHPBB3-12620	2014-11-20 21:01:01 +01:00
Tristan Darricau	c98efc53a8	[ticket/12620] Fix rebase (move config file to the right directory) ... PHPBB3-12620	2014-11-20 21:00:01 +01:00