aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11533] Update unit testsVjacheslav Trushkin2013-05-111-1/+1
| | | | | | Update notification settings functional unit test for new layout PHPBB3-11533
* [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| | | | | | | Fix colspan and remove unnecessary tables in notification settings page in subsilver2. PHPBB3-11533
* [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| | | | PHPBB3-11533
* [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
| | | | | | | Add columns counter template variable. It counts number of notification types + column for name + column for checkbox PHPBB3-11533
* Merge branch 'develop-olympus' into developNils Adermann2013-05-091-4/+0
|\ | | | | | | | | * develop-olympus: [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
| * Merge pull request #1396 from bantu/ticket/11324Nils Adermann2013-05-091-4/+0
| |\ | | | | | | [ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
| | * [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.Andreas Fischer2013-05-091-4/+0
| | | | | | | | | | | | PHPBB3-11324
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-091-3/+5
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/11529] Format markdown code correctly [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
| * | Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympusAndreas Fischer2013-05-091-3/+5
| |\ \ | | |/ | |/| | | | | | | | | | * naderman/ticket/11529: [ticket/11529] Format markdown code correctly [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
| | * [ticket/11529] Format markdown code correctlyNils Adermann2013-05-091-3/+5
| | | | | | | | | | | | PHPBB3-11529
| | * [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.mdNils Adermann2013-05-091-0/+0
| |/ | | | | | | PHPBB3-11529
* | Merge branch 'develop-olympus' into developNils Adermann2013-05-096-17/+435
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR. [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. [ticket/11513] Use PHPUnit from composer in .travis.yml. [ticket/11513] Update (all) composer dependencies. [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency. Conflicts: .travis.yml phpBB/composer.lock
| * Merge pull request #1387 from bantu/ticket/11513Nils Adermann2013-05-096-17/+483
| |\ | | | | | | [ticket/11513] Install PHPUnit via Composer
| | * [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.Andreas Fischer2013-05-091-3/+8
| | | | | | | | | | | | PHPBB3-11513
| | * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-093-7/+9
| | | | | | | | | | | | PHPBB3-11513
| | * [ticket/11513] Use PHPUnit from composer in .travis.yml.Andreas Fischer2013-05-091-5/+3
| | | | | | | | | | | | PHPBB3-11513
| | * [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| | | | | | | | | | | | PHPBB3-11513
| | * [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
| |/ | | | | | | PHPBB3-11513
* | Merge branch 'develop-olympus' into developNils Adermann2013-05-092-189/+144
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11526] Update all dependencies / regenerate composer.lock. [ticket/11526] Increase composer minimum stability in olympus to stable. [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7. Conflicts: phpBB/composer.json phpBB/composer.lock
| * Merge pull request #1393 from bantu/ticket/11526Nils Adermann2013-05-092-145/+135
| |\ | | | | | | [ticket/11526] Increase composer minimum-stability from beta to stable
| | * [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| | | | | | | | | | | | PHPBB3-11526
| | * [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
| | | | | | | | | | | | PHPBB3-11526
| | * Merge branch 'ticket/11527' into ticket/11526Andreas Fischer2013-05-091-0/+0
| | |\ | | | | | | | | | | | | | | | | * ticket/11527: [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
| * | \ Merge pull request #1392 from bantu/ticket/11527Nils Adermann2013-05-091-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
| | * [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.Andreas Fischer2013-05-091-0/+0
| |/ | | | | | | PHPBB3-11527
* | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-083-19/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/10155: [ticket/10155] Update copyright in new migration file to 2013 [ticket/10155] Make effectively installed test more specific [ticket/10155] Use more descriptive title for migration file [ticket/10155] Use new migration file for jQuery config update [ticket/10155] Update jQuery to 1.8.3
| * | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| | | | | | | | | | | | PHPBB3-10155
| * | [ticket/10155] Make effectively installed test more specificMatt Friedman2013-03-221-1/+1
| | | | | | | | | | | | PHPBB3-10155
| * | [ticket/10155] Use more descriptive title for migration fileMatt Friedman2013-03-171-1/+1
| | | | | | | | | | | | PHPBB3-10155
| * | [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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently included jQuery is old by now, v1.6.2. We should update to 1.8.3. This allows us to take advantage of the latest form of jQuery event delegation ($.on). I don't think it wise to update to jQuery 1.9.x yet, as many 3rd party scripts still need to be updated to cope with its deprecated features ($.browser). Therefor, 1.8.3 is the latest and most widely compatible stable version right now. PHPBB3-10155
* | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-088-0/+100
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/10325: [ticket/10325] move migration into a new file [ticket/10325] fix acp language [ticket/10325] use assert_response_success parts [ticket/10325] fix language in acp and ucp [ticket/10325] add assert_response_success in test [ticket/10325] functional tests for forgot password functionality [ticket/10325] add logout function in functional_test_case [ticket/10325] fix language in acp and ucp [ticket/10325] improve acp option language [ticket/10325] fix language key [ticket/10325] fix language variable [ticket/10325] change language var [ticket/10325] fix language [ticket/10325] add new config value to database [ticket/10325] trigger error if forgot password option disabled [ticket/10325] add allow forgot password option in acp
| * | | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] fix acp languageDhruv2013-05-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] use assert_response_success partsDhruv2013-04-301-1/+5
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] fix language in acp and ucpDhruv2013-04-302-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] add assert_response_success in testDhruv2013-04-301-1/+3
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] functional tests for forgot password functionalityDhruv2013-04-251-0/+45
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] add logout function in functional_test_caseDhruv2013-04-251-0/+11
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] fix language in acp and ucpDhruv2013-04-252-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] improve acp option languageDhruv2013-04-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] fix language keyDhruv2013-04-252-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] fix language variableDhruv2013-04-252-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] change language varDhruv2013-04-255-6/+6
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] fix languageDhruv2013-04-252-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] add new config value to databaseDhruv2013-04-252-0/+3
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] trigger error if forgot password option disabledDhruv2013-04-252-0/+6
| | | | | | | | | | | | | | | | PHPBB3-10325
| * | | [ticket/10325] add allow forgot password option in acpDhruv2013-04-252-0/+3
| | | | | | | | | | | | | | | | PHPBB3-10325
* | | | Merge PR #1308 branch 'nickvergessen/ticket/11450' into developOleg Pudeyev2013-05-087-34/+209
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11450: [ticket/11450] Limit scopes of filters and add better docs [ticket/11450] Use helpers to copy/remove files [ticket/11450] Move mocked class into mock/metadata_manager.php [ticket/11450] Add new line at end of file [ticket/11450] Fix tests class name [ticket/11450] Require db_tools file to be included [ticket/11450] Add test for unexisting composer.json [ticket/11450] Test the extensions details page in ACP Customise Tab [ticket/11450] Fix all instances of phpbb_extension_metadata_manager [ticket/11450] Fix doc blocks and add missing class var $config [ticket/11450] Sort parameters alphabetically [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()
| * | | | [ticket/11450] Limit scopes of filters and add better docsJoas Schilling2013-05-081-11/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-11450