aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [feature/migrations] Update 3.0.3-3.0.5 migrations to workNils Adermann2013-01-095-160/+107
| | | |
| * | | [feature/migrations] Depend on part2Nathaniel Guse2013-01-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Use $this->dbNathaniel Guse2013-01-091-8/+8
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Migrations back through 3.0.6Nathaniel Guse2013-01-095-208/+201
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] 3.0.8-rc1 migration, fix some callsNathaniel Guse2013-01-093-86/+89
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Some migrations dataNathaniel Guse2013-01-093-43/+63
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Moved database_update info to individual migration classesNils Adermann2013-01-0938-1472/+1998
| | | |
| * | | [feature/migrations] Standard vars for migrations and run sql with feedbackNils Adermann2013-01-093-8/+63
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Return schema changes in database update style arrayNils Adermann2013-01-093-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Returning the set of schema changes allows potentially aggregating to generate the overall install schema automatically from a set of migrations PHPBB3-9737
| * | | [feature/migrations] Store start and end time of migrationsNils Adermann2013-01-092-6/+48
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Basic migrations with schema and data changesNils Adermann2013-01-0915-0/+574
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migrator takes care of applying migrations as necessary. RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337 PHPBB3-9737
* | | | Merge remote-tracking branch 'remotes/bantu/ticket/11201' into developNathan Guse2013-02-0439-21/+267
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11201: [ticket/11201] Revert WLM dropping because it is still used in China.
| * | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-0439-21/+267
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits - 460470229d972b93ef5a98b0d1d97a2a970d684f - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2. PHPBB3-11201
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-031-3/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/11220] Improvement to the info pop-up from "list="
| * | | Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympusAndreas Fischer2013-02-031-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Crizz0/ticket/11220: [ticket/11220] Improvement to the info pop-up from "list="
| | * | | [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-311-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * develop-olympus: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| * | | Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympusAndreas Fischer2013-01-311-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11233: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| | * | | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-01-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky # Via Nathaniel Guse (1) and Senky (1) * develop-olympus: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | 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 'develop-olympus' into developOleg Pudeyev2013-01-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| * | | | 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 #1207 branch 'bantu/ticket/11295' into developOleg Pudeyev2013-01-261-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11295: [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
| * | | | [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.Andreas Fischer2013-01-251-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-11295
* | | | Merge PR #1201 branch 'develop-olympus' into developOleg Pudeyev2013-01-244-3/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: .travis.yml
| * | | 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 branch 'develop-olympus' into developAndreas Fischer2013-01-231-0/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11295] Drop tables rather than database for postgres in test suite. Conflicts: tests/test_framework/phpbb_database_test_connection_manager.php
| * | | 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 PR #1203 branch 'bantu/ticket/11338' into developOleg Pudeyev2013-01-232-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11338: [ticket/11338] Travis CI: Install PHP extension for redis key-value store.
| * | | | | [ticket/11338] Travis CI: Install PHP extension for redis key-value store.Andreas Fischer2013-01-232-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11338
* | | | | | Merge PR #1202 branch 'bantu/ticket/11338' into developOleg Pudeyev2013-01-222-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11338: [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.
| * | | | | [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.Andreas Fischer2013-01-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11338
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11323] Backport include_define test to olympus. Conflicts: tests/template/template_test.php
| * | | | | 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 branch 'develop-olympus' into developAndreas Fischer2013-01-220-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * develop-olympus:
| * | | | | 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
* | \ \ \ \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into developNathan Guse2013-01-222-21/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11329: [ticket/11329] Moving colors to colours.css