24116 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marc Alexander	9e3bc9a3f9	Merge branch 'develop-olympus' into develop-ascraeus ... Conflicts: .travis.yml travis/phpunit-mysqli-travis.xml	2015-02-13 12:06:07 +01:00
Marc Alexander	877774a296	Merge pull request #3393 from bantu/ticket/13599 ... [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.	2015-02-13 12:02:25 +01:00
Andreas Fischer	0a775e0433	[ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported. ... PHPBB3-13599	2015-02-12 22:12:32 +01:00
Andreas Fischer	39a3f4f6c8	Merge pull request #3391 from marc1706/ticket/13597 ... [ticket/13597] Modify variable-variable syntax to be compatible with PHP7 * marc1706/ticket/13597: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7	2015-02-11 16:53:25 +01:00
Marc Alexander	3df25babce	[ticket/13597] Modify variable-variable syntax to be compatible with PHP7 ... PHPBB3-13597	2015-02-11 12:03:54 +01:00
Joas Schilling	c6a371531b	Merge pull request #3379 from Crizz0/ticket/13588 ... [ticket/13588] Fixes wrong message in info fsockopen() disabled	2015-02-07 14:33:34 +01:00
Crizzo	fbc603861d	[ticket/13588] Fixes wrong message in info fsockopen() disabled ... PHPBB3-13588	2015-02-07 13:50:08 +01:00
Andreas Fischer	1e4853507a	Merge branch 'develop-olympus' into develop-ascraeus ... * develop-olympus:	2015-02-03 20:36:46 +01:00
Andreas Fischer	8832851b8e	Merge pull request #3366 from marc1706/ticket/13348 ... [ticket/13348] Use close method to free feed query result handle * marc1706/ticket/13348: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle	2015-02-03 20:36:41 +01:00
Andreas Fischer	2787e799e1	Merge pull request #3365 from marc1706/ticket/13348-olympus ... [ticket/13348] Use close method to free query result handle * marc1706/ticket/13348-olympus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle	2015-02-03 20:36:27 +01:00
Marc Alexander	a09d022d5e	Merge branch 'ticket/13348-olympus' into ticket/13348 ... Conflicts: phpBB/feed.php	2015-02-03 18:30:45 +01:00
Marc Alexander	4e06ab16f0	[ticket/13348] Remove unnecessary global $cache ... $cache is not used in the method get_item(). PHPBB3-13348	2015-02-03 18:24:16 +01:00
Marc Alexander	1f2cb69c8a	[ticket/13348] Use close method to free query result handle ... PHPBB3-13348	2015-02-03 18:23:13 +01:00
Andreas Fischer	5347eac69c	Merge pull request #3328 from marc1706/ticket/13538 ... [ticket/13538] Add tests for pagination in nested loops * marc1706/ticket/13538: [ticket/13538] Add tests for double nested pagination loop [ticket/13538] Fix tests for pagination in nested loop [ticket/13538] Add test for pagination in nested loop	2015-02-03 17:53:46 +01:00
Andreas Fischer	2864e77d6c	Merge pull request #3361 from marc1706/ticket/13569 ... [ticket/13569] Add missing sql_freeresults and remove unneeded results * marc1706/ticket/13569: [ticket/13569] Add missing sql_freeresults and remove unneeded results	2015-02-03 17:38:00 +01:00
Andreas Fischer	427d2de3ea	Merge branch 'develop-olympus' into develop-ascraeus ... * develop-olympus: [ticket/13572] Update composer to version 1.0.0-alpha9	2015-02-03 10:30:03 +01:00
Andreas Fischer	e86b7ce562	Merge pull request #3363 from Nicofuma/ticket/13572 ... [ticket/13572] Update composer to version 1.0.0-alpha9 * Nicofuma/ticket/13572: [ticket/13572] Update composer to version 1.0.0-alpha9	2015-02-03 10:30:02 +01:00
Nicofuma	f4f983c0f6	[ticket/13572] Update composer to version 1.0.0-alpha9 ... PHPBB3-13572	2015-02-03 10:25:39 +01:00
Joas Schilling	bbb6d6a452	Merge pull request #3330 from kasimi/ticket/13540 ... [ticket/13540] Add core event for modifying topic review block data	2015-02-02 23:30:06 +01:00
Joas Schilling	efee422707	Merge pull request #3326 from Wolfsblvt-Test/ticket/13537 ... Add core events on mcp_queue for approval and disapproval	2015-02-02 23:25:53 +01:00
Joas Schilling	7330c0afd3	Merge pull request #3325 from rxu/ticket/13536 ... [ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing	2015-02-02 23:22:23 +01:00
Joas Schilling	6678570f49	Merge pull request #3324 from rxu/ticket/13336 ... [ticket/13336] Add core events to the function user_active_flip()	2015-02-02 23:19:44 +01:00
Joas Schilling	e9eafece3f	Merge pull request #3323 from rxu/ticket/13535 ... [ticket/13535] Add core event to allow modifying account settings on editing	2015-02-02 23:18:15 +01:00
Joas Schilling	0e6cd94fb4	Merge pull request #3317 from Wolfsblvt/ticket/13532 ... Add core event to get_unread_topics() in functions.php	2015-02-02 23:12:42 +01:00
Joas Schilling	0aea283ab0	Merge pull request #3305 from Wolfsblvt/ticket/13518 ... Add core event to markread() in functions.php	2015-02-02 23:09:34 +01:00
Joas Schilling	b1336ae016	Merge pull request #3302 from rxu/ticket/13512 ... [ticket/13512] Add template events before/after the post details	2015-02-02 23:05:50 +01:00
Joas Schilling	7254a52812	Merge pull request #3282 from Elsensee/ticket/13313 ... [ticket/13313] Add event core.acp_email_display	2015-02-02 23:00:29 +01:00
Marc Alexander	5182d02da5	Merge pull request #3334 from paul999/ticket/13542 ... [ticket/13542] Update core.ucp_prefs_personal_data to include $error	2015-02-02 21:05:44 +01:00
Marc Alexander	a166f6f42c	[ticket/13569] Add missing sql_freeresults and remove unneeded results ... PHPBB3-13569	2015-02-02 17:36:39 +01:00
Joas Schilling	9f59aa59d9	Merge branch 'prep-release-3.1.3' into develop-ascraeus ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql	2015-02-01 20:23:16 +01:00
Joas Schilling	7f99e1c857	[prep-release-3.1.3] Add migration for 3.1.3 release-3.1.3	2015-02-01 19:18:30 +01:00
Joas Schilling	036b5c4244	[prep-release-3.1.3] Update version to 3.1.3	2015-02-01 19:15:42 +01:00
Joas Schilling	3c23242bfe	Merge branch 'prep-release-3.1.3' into develop-ascraeus	2015-01-31 12:11:43 +01:00
Joas Schilling	be30d8251a	[prep-release-3.1.3] Add changelog for 3.1.3-RC2 release-3.1.3-RC2	2015-01-31 01:08:29 +01:00
Joas Schilling	9232367b35	[prep-release-3.1.3] Add migration for 3.1.3-RC2	2015-01-31 01:06:23 +01:00
Joas Schilling	dd182c5433	[prep-release-3.1.3] Update version to 3.1.3-RC2	2015-01-31 01:03:55 +01:00
Joas Schilling	67478a0f94	Merge branch 'prep-release-3.1.3' into develop-ascraeus	2015-01-31 00:57:25 +01:00
Joas Schilling	e72c1540cb	Merge branch 'ticket/13553' into prep-release-3.1.3	2015-01-31 00:57:15 +01:00
Matt Friedman	e6bbde2bff	[ticket/13553] Use defined title value in page headers too ... PHPBB3-13553	2015-01-31 00:56:59 +01:00
Matt Friedman	ab4b1afd98	[ticket/13553] Make title var accept a lang key var ... PHPBB3-13553	2015-01-31 00:56:54 +01:00
Matt Friedman	7127d08c8f	[ticket/13553] Message helper should accept a lang key var ... PHPBB3-13553	2015-01-31 00:56:47 +01:00
Joas Schilling	b16854ab8c	Merge branch 'prep-release-3.1.3' into develop-ascraeus	2015-01-31 00:43:20 +01:00
Joas Schilling	bb4287ab2d	Merge pull request #3355 from nickvergessen/ticket/13557 ... [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1	2015-01-31 00:43:04 +01:00
Joas Schilling	9628e8df3b	[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1 ... PHPBB3-13557	2015-01-30 22:57:15 +01:00
Andreas Fischer	2690038d40	Merge branch 'prep-release-3.1.3' into develop-ascraeus ... * prep-release-3.1.3: [ticket/13556] Fix exception translation with filedownloader	2015-01-30 19:00:15 +01:00
Andreas Fischer	3fef570950	Merge pull request #3354 from nickvergessen/ticket/13556 ... [ticket/13556] Fix exception translation with filedownloader * nickvergessen/ticket/13556: [ticket/13556] Fix exception translation with filedownloader	2015-01-30 19:00:15 +01:00
Joas Schilling	69450c7152	[ticket/13556] Fix exception translation with filedownloader ... PHPBB3-13556	2015-01-30 18:05:13 +01:00
Joas Schilling	3e710fe393	Merge branch 'prep-release-3.1.3' into develop-ascraeus	2015-01-30 17:48:45 +01:00
Joas Schilling	e5f2eee167	Merge pull request #3341 from brunoais/ticket/13544 ... [ticket/13544] Fixing wrong SQL query for permission_unset() for roles	2015-01-30 17:45:21 +01:00
Andreas Fischer	899173eebd	Merge branch 'develop-olympus' into develop-ascraeus ... * develop-olympus: Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql	2015-01-30 13:43:05 +01:00