aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11707' into developAndreas Fischer2013-07-223-5/+11
|\
| * [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-193-5/+11
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-222-10/+18
|\ \
| * \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-222-10/+18
| |\ \
| | * \ Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-r...Andreas Fischer2013-07-222-10/+18
| | |\ \
| | | * | [ticket/11720] Add functional test for submitting report as userMarc Alexander2013-07-211-7/+12
| | | * | [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
* | | | | Merge pull request #1584 from marc1706/ticket/11713Nathan Guse2013-07-192-2/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-182-2/+5
|/ / / /
* | | | Merge remote-tracking branch 'cyberalien/ticket/11712' into developAndreas Fischer2013-07-181-1/+1
|\ \ \ \
| * | | | [ticket/11712] Fixing typo in editor.jsVjacheslav Trushkin2013-07-181-1/+1
* | | | | Merge remote-tracking branch 'cyberalien/ticket/11708' into developJoas Schilling2013-07-171-0/+4
|\ \ \ \ \
| * | | | | [ticket/11708] Fix bulletin points in notificationsVjacheslav Trushkin2013-07-161-0/+4
| |/ / / /
* | | | | Merge pull request #1575 from bantu/ticket/10931Joas Schilling2013-07-161-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/10931] Add phpbb_php_ini as a service.Andreas Fischer2013-07-161-0/+3
|/ / / /
* | | | Merge remote-tracking branch 'upstream/pr/1570' into developDavid King2013-07-141-1/+1
|\ \ \ \
| * | | | [ticket/11706] Use @ to suppress errors for getimagesize in remote avatarMarc Alexander2013-07-141-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into developNils Adermann2013-07-141-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #1567 from bantu/ticket/11704Nils Adermann2013-07-141-2/+2
| |\ \ \
| | * | | [ticket/11704] Use the correct directory for dependency checking.Andreas Fischer2013-07-141-1/+1
| | * | | [ticket/11704] Correctly escape "Andreas Fischer2013-07-141-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into developAndreas Fischer2013-07-141-1/+1
|\ \ \ \
| * | | | [ticket/11697] author_search() used incorrect parameterVictor Nagy2013-07-141-1/+1
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11702' into developAndreas Fischer2013-07-141-1/+1
|\ \ \ \ \
| * | | | | [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.phpJoas Schilling2013-07-141-1/+1
|/ / / / /
* | | | | Merge pull request #1558 from nickvergessen/ticket/11696Nils Adermann2013-07-1414-40/+3
|\ \ \ \ \
| * | | | | [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-0/+0
| * | | | | [ticket/11696] Rename constructor to __construct()Joas Schilling2013-07-141-1/+1
| * | | | | [ticket/11696] Remove manual loading of db_tools in extension controller testJoas Schilling2013-07-141-2/+0
| * | | | | [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-1413-37/+2
|/ / / / /
* | | | | Merge pull request #1559 from naderman/ticket/11698Nathan Guse2013-07-13273-52/+37
|\ \ \ \ \
| * | | | | [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14273-52/+37
|/ / / / /
* | | | | Merge pull request #1555 from EXreaction/ticket/11692Nils Adermann2013-07-131-1/+4
|\ \ \ \ \
| * | | | | [ticket/11692] Don't update search_type in dev migration if already appendedNathaniel Guse2013-07-131-1/+4
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/11694' into developDavid King2013-07-131-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
|/ / / / / /
* | | | | | Merge pull request #1554 from EXreaction/ticket/11675Nils Adermann2013-07-131-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11675] Fix template loopNathaniel Guse2013-07-131-1/+1
|/ / / / /
* | | | | Merge pull request #1429 from cyberalien/ticket/11553Nathan Guse2013-07-136-29/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/11553] TypoVjacheslav Trushkin2013-07-111-1/+1
| * | | | [ticket/11553] Replace bullet with unicodeVjacheslav Trushkin2013-07-111-2/+2
| * | | | [ticket/11553] Move bulletin points to pseudo classVjacheslav Trushkin2013-07-116-29/+85
* | | | | Merge pull request #1553 from naderman/ticket/11690Nathan Guse2013-07-131-5/+12
|\ \ \ \ \
| * | | | | [ticket/11690] Old module class names may get autoloaded by class_existsNils Adermann2013-07-131-5/+12
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'github-exreaction/ticket/11686' into develop-ol...Nils Adermann2013-07-131-0/+1
| |\ \ \ \
| | * | | | [ticket/11686] Not checking for phpBB Debug errors on functional testsNathaniel Guse2013-07-131-0/+1
* | | | | | Merge pull request #1473 from marc1706/ticket/11600Nathan Guse2013-07-131-22/+108
|\ \ \ \ \ \
| * | | | | | [ticket/11600] Remove duplicate test caseMarc Alexander2013-07-041-2/+0
| * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600Marc Alexander2013-07-0483-1542/+3338
| |\ \ \ \ \ \