1781 Commits

Author	SHA1	Message	Date
Joas Schilling	d78bb2865b	[ticket/13421] Always require the interface when possible ... PHPBB3-13421	2014-12-06 16:17:04 +01:00
Joas Schilling	536bdf036b	[ticket/13421] Inherit docs ... PHPBB3-13421	2014-12-06 16:16:51 +01:00
Joas Schilling	10594779b9	[ticket/13421] Add an interface for \phpbb\db\tools ... PHPBB3-13421	2014-12-06 16:16:44 +01:00
Joas Schilling	0869a77201	Merge branch 'develop-ascraeus' into develop	2014-11-29 09:09:17 +01:00
Oliver Schramm	893e4b3067	[ticket/13393] Call user->lang function directly ... PHPBB3-13393	2014-11-27 00:55:01 +01:00
Marc Alexander	630e7077e0	Merge branch 'develop-ascraeus' into develop	2014-11-26 13:21:02 +01:00
Marc Alexander	6ac088ea2f	Merge pull request #3075 from Senky/ticket/11613 ... [ticket/11613] Cookies do not work for netbios domain	2014-11-26 13:20:36 +01:00
Marc Alexander	94d90c084b	Merge branch 'develop-ascraeus' into develop	2014-11-25 23:15:30 +01:00
Joas Schilling	eb83bd5797	[ticket/13381] Fix header intendation of v312.php ... PHPBB3-13381	2014-11-25 22:42:52 +01:00
Joas Schilling	1a0cba1099	Merge branch 'develop-ascraeus' into develop ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg	2014-11-25 16:47:22 +01:00
Joas Schilling	0fbe8e8e69	[prep-release-3.1.2] Add migration to update version to 3.1.2	2014-11-24 21:32:17 +01:00
Joas Schilling	dcd0f200d6	[prep-release-3.1.2] Add migration for 3.1.2-RC1	2014-11-22 19:27:34 +01:00
Joas Schilling	8f67892f5e	Merge branch 'develop-ascraeus' into develop	2014-11-22 17:49:06 +01:00
Joas Schilling	5c3b6a8559	Merge pull request #10 from phpbb/ticket/security-171 ... [ticket/security-171] Use type cast helper for json data	2014-11-22 17:48:37 +01:00
Joas Schilling	0c4a0cac61	Merge branch 'develop-ascraeus' into develop	2014-11-22 15:52:34 +01:00
Joas Schilling	a3b18d87dd	Merge pull request #8 from phpbb/ticket/security-169 ... [ticket/security-169] Stop loop through referer dir in top directory	2014-11-22 15:51:48 +01:00
Joas Schilling	11c9d11482	Merge branch 'develop-ascraeus' into develop	2014-11-22 15:43:33 +01:00
Joas Schilling	fd993cbaf2	Merge pull request #3157 from marc1706/ticket/13358 ... [ticket/13358] Add class for retrieving remote file data	2014-11-22 15:42:37 +01:00
Marc Alexander	ab69c79d07	Merge branch 'ticket/13358' into ticket/security-171	2014-11-22 15:24:27 +01:00
Marc Alexander	f3ae5e4cb2	[ticket/13358] Correctly create version_helper in acp_extensions ... The full namespace for the file_downloader is now also being used in version_helper. PHPBB3-13358	2014-11-22 15:23:26 +01:00
Jakub Senko	30f292f5a2	[ticket/11613] Allow cookies to work on netbios domains ... PHPBB3-11613	2014-11-22 11:29:57 +01:00
Marc Alexander	9649d78fa4	Merge branch 'ticket/13358' into ticket/security-171	2014-11-21 23:37:17 +01:00
Marc Alexander	6d3ac29aee	[ticket/13358] Use protected and public keywords where applicable ... PHPBB3-13358	2014-11-21 23:30:47 +01:00
Joas Schilling	dd3e440cef	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html	2014-11-21 23:26:51 +01:00
Marc Alexander	171837eefe	[ticket/13358] Do not pass variables by reference ... PHPBB3-13358	2014-11-21 23:16:22 +01:00
Joas Schilling	0017fad554	Merge pull request #3108 from Elsensee/ticket/13284 ... [ticket/13284] Message body not included in email	2014-11-21 23:10:00 +01:00
Joas Schilling	655cd3bd3a	Merge branch 'develop-ascraeus' into develop	2014-11-21 22:52:29 +01:00
Joas Schilling	c98cceaf22	Merge pull request #3068 from marc1706/ticket/13204 ... [ticket/13204] Tell user that password was incorrect when exceeding attempts	2014-11-21 22:52:24 +01:00
Joas Schilling	9b54f2d0c4	Merge branch 'develop-ascraeus' into develop	2014-11-21 22:42:26 +01:00
Joas Schilling	dd7e09d092	Merge pull request #3064 from marc1706/ticket/13197 ... [ticket/13197] Also delete group avatar from users that have it set	2014-11-21 22:41:17 +01:00
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
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	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	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
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	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	0b61e3540d	[ticket/12620] Fix tests ... PHPBB3-12620	2014-11-20 20:59:55 +01:00
Tristan Darricau	3a167aa0c3	[ticket/12620] Creates one di extension per phpBB extension ... PHPBB3-12620	2014-11-20 20:59:51 +01:00
Tristan Darricau	6cbb60d13f	[ticket/12620] Adds a yaml config file ... PHPBB3-12620	2014-11-20 20:59:48 +01:00
Tristan Darricau	aa061aa7c9	[ticket/12620] Uses a cache directory per environment ... PHPBB3-12620	2014-11-20 20:59:34 +01:00