aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3530 from VSEphpbb/ticket/13753Marc Alexander2015-05-082-0/+16
|\ | | | | | | [ticket/13753] Add template events to forum category row headers
| * [ticket/13753] Fix event documentationMatt Friedman2015-04-091-4/+4
| | | | | | | | PHPBB3-13753
| * [ticket/13753] Add template events to forum category row headersMatt Friedman2015-04-092-0/+16
| | | | | | | | PHPBB3-13753
* | Merge pull request #3529 from rxu/ticket/13752Marc Alexander2015-05-081-4/+20
|\ \ | | | | | | | | | [ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
| * | [ticket/13752] Add viewonline.php core event to allow modifying forum data SQLrxu2015-04-091-4/+20
| | | | | | | | | | | | PHPBB3-13752
* | | Merge pull request #3526 from rxu/ticket/13750Marc Alexander2015-05-081-7/+33
|\ \ \ | | | | | | | | | | | | [ticket/13750] Add core event to allow modifying navlinks text
| * | | [ticket/13750] Add core event to allow modifying navlinks textrxu2015-05-071-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #3459 from brunoais/ticket/13664Marc Alexander2015-05-081-4/+21
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
| * | | | [ticket/13664] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| * | | | [ticket/13664] Added alias to table to make modding easier.brunoais2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| * | | | [ticket/13664] Add event to allow changing number of unapproved posts listedbrunoais2015-03-011-0/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| * | | | [ticket/13664] From string query in mcp_front unapproved posts to built querybrunoais2015-03-011-4/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
* | | | | Merge pull request #3598 from VSEphpbb/ticket/13822Marc Alexander2015-05-081-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13822] Correctly display softdelete and post detail perms
| * | | | | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13822
* | | | | | Merge pull request #3455 from brunoais/ticket/13660Marc Alexander2015-05-081-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13660] Allow changing the query for total reports in mcp_front
| * | | | | | [ticket/13660] BUMP version to 3.1.5-RC1brunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13660
| * | | | | | [ticket/13660] Fix @since version.brunoais2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13660
| * | | | | | [ticket/13660] Allow changing the query for total reports in mcp_frontbrunoais2015-02-281-0/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-13660
* | | | | | Merge pull request #3521 from rxu/ticket/13745Marc Alexander2015-05-061-5/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13745] Add viewtopic.php core event to allow manipulating poll data
| * | | | | | [ticket/13745] Add viewtopic.php core events to allow manipulating poll datarxu2015-04-151-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13745
* | | | | | | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-064-21/+203
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13807 Allow building changesets for the event list
| * | | | | | | [ticket/13807] Add version to the usage outputJoas Schilling2015-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| * | | | | | | [ticket/13807] Only output the header for diffJoas Schilling2015-05-021-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| * | | | | | | [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| * | | | | | | [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| * | | | | | | [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-023-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| * | | | | | | [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| * | | | | | | [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-022-6/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
* | | | | | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-13819
* | | | | | | Merge pull request #3562 from VSEphpbb/ticket/11521Tristan Darricau2015-05-041-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11521] Add missing lang strings for migration exceptions
| * | | | | | | [ticket/11521] Add missing lang strings for migration exceptionsMatt Friedman2015-04-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11521
* | | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-032-0/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | | | | | [prep-release-3.1.4] Add security issue to changelogJoas Schilling2015-05-031-0/+4
| | | | | | | | |
| * | | | | | | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | | | | | | | |
| * | | | | | | | [prep-release-3.1.4] Update version to 3.1.4Joas Schilling2015-05-032-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-032-0/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-032-0/+41
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | | [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.Andreas Fischer2015-05-031-0/+4
| | | | | | | | |
| | * | | | | | | [prep-release-3.0.14] Bump version numbers for 3.0.14 release.Andreas Fischer2015-05-033-3/+9
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'phpbb-security/ticket/security-180' into ↵Andreas Fischer2015-04-281-1/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | \ \ \ \ \ \ \ Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | | | | | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-293-2/+34
| | | | | | | | | |
* | | | | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| * | | | | | | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * | | | | | | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| * | | | | | | | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| * | | | | | | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * | | | | | | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | | | | | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180