aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-1140-125/+2714
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (28) and others # Via Andreas Fischer (9) and others * 'develop' of https://github.com/phpbb/phpbb3: (90 commits) [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver [feature/migrations] Remove default values from necessary parameters [ticket/11201] Revert WLM dropping because it is still used in China. [ticket/11220] Improvement to the info pop-up from "list=" [feature/migrations] Revert unrelated changes to functions.php [ticket/11233] prohibit selecting anonymous user as a PM recipient [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input. [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres. [ticket/10050] removing prosilver edits [ticket/9737] Fix some comments [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/11338] Travis CI: Install PHP extension for redis key-value store. [ticket/10050] adding .topicrow to template condition [ticket/9737] Fix a few minor things in migrations ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| * Merge remote-tracking branch 'exreaction/ticket/11350' into developIgor Wiedler2013-02-071-1/+1
| |\ | | | | | | | | | | | | * exreaction/ticket/11350: [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
| | * [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driverNathaniel Guse2013-02-061-1/+1
| | | | | | | | | | | | PHPBB3-11350
| * | Merge remote-tracking branch 'EXreaction/feature/migrations' into developDavid King2013-02-0620-0/+2516
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/feature/migrations: (48 commits) [feature/migrations] Remove default values from necessary parameters [feature/migrations] Revert unrelated changes to functions.php [ticket/9737] Fix some comments [ticket/9737] Fix a few minor things in migrations [feature/migrations] Make sure migration data not done before running data step [feature/migrations] Function to populate the migrations table (for install) [feature/migrations] Function effectively_installed() in migrations [feature/migrations] Make load_migrations recursive (optionally) [feature/migrations] Make the test depends_on methods static [feature/migrations] Make depends_on static to call it without dependencies [feature/migrations] install/database_update_migrations.php [feature/migrations] Move test.php -> install/database_update_migrations.php [feature/migrations] Store depends on in the database (serialized) [feature/migrations] Revert method completed [feature/migrations] Basic reverting test [feature/migrations] Test for calling a step multiple times [feature/migrations] Creating revert method to attempt reverting a migration [feature/migrations] Some comments in db_tools [feature/migrations] Reverse data functionality [feature/migrations] Comment ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql
| | * | [feature/migrations] Remove default values from necessary parametersNathaniel Guse2013-02-043-50/+61
| | | | | | | | | | | | | | | | | | | | | | | | Clean up some comments PHPBB3-9737
| | * | [feature/migrations] Revert unrelated changes to functions.phpNathaniel Guse2013-01-301-2/+1
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [ticket/9737] Fix some commentsNathaniel Guse2013-01-231-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [ticket/9737] Fix a few minor things in migrationsNathaniel Guse2013-01-222-4/+9
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Make sure migration data not done before running data stepNathan Guse2013-01-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Function to populate the migrations table (for install)Nathan Guse2013-01-131-0/+36
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Function effectively_installed() in migrationsNathan Guse2013-01-132-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows you to check if the migration is effectively installed (entirely optionall) This function is intended to help moving to migrations from a previous database updater, where some migrations may have been installed already even though they are not yet listed in the migrations table. PHPBB3-9737
| | * | [feature/migrations] Make load_migrations recursive (optionally)Nathan Guse2013-01-121-3/+14
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Make depends_on static to call it without dependenciesNathan Guse2013-01-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11318
| | * | [feature/migrations] install/database_update_migrations.phpNathan Guse2013-01-101-139/+0
| | | | | | | | | | | | | | | | | | | | | | | | Actually, this does not belong in the main PR, moving to the data PR. PHPBB3-9737
| | * | [feature/migrations] Move test.php -> install/database_update_migrations.phpNathan Guse2013-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This should be used as a basis for the database updater using migrations. PHPBB3-9737
| | * | [feature/migrations] Store depends on in the database (serialized)Nathan Guse2013-01-1010-34/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required so that when migrations are reverted we can check through all installed migrations and make sure that all dependencies are handled properly and so that we are only required to load the migrations files that could be dependent on the ones installed. I believe in normal proper use the old way might have worked, but in case something happens and an unrelated migration file is installed, but cannot be loaded, this makes sure we do not stop everything unless we absolutely must (one of those files is dependent on something we want to revert). PHPBB3-9737
| | * | [feature/migrations] Revert method completedNathan Guse2013-01-101-33/+41
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Creating revert method to attempt reverting a migrationNathan Guse2013-01-092-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | This code is in progress PHPBB3-9737
| | * | [feature/migrations] Some comments in db_toolsNathan Guse2013-01-091-0/+2
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Reverse data functionalityNathan Guse2013-01-095-11/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If data step fails, attempt to roll back any previous calls from the migration that failed. Fix some failing tests PHPBB3-9737
| | * | [feature/migrations] CommentNathan Guse2013-01-091-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Stop the update process if we are approaching time limitNathan Guse2013-01-091-12/+18
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Make sure the path sent to load_migrations is a directoryNathan Guse2013-01-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Prevent a lot++ of errors PHPBB3-9737
| | * | [feature/migrations] Fix if method (and create a test for it)Nathan Guse2013-01-091-5/+15
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] CommentsNathan Guse2013-01-092-12/+28
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Store state properly and send past result to callableNathan Guse2013-01-092-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | Fix return on module add PHPBB3-9737
| | * | [feature/migrations] Fixing returns of callables and handling data stateNathan Guse2013-01-099-204/+329
| | | | | | | | | | | | | | | | | | | | | | | | Lots of comments and some other miscellaneous fixes. PHPBB3-9737
| | * | [feature/migrations] Restore update_helpers.php fileNathan Guse2013-01-091-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | This should be removed by the data branch PHPBB3-9737
| | * | [feature/migrations] Remove migration data (separate PR)Nathan Guse2013-01-0941-2887/+0
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Migrations now somewhat worksNathan Guse2013-01-0938-3418/+934
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Add method and property visibility, use __construct()David King2013-01-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Update phpbb_db_migrator class for PHP 5.3.3David King2013-01-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Update phpbb_db_migration class for PHP 5.3.3David King2013-01-091-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Move migrator to service containerNathan Guse2013-01-0951-107/+2253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version numbers 3.1 updates Restore database_update.php file to what it was in develop Get first forum to place global announcements in PHPBB3-9737
| | * | [feature/migrations] Process migration steps and move to PHP5 codeNils Adermann2013-01-092-32/+120
| | | |
| | * | [feature/migrations] Remove references as it is now 3.1 codeNathan Guse2013-01-0945-280/+1179
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Change migration data processing to run step by stepNils Adermann2013-01-091-1/+23
| | | |
| | * | [feature/migrations] Rename classes, depends onNathan Guse2013-01-0951-347/+3520
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [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-092-7/+62
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Return schema changes in database update style arrayNils Adermann2013-01-092-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-0/+21
| | | | | | | | | | | | | | | | PHPBB3-9737
| | * | [feature/migrations] Basic migrations with schema and data changesNils Adermann2013-01-0911-0/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migrator takes care of applying migrations as necessary. RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337 PHPBB3-9737
| * | | [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