aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-04-051-0/+13
|\
| * Merge pull request #3520 from rxu/ticket/13743Tristan Darricau2015-04-051-0/+13
| |\
| | * [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.phprxu2015-04-051-0/+13
| |/
* | Merge pull request #3430 from MateBartus/ticket/12466Tristan Darricau2015-04-0513-1660/+2350
|\ \
| * | [ticket/12466] Move classes from acp_database.php to their own filesMateBartus2015-02-2713-1660/+2350
* | | Merge branch '3.1.x'Marc Alexander2015-04-041-1/+3
|\ \ \ | | |/ | |/|
| * | Merge pull request #3518 from marc1706/ticket/13703Marc Alexander2015-04-041-1/+3
| |\ \
| | * | [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATHKevin Roy2015-04-031-1/+3
* | | | Merge branch '3.1.x'Marc Alexander2015-04-041-1/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #3519 from marc1706/ticket/13742Marc Alexander2015-04-041-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/13742] Use correct avatar path for local avatarKevin Roy2015-04-031-1/+3
| |/ /
* | | Merge branch '3.1.x'Joas Schilling2015-04-034-20/+2
|\ \ \ | |/ /
| * | Merge pull request #3515 from cyberalien/ticket/13741Joas Schilling2015-04-034-20/+2
| |\ \
| | * | [ticket/13741] Remove outdated references to tweaks.csscyberalien2015-04-033-12/+2
| | * | [ticket/13741] Remove reference to unused body font-size declarationcyberalien2015-04-031-2/+0
| | * | [ticket/13741] Remove reference to oudated rollover code that no longer existscyberalien2015-04-032-6/+0
* | | | Merge branch '3.1.x'Joas Schilling2015-04-031-5/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '3.0.x' into 3.1.xJoas Schilling2015-04-031-5/+5
| |\ \ \
| | * \ \ Merge pull request #3512 from bantu/ticket/13738Joas Schilling2015-04-031-5/+5
| | |\ \ \
| | | * | | [ticket/13738] Use new branch names in sami-all.conf.php.Andreas Fischer2015-04-021-5/+5
| | |/ / /
* | | | | Merge branch '3.1.x'Marc Alexander2015-04-032-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3467 from dragosvr92/patch-5Marc Alexander2015-04-033-2/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/13602] Adding event overall_header_navbar_beforeDragos-Valentin Radulescu2015-03-063-2/+10
* | | | | Merge branch '3.1.x'Marc Alexander2015-04-021-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3508 from cyberalien/ticket/13726Marc Alexander2015-04-021-3/+10
| |\ \ \ \
| | * | | | [ticket/13726] Fix function that calculates responsive breadcrumbs widthcyberalien2015-03-281-3/+10
* | | | | | Merge branch '3.1.x'Marc Alexander2015-04-021-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3509 from cyberalien/ticket/13727Marc Alexander2015-04-021-1/+7
| |\ \ \ \ \
| | * | | | | [ticket/13727] Fix JS that resizes breadcrumbscyberalien2015-03-281-1/+7
| | |/ / / /
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-021-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3513 from bantu/ticket/13736Andreas Fischer2015-04-021-4/+4
| |\ \ \ \ \
| | * | | | | [ticket/13736] Missing four colon in Contact us pageRaphaƫl M2015-04-021-4/+4
| |/ / / / /
* | | | | | Merge pull request #3507 from VSEphpbb/ticket/13725Andreas Fischer2015-04-0221-34/+34
|\ \ \ \ \ \
| * | | | | | [ticket/13725] Coding guidelines: static publicMatt Friedman2015-03-2721-34/+34
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-04-011-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3510 from Nicofuma/ticket/13732Marc Alexander2015-04-011-0/+0
| |\ \ \ \ \ \
| | * | | | | | [ticket/13732] Update composer to be php7 compliantTristan Darricau2015-03-301-0/+0
| |/ / / / / /
* | | | | | | Merge branch '3.1.x'Nicofuma2015-03-294-5/+175
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '3.0.x' into 3.1.xNicofuma2015-03-290-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #3359 from marc1706/ticket/13568Nicofuma2015-03-293-5/+88
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-294-5/+175
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | [ticket/13568] Add unit tests for validating absolute pathMarc Alexander2015-02-061-0/+87
| | * | | | | | Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-063-5/+88
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | [ticket/13568] Also check if absolute_path_writable is writableMarc Alexander2015-02-061-1/+1
| | | * | | | | [ticket/13568] Use correct data provider on windowsMarc Alexander2015-02-031-1/+1
| | | * | | | | [ticket/13568] Add imagick tests for windowsMarc Alexander2015-02-021-8/+40
| | | * | | | | [ticket/13568] Correctly check rpath and rwpath validation optionsMarc Alexander2015-02-021-1/+1
| | | * | | | | [ticket/13568] Add more test cases for imagick pathMarc Alexander2015-02-021-0/+2
| | | * | | | | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-022-40/+9
| | | * | | | | [ticket/13568] Add functional test for imagick path settingMarc Alexander2015-02-021-0/+44