aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'igorw/ticket/10359' into developAndreas Fischer2011-09-081-0/+4
|\ | | | | | | | | * igorw/ticket/10359: [ticket/10359] Fix phpbb_request regression in download/file.php
| * [ticket/10359] Fix phpbb_request regression in download/file.phpIgor Wiedler2011-09-081-0/+4
|/ | | | | | The phpbb_request object, utf-8 tools and request_var injection are missing. PHPBB3-10359
* Merge branch 'develop-olympus' into developAndreas Fischer2011-09-062-2/+3
|\ | | | | | | | | | | | | * develop-olympus: [ticket/10352] Add missing break for Oracle's sql_table_drop() [ticket/10351] Fix Oracle's sql_column_remove() [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
| * Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympusAndreas Fischer2011-09-061-1/+1
| |\ | | | | | | | | | | | | * bantu/ticket/10294: [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
| | * [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.Andreas Fischer2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | sqlsrv_rows_affected() expects a statement resource, not a connection resource. PHPBB3-10294
| * | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympusAndreas Fischer2011-09-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | * Noxwizard/ticket/10351: [ticket/10351] Fix Oracle's sql_column_remove()
| | * | [ticket/10351] Fix Oracle's sql_column_remove()Patrick Webster2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The correct syntax is DROP COLUMN. PHPBB3-10351
| * | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympusAndreas Fischer2011-09-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10352: [ticket/10352] Add missing break for Oracle's sql_table_drop()
| | * | | [ticket/10352] Add missing break for Oracle's sql_table_drop()Patrick Webster2011-09-041-0/+1
| | |/ / | | | | | | | | | | | | PHPBB3-10352
* | | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-0514-0/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10155: [ticket/10155] Briefly explain assets in coding-guidelines [ticket/10155] Move jQuery inclusion to footer [ticket/10155] Update to jQuery 1.6.2 [ticket/10155] Add jQuery to AUTHORS [ticket/10155] Add jQuery, introduce global assets path
| * | | | [ticket/10155] Briefly explain assets in coding-guidelinesIgor Wiedler2011-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | [ticket/10155] Move jQuery inclusion to footerIgor Wiedler2011-07-1714-7/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | [ticket/10155] Update to jQuery 1.6.2Igor Wiedler2011-07-121-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | [ticket/10155] Add jQuery to AUTHORSIgor Wiedler2011-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-1113-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-052-1/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10350: [ticket/10350] Script for testing eval renderer [ticket/10350] Fix for class phpbb_template_renderer_eval
| * | | | | [ticket/10350] Script for testing eval rendererVjacheslav Trushkin2011-09-051-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Script for testing eval renderer (fixed) PHPBB3-10350
| * | | | | [ticket/10350] Fix for class phpbb_template_renderer_evalVjacheslav Trushkin2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug in class phpbb_template_renderer_eval PHPBB3-10350
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-051-2/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10354] Include cache directory path in unwritable message. Conflicts: tests/template/template_test.php
| * | | | | Merge remote-tracking branch 'p/ticket/10354' into develop-olympusIgor Wiedler2011-09-051-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10354: [ticket/10354] Include cache directory path in unwritable message.
| | * | | | | [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When template tests are skipped because cache directory is not writable, include path to the cache directory into the message saying it is not writable. PHPBB3-10354
* | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-053-0/+123
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10240] Added optionset to mock_user in the tests. [ticket/10240] Fixed copyright year in censor_text_test.php. [ticket/10240] Fixed censor_text test assetEquals param order. [ticket/10240] Added censor_text tests for special characters. [ticket/10240] Added censor_text tests. Conflicts: tests/mock/cache.php
| * | | | | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusIgor Wiedler2011-09-053-0/+123
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added optionset to mock_user in the tests. [ticket/10240] Fixed copyright year in censor_text_test.php. [ticket/10240] Fixed censor_text test assetEquals param order. [ticket/10240] Added censor_text tests for special characters. [ticket/10240] Added censor_text tests.
| | * | | | | | [ticket/10240] Added optionset to mock_user in the tests.Callum Macrae2011-08-232-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made optionset use the value set by optionset. We're not checking whether the option is set or not, because we would just throw an error if it wasn't set, and it throws an error anyway. PHPBB3-10240
| | * | | | | | [ticket/10240] Fixed copyright year in censor_text_test.php.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10240
| | * | | | | | [ticket/10240] Fixed censor_text test assetEquals param order.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, expected and input were the wrong way round. PHPBB3-10240
| | * | | | | | [ticket/10240] Added censor_text tests for special characters.Callum Macrae2011-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10240
| | * | | | | | [ticket/10240] Added censor_text tests.Callum Macrae2011-08-223-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-10240
* | | | | | | | Merge remote-tracking branch 'p/ticket/10355' into developIgor Wiedler2011-09-051-2/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10355: [ticket/10355] Correctly end output buffering in template tests.
| * | | | | | | | [ticket/10355] Correctly end output buffering in template tests.Oleg Pudeyev2011-09-051-2/+16
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was copied verbatim from develop-olympus. PHPBB3-10355
* | | | | | | | Merge remote-tracking branch 'bantu/ticket/9474' into developOleg Pudeyev2011-09-052-105/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9474: [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
| * | | | | | | | [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.Andreas Fischer2011-08-232-105/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9474
* | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-09-052-0/+57
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | * develop-olympus: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-052-0/+57
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| | * | | | | | [ticket/10321] Add descriptions to the unit testsJoas Schilling2011-08-211-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10321
| | * | | | | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-212-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10321
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-301-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10339: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| | * | | | | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10339
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10334] Require permissions to view the birthday-list on board index Conflicts: phpBB/index.php
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10334: [ticket/10334] Require permissions to view the birthday-list on board index
| | * | | | | | | [ticket/10334] Require permissions to view the birthday-list on board indexJoas Schilling2011-08-231-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10334
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-292-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| * | | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ↵Joas Schilling2011-08-292-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/bantu/10341 * remotes/bantu/ticket/10341: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| | * | | | | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-10341
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-292-0/+77
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10346] Add drop_tables to perform_schema_changes and add tests
| * | | | | | | Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346Joas Schilling2011-08-292-0/+77
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/naderman/ticket/10346: [ticket/10346] Add drop_tables to perform_schema_changes and add tests
| | * | | | | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-292-0/+77
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10346
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-273-9/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10253: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 02:45:43 +0000