aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11465] Increase count of disabled extensions to 5 in functional testMarc Alexander2013-05-121-1/+1
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-12185-1989/+6802
|\
| * Merge remote-tracking branch 'remotes/bantu/ticket/11452' into developNathaniel Guse2013-05-111-1/+1
| |\
| | * [ticket/11452] Now notification_method_email checks whether user has address.Andreas Fischer2013-03-171-1/+1
| * | Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into developNathaniel Guse2013-05-113-0/+111
| |\ \
| | * | [ticket/10741] Docblock for phpbb.resizeTextAreaVjacheslav Trushkin2013-04-301-15/+26
| | * | [ticket/10741] Fix for browser-specific resizing of textareaVjacheslav Trushkin2013-04-121-3/+3
| | * | [ticket/10741] Do not resize textarea.no-auto-resizeVjacheslav Trushkin2013-04-122-2/+2
| | * | [ticket/10741] Automatically resize textareas in prosilver and ACPVjacheslav Trushkin2013-04-122-0/+15
| | * | [ticket/10741] Function to resize textarea elementsVjacheslav Trushkin2013-04-121-0/+85
| * | | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-4/+0
| |\ \ \
| | * \ \ Merge pull request #1396 from bantu/ticket/11324Nils Adermann2013-05-091-4/+0
| | |\ \ \
| | | * | | [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.Andreas Fischer2013-05-091-4/+0
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-091-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympusAndreas Fischer2013-05-091-3/+5
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | [ticket/11529] Format markdown code correctlyNils Adermann2013-05-091-3/+5
| | | * | | [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.mdNils Adermann2013-05-091-0/+0
| | |/ / /
| * | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-096-17/+435
| |\ \ \ \ | | |/ / /
| | * | | Merge pull request #1387 from bantu/ticket/11513Nils Adermann2013-05-096-17/+483
| | |\ \ \
| | | * | | [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.Andreas Fischer2013-05-091-3/+8
| | | * | | [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-093-7/+9
| | | * | | [ticket/11513] Use PHPUnit from composer in .travis.yml.Andreas Fischer2013-05-091-5/+3
| | | * | | [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| | | * | | [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
| | |/ / /
| * | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-092-189/+144
| |\ \ \ \ | | |/ / /
| | * | | Merge pull request #1393 from bantu/ticket/11526Nils Adermann2013-05-092-145/+135
| | |\ \ \
| | | * | | [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| | | * | | [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
| | | * | | Merge branch 'ticket/11527' into ticket/11526Andreas Fischer2013-05-091-0/+0
| | | |\ \ \
| | * | \ \ \ Merge pull request #1392 from bantu/ticket/11527Nils Adermann2013-05-091-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | | * | | [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.Andreas Fischer2013-05-091-0/+0
| | |/ / /
| * | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-083-19/+34
| |\ \ \ \
| | * | | | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| | * | | | [ticket/10155] Make effectively installed test more specificMatt Friedman2013-03-221-1/+1
| | * | | | [ticket/10155] Use more descriptive title for migration fileMatt Friedman2013-03-171-1/+1
| | * | | | [ticket/10155] Use new migration file for jQuery config updateMatt Friedman2013-03-152-1/+32
| | * | | | [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-143-20/+4
| * | | | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-088-0/+100
| |\ \ \ \ \
| | * | | | | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| | * | | | | [ticket/10325] fix acp languageDhruv2013-05-041-1/+1
| | * | | | | [ticket/10325] use assert_response_success partsDhruv2013-04-301-1/+5
| | * | | | | [ticket/10325] fix language in acp and ucpDhruv2013-04-302-2/+2
| | * | | | | [ticket/10325] add assert_response_success in testDhruv2013-04-301-1/+3
| | * | | | | [ticket/10325] functional tests for forgot password functionalityDhruv2013-04-251-0/+45
| | * | | | | [ticket/10325] add logout function in functional_test_caseDhruv2013-04-251-0/+11
| | * | | | | [ticket/10325] fix language in acp and ucpDhruv2013-04-252-2/+2
| | * | | | | [ticket/10325] improve acp option languageDhruv2013-04-251-1/+1
| | * | | | | [ticket/10325] fix language keyDhruv2013-04-252-2/+2
| | * | | | | [ticket/10325] fix language variableDhruv2013-04-252-2/+2
| | * | | | | [ticket/10325] change language varDhruv2013-04-255-6/+6