24449 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicofuma	e4b30c474b	[ticket/13838] Check braces for control structures ... PHPBB3-13838	2015-05-14 15:40:52 +02:00
Marc Alexander	4527789e50	Merge pull request #3605 from Nicofuma/ticket/13830 ... [ticket/13830] Check class used in catch statements	2015-05-14 12:53:29 +02:00
Nicofuma	084aa56777	[ticket/13830] Check class used in catch statements ... PHPBB3-13830	2015-05-10 21:13:36 +02:00
Marc Alexander	b3b7f8e925	Merge pull request #3530 from VSEphpbb/ticket/13753 ... [ticket/13753] Add template events to forum category row headers	2015-05-08 11:19:53 +02:00
Marc Alexander	7f5f5c216b	Merge pull request #3529 from rxu/ticket/13752 ... [ticket/13752] Add viewonline.php core event to allow modifying forum data SQL	2015-05-08 11:16:40 +02:00
Marc Alexander	d741ab57a8	Merge pull request #3526 from rxu/ticket/13750 ... [ticket/13750] Add core event to allow modifying navlinks text	2015-05-08 11:14:17 +02:00
Marc Alexander	7a478b27dd	Merge pull request #3459 from brunoais/ticket/13664 ... [ticket/13664] Add event to allow changing number of unapproved posts in mcp_front	2015-05-08 11:07:50 +02:00
Marc Alexander	4fc6e7dbc7	Merge pull request #3598 from VSEphpbb/ticket/13822 ... [ticket/13822] Correctly display softdelete and post detail perms	2015-05-08 10:59:40 +02:00
Matt Friedman	350786c969	[ticket/13822] Correctly display softdelete and post detail perms ... PHPBB3-13822	2015-05-07 21:10:16 -07:00
Marc Alexander	1e28748c0c	Merge pull request #3455 from brunoais/ticket/13660 ... [ticket/13660] Allow changing the query for total reports in mcp_front	2015-05-08 00:17:10 +02:00
rxu	a67db63a18	[ticket/13750] Add core event to allow modifying navlinks text ... Add generate_forum_nav() core event in includes/functions_display.php to allow modifying navlinks text. Use case example: extension(s) implementing multilanguage boards including translated forum names and so on. PHPBB3-13750	2015-05-07 21:57:27 +07:00
brunoais	603726371c	[ticket/13660] BUMP version to 3.1.5-RC1 ... PHPBB3-13660	2015-05-06 23:08:07 +01:00
brunoais	70cbe67105	[ticket/13664] BUMP version to 3.1.5-dev ... PHPBB3-13664	2015-05-06 22:55:30 +01:00
Marc Alexander	a8c033f655	Merge pull request #3521 from rxu/ticket/13745 ... [ticket/13745] Add viewtopic.php core event to allow manipulating poll data	2015-05-06 21:47:07 +02:00
Nicofuma	5e99c09abe	Merge pull request #3583 from nickvergessen/ticket/13807 ... Ticket/13807 Allow building changesets for the event list	2015-05-06 01:13:33 +02:00
Andreas Fischer	65b40f15f5	Merge pull request #3595 from marc1706/ticket/13819 ... [ticket/13819] Add missing sql_freeresult() to files in includes/ * marc1706/ticket/13819: [ticket/13819] Add missing sql_freeresult() to files in includes/	2015-05-06 00:46:57 +02:00
Marc Alexander	de90dd25b2	[ticket/13819] Add missing sql_freeresult() to files in includes/ ... PHPBB3-13819	2015-05-05 23:55:13 +02:00
Joas Schilling	740be0507e	[ticket/13807] Add version to the usage output ... PHPBB3-13807	2015-05-05 18:35:57 +02:00
Nicofuma	ab3e4b8abc	Merge pull request #3564 from VSEphpbb/ticket/13516 ... [ticket/13516] Do not search ICC profiles in extension vendors	2015-05-04 22:52:28 +02:00
Matt Friedman	5a107d9dc1	[ticket/13516] Update image search script ... PHPBB3-13516	2015-05-04 10:33:14 -07:00
Tristan Darricau	0e7448e2b3	Merge pull request #3562 from VSEphpbb/ticket/11521 ... [ticket/11521] Add missing lang strings for migration exceptions	2015-05-04 10:56:41 +02:00
Nicofuma	1b75411e81	Merge pull request #3588 from nickvergessen/ticket/13809-asc ... [ticket/13809] Perform the lint test prior to normal tests	2015-05-03 22:43:57 +02:00
Joas Schilling	923fdb0aa0	[ticket/13809] Test each file individually ... PHPBB3-13809	2015-05-03 20:08:02 +02:00
Joas Schilling	b73b9f1dec	[ticket/13809] Perform the lint test prior to normal tests ... PHPBB3-13809	2015-05-03 20:07:51 +02:00
Joas Schilling	f42a737419	Merge branch 'prep-release-3.1.4' into 3.1.x ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql	2015-05-03 18:44:01 +02:00
Joas Schilling	005c27e73d	[prep-release-3.1.4] Add security issue to changelog release-3.1.4	2015-05-03 17:14:55 +02:00
Joas Schilling	429b99922e	[prep-release-3.1.4] Add migration	2015-05-03 17:12:12 +02:00
Joas Schilling	199d823f7a	[prep-release-3.1.4] Update version to 3.1.4	2015-05-03 17:07:35 +02:00
Andreas Fischer	713fe496ce	Merge branch '3.0.x' into 3.1.x ... * 3.0.x: Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql	2015-05-03 16:44:55 +02:00
Andreas Fischer	cfeb2bec80	Merge branch 'prep-release-3.1.4' into 3.1.x ... * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml	2015-05-03 16:43:32 +02:00
Andreas Fischer	52aafb4dea	Merge branch 'prep-release-3.0.14' into 3.0.x ... * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql	2015-05-03 16:41:58 +02:00
Andreas Fischer	dde72c58b0	Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 ... * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql	2015-05-03 16:39:51 +02:00
Andreas Fischer	11242dd07d	[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. release-3.0.14	2015-05-03 16:22:28 +02:00
Andreas Fischer	5382552fc8	[prep-release-3.0.14] Bump version numbers for 3.0.14 release.	2015-05-03 14:40:50 +02:00
Joas Schilling	45baaf6022	[ticket/13807] Only output the header for diff ... PHPBB3-13807	2015-05-02 17:29:55 +02:00
Joas Schilling	34141b576e	[ticket/13807] Fix minor coding flaws ... PHPBB3-13807	2015-05-02 16:55:35 +02:00
Joas Schilling	2226043325	[ticket/13807] Fix "changed version" to match our version numbering ... PHPBB3-13807	2015-05-02 14:41:59 +02:00
Joas Schilling	96d97ae2d2	[ticket/13807] Add an option to generate a diff for the release highlights ... PHPBB3-13807	2015-05-02 14:41:59 +02:00
Joas Schilling	bdad879508	[ticket/13807] Allow filtering template events ... PHPBB3-13807	2015-05-02 14:35:26 +02:00
Joas Schilling	e0180991bf	[ticket/13807] Allow filtering events by phpBB version ... PHPBB3-13807	2015-05-02 14:35:18 +02:00
Tristan Darricau	af3cde98f4	Merge branch '3.0.x' into 3.1.x	2015-05-02 11:54:09 +02:00
Tristan Darricau	9c320ccdce	Merge pull request #3575 from marc1706/ticket/13792 ... [ticket/13792] Use hhvm instead of manually installing nightlys for now	2015-05-02 11:45:05 +02:00
Marc Alexander	7f820ee962	[ticket/13792] Use hhvm instead of manually installing nightlys for now ... Nightly builds are currently not supported because packages for precise no longer exist and travis is still running on it. PHPBB3-13792	2015-05-01 15:45:40 +02:00
Joas Schilling	9cd0295dd8	Merge branch 'prep-release-3.1.4' into 3.1.x ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql	2015-04-29 17:15:56 +02:00
Joas Schilling	1ad09d9c8b	[prep-release-3.1.4] Increase version number to 3.1.4-RC2 release-3.1.4-RC2	2015-04-29 09:59:40 +02:00
Andreas Fischer	95add752b7	Merge branch '3.0.x' into 3.1.x ... * 3.0.x:	2015-04-28 22:17:44 +02:00
Andreas Fischer	aa0c55ed8f	Merge branch 'prep-release-3.1.4' into 3.1.x ... * prep-release-3.1.4: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL	2015-04-28 22:17:37 +02:00
Andreas Fischer	c1702b8e19	Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into prep-release-3.1.4 ... * phpbb-security/ticket/security-180-asc: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL	2015-04-28 22:17:11 +02:00
Matt Friedman	acaa10de52	[ticket/13516] Do not search ICC profiles in extension vendors ... PHPBB3-13516	2015-04-28 13:12:48 -07:00
Marc Alexander	d7c96cc60c	[ticket/security-180] Use language variable for redirect error in 3.1+ ... SECURITY-180	2015-04-28 22:12:04 +02:00