aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11351' into developDavid King2013-02-236-14/+96
|\ | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse (4) and Nathan Guse (1) # Via Nathan Guse * EXreaction/ticket/11351: [feature/migrations] getLocalisedMessage function for migration exception [feature/migrations] Fix unfulfillable function [feature/migrations] getParameters function for migration exception [feature/migrations] Add explanatory language string for migration errors [feature/migrations] Add language strings for migrations errors
| * [feature/migrations] getLocalisedMessage function for migration exceptionNathan Guse2013-02-151-0/+14
| | | | | | | | PHPBB3-11351
| * [feature/migrations] Fix unfulfillable functionNathaniel Guse2013-02-091-2/+2
| | | | | | | | | | | | Returned unfulfillable name in the wrong place previously PHPBB3-11351
| * [feature/migrations] getParameters function for migration exceptionNathaniel Guse2013-02-091-0/+10
| | | | | | | | PHPBB3-11351
| * [feature/migrations] Add explanatory language string for migration errorsNathaniel Guse2013-02-091-0/+1
| | | | | | | | | | | | | | This should be used if an exception is thrown to inform the user of what occurred. PHPBB3-11351
| * [feature/migrations] Add language strings for migrations errorsNathaniel Guse2013-02-095-14/+71
| | | | | | | | | | | | | | Unfulfillable returns string of the missing dependency name now if the migration is unfulfillable (this is significantly more helpful). PHPBB3-11351
* | Merge PR #1062 branch 'dhruvgoel92/ticket/11179' into developOleg Pudeyev2013-02-185-36/+157
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/11179: [ticket/11179] remove extra & in function call [ticket/11179] correct start parameter in sphinx search [ticket/11179] correct start parameter in native author search [ticket/11179] correct start parameter in native keyword search [ticket/11179] fix success query path for postgres [ticket/11179] fix success query path for mysql [ticket/11179] minor fixes [ticket/11179] pass start param by reference in postgres [ticket/11179] correct start param in author search of postgres [ticket/11179] correct start parameter in psql keyword search [ticket/11179] pass start param by reference in author search [ticket/11179] correct start parameter for author search [ticket/11179] use FOUND_ROWS query to re-search with changed start param [ticket/11179] pass start parameter by reference [ticket/11179] correct the start parameter while retrieving from cache [ticket/11179] add search query in case initial one fails
| * | [ticket/11179] remove extra & in function callDhruv2013-02-191-1/+1
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in sphinx searchDhruv2013-02-191-3/+20
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in native author searchDhruv2013-02-191-5/+18
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in native keyword searchDhruv2013-02-191-9/+19
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] fix success query path for postgresDhruv2013-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | | Additional query to check start parameter executed only incase of no results. PHPBB3-11179
| * | [ticket/11179] fix success query path for mysqlDhruv2013-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | | Additional query to check start parameter executed only incase of no results. PHPBB3-11179
| * | [ticket/11179] minor fixesDhruv2013-02-192-1/+3
| | | | | | | | | | | | | | | | | | | | | Amends comments to start with capitals. Reinsert blank lines which were not supposed to be removed PHPBB3-11179
| * | [ticket/11179] pass start param by reference in postgresDhruv2013-02-191-2/+2
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start param in author search of postgresDhruv2013-02-191-0/+19
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in psql keyword searchDhruv2013-02-191-5/+20
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] pass start param by reference in author searchDhruv2013-02-191-2/+2
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter for author searchDhruv2013-02-191-2/+21
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] use FOUND_ROWS query to re-search with changed start paramDhruv2013-02-191-38/+22
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] pass start parameter by referenceDhruv2013-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | start parameter is passed by reference so that in case it is not in bounds the changes made to it are reflected back to the phpBB/search.php file PHPBB3-11179
| * | [ticket/11179] correct the start parameter while retrieving from cacheDhruv2013-02-191-1/+13
| | | | | | | | | | | | | | | | | | | | | Start parameter if not between 0 and the total result count of the cached search results is changed accordingly PHPBB3-11179
| * | [ticket/11179] add search query in case initial one failsDhruv2013-02-191-2/+32
|/ / | | | | | | | | | | | | changes the start parameter according to the total search results and executes the search query again to get the results. PHPBB3-11179
* | Merge PR #1236 branch 'dhruvgoel92/ticket/11359' into developOleg Pudeyev2013-02-181-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/11359: [ticket/11359] html escape sphinx config data [ticket/11359] add id attribute to textarea [ticket/11359] close span
| * | [ticket/11359] html escape sphinx config dataDhruv2013-02-181-1/+1
| | | | | | | | | | | | PHPBB3-11359
| * | [ticket/11359] add id attribute to textareaDhruv2013-02-181-1/+1
| | | | | | | | | | | | PHPBB3-11359
| * | [ticket/11359] close spanDhruv2013-02-181-1/+1
|/ / | | | | | | PHPBB3-11359
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-121-1/+1
|\ \ | |/ |/| | | | | * develop-olympus: [ticket/11196] Changed 401 response message in session.php.
| * Merge branch 'ticket/erangamapa/11196' into develop-olympusAndreas Fischer2013-02-121-1/+1
| |\ | | | | | | | | | | | | * ticket/erangamapa/11196: [ticket/11196] Changed 401 response message in session.php.
| | * [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
| |/ | | | | | | | | | | | | In session.php 401 response message was "Not Authorized". I changed it to "Unauthorized". PHPBB3-11196
* | 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-0635-0/+3570
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-134-3/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 the test depends_on methods staticNathan Guse2013-01-107-23/+3
| | | | | | | | | | | | | | | | PHPBB3-11318
| * | | [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-1013-48/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Basic reverting testNathan Guse2013-01-103-0/+115
| | | | | | | | | | | | | | | | PHPBB3-9737
| * | | [feature/migrations] Test for calling a step multiple timesNathan Guse2013-01-102-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used when a long-running process is needed during an update. For example, iterating over all posts and applying some transformation. This allows the process to be broken apart into multiple shorter steps to prevent hitting the time limit. PHPBB3-9737
| * | | [feature/migrations] Creating revert method to attempt reverting a migrationNathan Guse2013-01-092-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | This code is in progress PHPBB3-9737