20983 commits

Author	SHA1	Message	Date
Marc Alexander	5ca77df084	Merge pull request #3624 from VSEphpbb/ticket/13861 ... [ticket/13861] Fix undefined variables in style update migration	2015-05-22 11:49:07 +02:00
Matt Friedman	67502c0d22	[ticket/13861] Fix undefined variables in style update migration ... PHPBB3-13861	2015-05-21 15:23:17 -07:00
Tristan Darricau	1d2a127144	Merge pull request #3619 from javiexin/ticket/13852 ... [ticket/13852] Consistent tab navigation when login in	2015-05-19 09:43:29 +02:00
javiexin	cb12a065df	[ticket/13852] Consistent tab navigation when login in ... Added tabindex attribute to input elements in index_body.html to make tab navigation consistent with that of login_body.html. PHPBB3-13852	2015-05-18 19:38:48 +02:00
Nicofuma	309a6b9313	Merge pull request #3601 from nickvergessen/ticket/13827 ... [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX	2015-05-17 20:01:18 +02:00
Joas Schilling	e52bc2d022	Merge pull request #3606 from Nicofuma/ticket/13838 ... [ticket/13838] Check braces for control structures	2015-05-16 13:39:45 +02:00
Oliver Schramm	1c0c9c1bca	Merge pull request #3563 from rxu/ticket/13791 ... [ticket/13791] Add more post buttons template events to viewtopic_body.html	2015-05-15 17:52:44 +02:00
Joas Schilling	502214bf06	[ticket/13827] Use JsonResponse instead of our hacky json_response with exit() ... PHPBB3-13827	2015-05-14 17:13:47 +02:00
Marc Alexander	d004a1c6b8	Merge pull request #3540 from RMcGirr83/ticket/13699 ... [ticket/13699] Add event before and after forum title in viewforum	2015-05-14 15:56:05 +02:00
Nicofuma	62e13e945c	[ticket/13838] Fix coding style ... PHPBB3-13838	2015-05-14 15:43:44 +02:00
Joas Schilling	66279e1a57	[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX ... PHPBB3-13827	2015-05-09 20:48:14 +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
Marc Alexander	de90dd25b2	[ticket/13819] Add missing sql_freeresult() to files in includes/ ... PHPBB3-13819	2015-05-05 23:55:13 +02:00
Richard McGirr	c2b4636008	[ticket/13699] Add event before and after forum title in viewforum ... PHPBB3-13699	2015-05-05 13:37:46 -04:00
Joas Schilling	740be0507e	[ticket/13807] Add version to the usage output ... PHPBB3-13807	2015-05-05 18:35:57 +02: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
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	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	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	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.	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
rxu	aef5be3d17	[ticket/13791] Add more post buttons template events to viewtopic_body.html ... The purpose is to allow adding custom post buttons outside of original post buttons conditionals/list in prosilver (for subsilver2 it's not the issue). PHPBB3-13791	2015-05-01 10:59:18 +07: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	2015-04-29 09:59:40 +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
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
Marc Alexander	416728fc17	Merge branch 'ticket/security-180' into ticket/security-180-asc ... Conflicts: tests/security/redirect_test.php	2015-04-28 22:12:03 +02:00
Marc Alexander	ec207d0a71	[ticket/security-180] Merge if statement with previous one in 3.1.x ... SECURITY-180	2015-04-28 22:08:19 +02:00
Marc Alexander	89723b17d9	Merge branch 'ticket/security-180' into ticket/security-180-asc ... Conflicts: tests/security/redirect_test.php	2015-04-28 22:08:15 +02:00
Andreas Fischer	1a3350619f	Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-release-3.0.14 ... * phpbb-security/ticket/security-180: [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 21:54:50 +02:00