21039 Commits

Author	SHA1	Message	Date
Joas Schilling	3c41df2255	Merge branch 'develop-ascraeus' into develop	2014-12-27 13:38:25 +01:00
Joas Schilling	867a45138c	Merge pull request #3175 from Senky/ticket/13368 ... [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event	2014-12-27 13:38:19 +01:00
Joas Schilling	00933ad287	Merge branch 'develop-ascraeus' into develop	2014-12-27 13:37:11 +01:00
Joas Schilling	aea67c8e37	Merge pull request #3168 from Senky/ticket/11033 ... [ticket/11033] FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field	2014-12-27 13:37:04 +01:00
Joas Schilling	22948127f8	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/index.htm phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html phpBB/styles/subsilver2/theme/images/index.htm	2014-12-27 13:35:23 +01:00
Joas Schilling	d2334ab3e0	Merge pull request #3167 from Senky/ticket/12924 ... [ticket/12924] Make meta tags self-closing	2014-12-27 13:34:48 +01:00
Joas Schilling	0fe30e8a96	Merge pull request #3170 from Nicofuma/ticket/13266-develop ... [ticket/13266-develop] Enable twig dump function	2014-12-27 13:31:16 +01:00
Joas Schilling	5b1c9831c2	Merge pull request #3099 from Senky/ticket/13266 ... [ticket/13266] Enabling twig dump function if DEBUG is defined	2014-12-27 13:31:01 +01:00
Joas Schilling	bd3ef49e0b	Merge branch 'develop-ascraeus' into develop	2014-12-27 13:29:17 +01:00
Joas Schilling	a66e4770c1	Merge pull request #3159 from Crizz0/ticket/13357 ... [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries	2014-12-27 13:29:04 +01:00
Jakub Senko	91dc002c31	[ticket/13368] Update version ... PHPBB3-13368	2014-12-11 14:11:43 +01:00
Cesar G	892aa43eee	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/12567] wrap to top	2014-12-09 17:59:01 -08:00
Cesar G	61df1ac2b3	Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeus ... * Senky/ticket/12567: [ticket/12567] wrap to top	2014-12-09 17:58:43 -08:00
Cesar G	1d8e261747	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/13319] Add missing table tags	2014-12-09 17:50:34 -08:00
Cesar G	46384adf00	Merge remote-tracking branch 'Senky/ticket/13319' into develop-ascraeus ... * Senky/ticket/13319: [ticket/13319] Add missing table tags	2014-12-09 17:50:14 -08:00
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
Jakub Senko	b8ecd1a656	[ticket/13368] Add @changed entry ... PHPBB3-13368	2014-11-24 21:30:42 +01:00
Jakub Senko	bb4b04f89a	[ticket/13319] Add missing table tags ... PHPBB3-13319	2014-11-24 20:48:15 +01:00
Jakub Senko	9348b0c4f2	[ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event ... PHPBB3-13368	2014-11-24 20:28:47 +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