aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3568 from s9e/ticket/10268Andreas Fischer2015-05-072-0/+8
|\
| * [ticket/10268] Added regression testJoshyPHP2015-04-292-0/+8
* | Merge pull request #3573 from s9e/ticket/9073Andreas Fischer2015-05-073-0/+18
|\ \
| * | [ticket/9073] Added regression testJoshyPHP2015-04-303-0/+18
| |/
* | Merge pull request #3571 from s9e/ticket/13425Andreas Fischer2015-05-073-0/+25
|\ \
| * | [ticket/13425] Added regression testJoshyPHP2015-04-303-0/+25
| |/
* | 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 events to allow manipulating poll datarxu2015-04-151-5/+72
* | | | Merge branch '3.1.x'Nicofuma2015-05-064-21/+203
|\ \ \ \ | |/ / /
| * | | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-064-21/+203
| |\ \ \
| | * | | [ticket/13807] Add version to the usage outputJoas Schilling2015-05-051-1/+1
| | * | | [ticket/13807] Only output the header for diffJoas Schilling2015-05-021-6/+7
| | * | | [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | * | | [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
| | * | | [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-023-14/+68
| | * | | [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | * | | [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-022-6/+106
* | | | | Merge branch '3.1.x'Andreas Fischer2015-05-062-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3595 from marc1706/ticket/13819Andreas Fischer2015-05-062-0/+2
| |\ \ \ \
| | * | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| |/ / / /
* | | | | Merge pull request #3432 from Nicofuma/ticket/13638Joas Schilling2015-05-0515-17/+120
|\ \ \ \ \
| * | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-0515-16/+58
| * | | | | [ticket/13638] Add testsNicofuma2015-05-041-0/+49
| * | | | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
| * | | | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
|/ / / / /
* | | | | Merge branch '3.1.x'Nicofuma2015-05-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3564 from VSEphpbb/ticket/13516Nicofuma2015-05-041-1/+1
| |\ \ \ \
| | * | | | [ticket/13516] Update image search scriptMatt Friedman2015-05-041-1/+1
| | * | | | [ticket/13516] Do not search ICC profiles in extension vendorsMatt Friedman2015-04-281-1/+1
* | | | | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
* | | | | | | Merge pull request #3589 from marc1706/ticket/13782Tristan Darricau2015-05-0416-25/+25
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13782] Rename null driver test to dummy driver testMarc Alexander2015-05-041-1/+1
| * | | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-043-4/+4
| * | | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-0413-20/+20
* | | | | | | | 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 exceptionsMatt Friedman2015-04-281-0/+7
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch '3.1.x'Nicofuma2015-05-033-24/+29
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3588 from nickvergessen/ticket/13809-ascNicofuma2015-05-033-24/+29
| |\ \ \ \ \ \
| | * | | | | | [ticket/13809] Test each file individuallyJoas Schilling2015-05-031-21/+28
| | * | | | | | [ticket/13809] Perform the lint test prior to normal testsJoas Schilling2015-05-032-3/+1
| |/ / / / / /
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-033-2/+38
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-033-2/+38
| |\ \ \ \ \ \
| | * | | | | | [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-033-4/+4
* | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-033-1/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-05-030-0/+0
| |\ \ \ \ \ \ \