aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | [ticket/10223] Make definition of phpbb_require_updated conditionalNils Adermann2011-06-201-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The automatic updater defines it too and includes database_update.php for updating which causes an error otherwise. PHPBB3-10223
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-192-26/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10223] Replace spaces with tabs
| * | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-192-26/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | * naderman/ticket/10223: [ticket/10223] Replace spaces with tabs
| | * | [ticket/10223] Replace spaces with tabsNils Adermann2011-06-192-26/+26
| | | | | | | | | | | | | | | | PHPBB3-10223
* | | | Merge remote-tracking branch 'rxu/ticket/10227' into develop-olympusAndreas Fischer2011-06-191-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10227: [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
| * | | | [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+rxu2011-06-191-3/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10227
* | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-195-5/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
| * | | | Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9Andreas Fischer2011-06-195-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10232: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
| | * | | | [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDSNils Adermann2011-06-185-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids the global hidden fields from functions.php overwriting local searches. PHPBB3-10232
* | | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-193-11/+39
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10223] The search fid parameter is an array of forums not just an id [ticket/10223] Check optional before file_exists and correct require path [ticket/10223] requiring the new startup.php file conditionally.
| * | | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-193-11/+39
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10223: [ticket/10223] The search fid parameter is an array of forums not just an id [ticket/10223] Check optional before file_exists and correct require path [ticket/10223] requiring the new startup.php file conditionally.
| | * | | [ticket/10223] The search fid parameter is an array of forums not just an idNils Adermann2011-06-191-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-10223
| | * | [ticket/10223] Check optional before file_exists and correct require pathNils Adermann2011-06-182-4/+4
| | | | | | | | | | | | | | | | PHPBB3-10223
| | * | [ticket/10223] requiring the new startup.php file conditionally.Nils Adermann2011-06-182-10/+38
| | |/ | | | | | | | | | | | | | | | | | | Added a function for this which we can potentially apply to more of the files in the installer and database updater. PHPBB3-10223
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-181-4/+4
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.9: [ticket/10229] On languge/acp/styles.php "%s" should be %s
| * | Merge remote-tracking branch 'Raimon/ticket/10229' into prep-release-3.0.9Andreas Fischer2011-06-181-4/+4
| |\ \ | | |/ | |/| | | | | | | * Raimon/ticket/10229: [ticket/10229] On languge/acp/styles.php "%s" should be %s
| | * [ticket/10229] On languge/acp/styles.php "%s" should be %sRaimon2011-06-181-4/+4
| |/ | | | | | | PHPBB3-10229
* | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-161-0/+8
|\ \ | |/ | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.
| * [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.Andreas Fischer2011-06-161-0/+8
| |
* | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-162-2/+2
|\ \ | |/ | | | | | | * prep-release-3.0.9: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| * Merge remote-tracking branch 'naderman/ticket/10221' into prep-release-3.0.9Andreas Fischer2011-06-162-2/+2
| |\ | | | | | | | | | | | | * naderman/ticket/10221: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| | * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-162-2/+2
| |/ | | | | | | PHPBB3-10221
* | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Bumping version number for 3.0.9-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.Andreas Fischer2011-06-154-6/+12
| |
* | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-156-245/+139
|\ \ | |/ | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php
| * Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9Andreas Fischer2011-06-156-245/+139
| |\ | | | | | | | | | | | | | | | * Marshalrusty/ticket/10218: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php
| | * [ticket/10218] Prevent startime from being overwritten by deregister_globals()Yuriy Rusko2011-06-151-2/+3
| | | | | | | | | | | | PHPBB3-10218
| | * [ticket/10218] Moving global deregistration, etc. to startup.phpYuriy Rusko2011-06-146-245/+138
| | | | | | | | | | | | | | | | | | | | | Because startup.php deletes all variables, the constants in database_update are used to preserve settings at the top. PHPBB3-10218
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.9: [ticket/10220] Limit user agent value length for storage in login attempt table
| * | Merge remote-tracking branch 'naderman/ticket/10220' into prep-release-3.0.9Andreas Fischer2011-06-151-1/+1
| |\ \ | | | | | | | | | | | | | | | | * naderman/ticket/10220: [ticket/10220] Limit user agent value length for storage in login attempt table
| | * | [ticket/10220] Limit user agent value length for storage in login attempt tableNils Adermann2011-06-151-1/+1
| |/ / | | | | | | | | | PHPBB3-10220
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.9: [ticket/10219] Remove invalid and invisible character from web.config.
| * | Merge remote-tracking branch 'bantu/ticket/10219' into prep-release-3.0.9Igor Wiedler2011-06-151-1/+1
| |\ \ | | |/ | |/| | | | | | | * bantu/ticket/10219: [ticket/10219] Remove invalid and invisible character from web.config.
| | * [ticket/10219] Remove invalid and invisible character from web.config.Andreas Fischer2011-06-141-1/+1
| |/ | | | | | | PHPBB3-10219
* | [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus.Andreas Fischer2011-06-133-3/+3
|/
* Merge remote-tracking branch 'naderman/ticket/10214' into develop-olympusAndreas Fischer2011-06-132-4/+4
|\ | | | | | | | | * naderman/ticket/10214: [ticket/10214] Correct Oracle create table query syntax in db_tools
| * [ticket/10214] Correct Oracle create table query syntax in db_toolsNils Adermann2011-06-132-4/+4
|/ | | | | | | | Removes the semicolon at end of oracle CREATE TABLE queries and adds a semicolon to the end of a SELECT query inside of the trigger for a new table's auto increment column before the end keyword PHPBB3-10214
* Merge remote-tracking branch 'naderman/ticket/10213' into develop-olympusAndreas Fischer2011-06-138-25/+25
|\ | | | | | | | | * naderman/ticket/10213: [ticket/10213] Update install schema with shorter index names.
| * [ticket/10213] Update install schema with shorter index names.Nils Adermann2011-06-138-25/+25
|/ | | | PHPBB3-10213
* Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympusAndreas Fischer2011-06-131-2/+2
|\ | | | | | | | | * naderman/ticket/9892: [ticket/9892] _sql in the updater needs to return the transaction results
| * [ticket/9892] _sql in the updater needs to return the transaction resultsNils Adermann2011-06-121-2/+2
| | | | | | | | PHPBB3-9892
* | Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympusAndreas Fischer2011-06-121-0/+7
|\ \ | | | | | | | | | | | | * naderman/ticket/9992: [ticket/9992] The table name constant needs to be defined in the updater
| * | [ticket/9992] The table name constant needs to be defined in the updaterNils Adermann2011-06-121-0/+7
| | | | | | | | | | | | | | | | | | | | | When the database update is run before updating the files the constant is not yet defined. PHPBB3-9992
* | | [develop-olympus] Also build packages for 3.0.7.Andreas Fischer2011-06-121-1/+1
| | |
* | | [develop-olympus] Changelog: Changes since 3.0.8Andreas Fischer2011-06-121-17/+350
| | |
* | | [develop-olympus] Bumping version number for 3.0.9-RC1.Andreas Fischer2011-06-124-5/+5
| | |
* | | [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.Andreas Fischer2011-06-1210-11/+11
| | |
* | | Merge remote-tracking branch 'naderman/ticket/10211' into develop-olympusAndreas Fischer2011-06-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * naderman/ticket/10211: [ticket/10211] Add spce after dot in new language string
| * | | [ticket/10211] Add spce after dot in new language stringNils Adermann2011-06-121-1/+1
|/ / / | | | | | | | | | PHPBB3-10211
* | | Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympusAndreas Fischer2011-06-126-15/+388
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/9892: [ticket/9892] Correct copyright year [ticket/9892] Remove incorrect use of camel case [ticket/9892] Removing closing php tag from create_schema_files [ticket/9892] Transaction support for database update sql execution function [ticket/9892] count is a keyword in firebird, so renaming this alias [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config [ticket/9892] Shorten login_attempt key names to avoid firebird length problems [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state [ticket/9892] Adding a number of tests for db_tools [ticket/9892] Table prefix lengths influence index lengths in db_tools [ticket/9892] Shorten the index names on the q&a captcha [ticket/9892] column & index name limits, firebird auto increment in db_tools