aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-081-1/+2
|\
| * 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 branch '3.1.x'Marc Alexander2015-05-081-0/+12
|\ \ \ | |/ /
| * | 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 branch '3.1.x'Marc Alexander2015-05-061-5/+72
|\ \ \ \ | |/ / /
| * | | 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 branch '3.1.x'Nicofuma2015-05-064-21/+203
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-062-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
| * | | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-13819
* | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-057-9/+33
| | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating files
| * | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpbb_is_writable() of filesystem class uses 'w' mode to fopen files which causes checked files to be truncated. Use the 'c' mode instead. PHPBB3-13814
* | | | | | Merge pull request #3589 from marc1706/ticket/13782Tristan Darricau2015-05-045-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13782] Rename classes that use reserved PHP7 keywords
| * | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782
| * | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-044-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-05-041-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | 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 '3.1.x'Joas Schilling2015-05-032-0/+36
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml
| * | | | | | 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 '3.1.x'Andreas Fischer2015-05-032-0/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [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.
| * | | | | | | 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
* | | | | | | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-022-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13762
* | | | | | | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13762
* | | | | | | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-0218-447/+1083
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13762
* | | | | | | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-019-54/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13793
* | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 08:17:53 +0000