aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | # By Senky # Via Senky * remotes/Senky/ticket/10050: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition
| * | [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| | | | | | | | | | | | PHPBB3-10050
| * | [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
| | | | | | | | | | | | PHPBB3-10050
* | | Merge PR #1219 branch 'bantu/ticket/11343' into develop-olympusOleg Pudeyev2013-01-271-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11343: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| * | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
| * | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
| * | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
|/ / | | | | | | | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
* | Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympusOleg Pudeyev2013-01-244-2/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11337: [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm.
| * | [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| | | | | | | | | | | | PHPBB3-11337
| * | [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-233-3/+3
| | | | | | | | | | | | | | | | | | | | | There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19, which is what 5.3 is currently aliased to. PHPBB3-11337
| * | [ticket/11337] Silence nginx config file writing.Andreas Fischer2013-01-231-1/+1
| | | | | | | | | | | | PHPBB3-11337
| * | [ticket/11337] php-fpm.conf is no longer owned by root.Andreas Fischer2013-01-231-1/+1
| | | | | | | | | | | | PHPBB3-11337
| * | [ticket/11337] Run functional tests on travis using nginx and php-fpm.Andreas Fischer2013-01-234-0/+56
|/ / | | | | | | PHPBB3-11337
* | Merge remote-tracking branch 'p/ticket/11295' into develop-olympusAndreas Fischer2013-01-231-2/+25
|\ \ | | | | | | | | | | | | * p/ticket/11295: [ticket/11295] Drop tables rather than database for postgres in test suite.
| * | [ticket/11295] Drop tables rather than database for postgres in test suite.Oleg Pudeyev2012-12-261-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing so allows: 1. User running the tests no longer needs create database privilege. 2. Test database may be located in a non-default tablespace and generally have site-specific options applied to it. PHPBB3-11295
* | | Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympusAndreas Fischer2013-01-222-0/+9
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/11323-olympus: [ticket/11323] Backport include_define test to olympus.
| * | | [ticket/11323] Backport include_define test to olympus.Oleg Pudeyev2013-01-132-0/+9
| | | | | | | | | | | | | | | | PHPBB3-11323
* | | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
| * | | | [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drops default columns with T-SQL before attempting drop column to avoids sql exception. This is a huge annoyance in UMIL scripts running under sql server.
* | | | | Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympusOleg Pudeyev2013-01-133-1/+22
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/11323: [ticket/11323] Add tests for inclusion of defined variables
| * | | | [ticket/11323] Add tests for inclusion of defined variablesMarc Alexander2013-01-143-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds 2 tests for the template engine. The test using include_define_variable.html will test if a defined variable, which was defined with another template variable, can be used to include a file. The second test will do the same inside a loop using a loop variable. PHPBB3-11323
* | | | | Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympusOleg Pudeyev2013-01-131-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11324: [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
| * | | | | [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.Andreas Fischer2013-01-131-0/+5
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11324
* | | | | Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympusOleg Pudeyev2013-01-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11301: [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
| * | | | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11301
| * | | | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11301
* | | | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | | | Merge remote-tracking branch 'p/ticket/11293' into develop-olympusAndreas Fischer2012-12-311-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11293: [ticket/11293] Add a note that mysqli should be in front of mysql.
| * | | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
* | | | | Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympusOleg Pudeyev2012-12-291-9/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11291: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
| * | | | | [ticket/11291] phing: Also add checkreturn="true" to composer execution.Andreas Fischer2012-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Add checkreturn="true" to all new commands.Andreas Fischer2012-12-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Exclude vendor folder from diffs.Andreas Fischer2012-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we end up with very huge diffs and the build process is severely slowed down. PHPBB3-11291
| * | | | | [ticket/11291] phing packaging: Export composer.phar and install dependencies.Andreas Fischer2012-12-291-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Remove no longer needed create-package target.Andreas Fischer2012-12-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: The package target does not depend on composer.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The packaging process does not require running composer in the phpBB tree. It does however require running composer on the git exports, but this is not what the composer target does. PHPBB3-11291
| * | | | | [ticket/11291] phing: Adjust directory format of composer exec.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the directory format to what all the other exec calls are using. PHPBB3-11291
| * | | | | [ticket/11291] phing: Add description for composer target.Andreas Fischer2012-12-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Add --dev to composer install.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The composer target runs composer in the phpBB tree in order to load dependencies for testing. The testing framework may have additional development dependencies (e.g. goutte). We also have to load those. PHPBB3-11291
| * | | | | [ticket/11291] phing: Correct dependencies of composer target.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command runs composer in the phpBB tree and does not write to the build folders. Thus, it does not have to depend on prepare and clean targets. PHPBB3-11291
| * | | | | [ticket/11291] phing: Make sure composer is available before calling it.Andreas Fischer2012-12-231-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of the tree didn't use it. PHPBB3-11291
* | | | | | Merge remote-tracking branch 'p/ticket/11294' into develop-olympusAndreas Fischer2012-12-261-2/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11294: [ticket/11294] Capitalize phpunit. [ticket/11294] Update required/optional extension list for olympus.
| * | | | | [ticket/11294] Capitalize phpunit.Oleg Pudeyev2012-12-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11294
| * | | | | [ticket/11294] Update required/optional extension list for olympus.Oleg Pudeyev2012-12-251-1/+18
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11294
* | | | | [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
|/ / / / | | | | | | | | | | | | | | | | This is so generated packages are not confused with the already-released 3.0.11 version.
* | | | Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11278: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update
| * | | | [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on firebird. It was possible for board administrators to adjust the code to work. If code was manually adjusted by board administrators, index names would not be the same as what 3.0.9 and newer expect. This code fragment drops captcha tables, destroying all entered Q&A captcha configuration, such that when Q&A is configured next the respective tables will be created with corrent index names. If you wish to preserve your Q&A captcha configuration, you can manually rename indexes to the currently expected name: phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid Again, this needs to be done only if a board was manually modified to fix broken captcha code. PHPBB3-11278
| * | | | [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The db_tools class is running in return mode, which means that the queries are not run, but just returned. Therefor the broken tables were not removed from the database. PHPBB3-11278
* | | | | Merge remote-tracking branch 'p/ticket/11285' into develop-olympusAndreas Fischer2012-12-201-7/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11285: [ticket/11285] Use more granularity in dependency checks in compress test
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 01:09:58 +0000