21014 commits

Author	SHA1	Message	Date
Marc Alexander	d22fa412c4	Merge pull request #3220 from nickvergessen/ticket/13421 ... Ticket/13421 Introduce an interface for db\tools.php	2014-12-10 00:03:24 +01:00
Joas Schilling	ec90f2b380	[ticket/13421] Move tools to subdirectory ... PHPBB3-13421	2014-12-06 17:10:07 +01:00
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	8a35718149	Merge branch 'develop-ascraeus' into develop	2014-12-06 14:22:58 +01:00
Joas Schilling	641a9e5441	Merge pull request #3208 from prototech/ticket/13396 ... [ticket/13396] Normalize multibyte characters in attachment file names.	2014-12-06 14:22:49 +01:00
Joas Schilling	f0c6c4db15	Merge branch 'develop-ascraeus' into develop	2014-12-06 13:42:55 +01:00
kochi	dfbc109b59	[ticket/13400] Information text if the server load id high at search ... PHPBB3-13400	2014-12-06 13:42:16 +01:00
Cesar G	589394e80b	[ticket/13396] Normalize multibyte characters in attachment file names. ... PHPBB3-13396	2014-12-02 16:23:40 -08:00
Tristan Darricau	319efb026d	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php	2014-11-30 19:07:19 +01:00
rxu	499c1467df	[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php ... PHPBB3-13405	2014-11-30 11:27:47 +07:00
Joas Schilling	0869a77201	Merge branch 'develop-ascraeus' into develop	2014-11-29 09:09:17 +01:00
Joas Schilling	ac8b07ddd9	Merge pull request #3192 from Elsensee/ticket/13393 ... [ticket/13393] Call user->lang function directly	2014-11-29 09:08:51 +01:00
Oliver Schramm	893e4b3067	[ticket/13393] Call user->lang function directly ... PHPBB3-13393	2014-11-27 00:55:01 +01:00
Prosk8er	a5a18fb6dd	[ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post ... PHPBB3-13391	2014-11-26 14:09:07 -05:00
Marc Alexander	4c88c579b8	Merge branch 'develop-ascraeus' into develop	2014-11-26 13:30:24 +01:00
Marc Alexander	51f46a8f91	Merge pull request #3185 from Nicofuma/ticket/13389 ... [ticket/13389] Replace pattern with path	2014-11-26 13:30:03 +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
Tristan Darricau	90012c86e8	[ticket/13389] Replace pattern with path ... PHPBB3-13389	2014-11-26 12:24:50 +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	9c9623e47f	[prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev	2014-11-25 16:43:43 +01:00
Joas Schilling	1ad0dd28f1	Merge branch 'develop-olympus' into prep-release-3.1.2	2014-11-25 16:36:32 +01:00
Nils Adermann	965042d015	[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 ... Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376	2014-11-25 15:57:12 +01:00
Joas Schilling	9264d7c758	[prep-release-3.1.2] Update Changelog with 13376	2014-11-25 15:44:39 +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	3862b60094	[prep-release-3.1.2] Increase version number to 3.1.2	2014-11-24 21:31:49 +01:00
Joas Schilling	5f3dffa820	[prep-release-3.1.2] Add changelog for 3.1.2-RC1	2014-11-22 19:35:24 +01:00
Joas Schilling	18d5ca9ce5	[prep-release-3.1.2] Prepare Changelog	2014-11-22 19:32:36 +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	a5b3393bb0	[prep-release-3.1.2] Update version to 3.1.2-RC1	2014-11-22 19:22:40 +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
Joas Schilling	45aafe0b09	Merge branch 'develop-ascraeus' into develop	2014-11-22 12:21:30 +01:00
Joas Schilling	8b71103836	Merge pull request #3123 from Elsensee/ticket/13310 ... [ticket/13310] Add event core.acp_email_modify_sql	2014-11-22 12:21:24 +01:00
Joas Schilling	8ce736ad8a	Merge branch 'develop-ascraeus' into develop	2014-11-22 12:19:09 +01:00
Joas Schilling	ea101f7932	Merge pull request #3160 from PayBas/ticket/13228 ... [ticket/13228] Fix codebox "select all" font-size in UCP and MCP	2014-11-22 12:18:00 +01:00
Joas Schilling	d6c85757d7	Merge branch 'develop-ascraeus' into develop	2014-11-22 12:13:46 +01:00
Joas Schilling	7700f31213	Merge pull request #3116 from rxu/ticket/13297 ... [ticket/13297] Add unicode modifier to url/email regular expression patterns	2014-11-22 12:13:39 +01:00
Joas Schilling	ccad017214	Merge branch 'develop-ascraeus' into develop	2014-11-22 12:08:42 +01:00
Joas Schilling	a83b952f63	Merge pull request #3158 from prototech/ticket/13354 ... [ticket/13354] Fix incorrect column name when deleting all topic logs.	2014-11-22 12:08:33 +01:00