aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [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-092-2/+416
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [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-091-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
| * [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 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-086-0/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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] fix language in acp and ucpDhruv2013-04-302-2/+2
| | | | | | | | | | | | | | | | 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-083-14/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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] Fix all instances of phpbb_extension_metadata_managerJoas Schilling2013-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11450
| * | | | [ticket/11450] Fix doc blocks and add missing class var $configJoas Schilling2013-05-081-3/+41
| | | | | | | | | | | | | | | | | | | | PHPBB3-11450
| * | | | [ticket/11450] Sort parameters alphabeticallyJoas Schilling2013-05-081-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11450
| * | | | [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()Joas Schilling2013-05-081-7/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11450
* | | | | [ticket/11442] Use button name as indicator instead of css classesJoas Schilling2013-05-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leaves it up to the style authors how to style any buttons, without messing up any functionality. PHPBB3-11442
* | | | | [ticket/11442] Do not suggest an option on ajax confirm boxJoas Schilling2013-05-083-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Reverting commit cb13add269b78e1a9ac84a80c78557bb7695df09 Also fixing in prosilver and subsilver2 PHPBB3-11442
* | | | Merge PR #1375 branch 'marc1706/ticket/11442' into developOleg Pudeyev2013-05-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By marc1706 # Via marc1706 * marc1706/ticket/11442: [ticket/11442] Use correct button class for ajaxified confirm_box
| * | | | [ticket/11442] Use correct button class for ajaxified confirm_boxmarc17062013-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 001572f the HTML code for the ajaxified confirm_box was moved from overall_footer.html to confirm_body.html. While copying, the CSS class of the "Yes" button was changed from button1 to button2. Due to the fact that the phpbb.confirm() method uses the class button1 to check if "Yes" was clicked, this broke the ajaxified confirm box in the ACP. With this small patch the confirm boxes in the ACP should work properly again. PHPBB3-11442
* | | | | Merge remote-tracking branch 'p-push/ticket/11435' into developAndreas Fischer2013-05-061-15/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p-push/ticket/11435: [ticket/11435] Fit comment into 80 columns and link to php manual.
| * | | | | [ticket/11435] Fit comment into 80 columns and link to php manual.Oleg Pudeyev2013-05-011-15/+21
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11435
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-067-28/+42
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
| * | | | Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-067-28/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MGaetan89/ticket/11144: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable
| | * | | | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace spaces with tabs PHPBB3-11144
| | * | | | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-067-28/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
* | | | | | Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into developOleg Pudeyev2013-05-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/11288: [ticket/11288] fix regex in postgres [ticket/11288] add search tests cases
| * | | | | | [ticket/11288] fix regex in postgresDhruv2013-05-041-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres search backend now uses updated regex being used by mysql search backend. PHPBB3-11288
* | | | | | Merge pull request #1348 from nickvergessen/ticket/11495Nils Adermann2013-05-025-0/+1040
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ticket/11495 Nested Set Implementation
| * | | | | | [ticket/11495] Throw exception when item that should be deleted does not existJoas Schilling2013-04-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | | [ticket/11495] Some more doc changesJoas Schilling2013-04-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | | [ticket/11495] Fix more grammar issues in doc blocksJoas Schilling2013-04-301-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | | [ticket/11495] Fix "as well" typo and remove bracketsJoas Schilling2013-04-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495