aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-192-26/+26
|\ | | | | | | | | * develop-olympus: [ticket/10223] Replace spaces with tabs
| * 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 branch 'develop-olympus' into developAndreas Fischer2011-06-191-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
| * | | 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 'develop-olympus' into developAndreas Fischer2011-06-195-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
| * | | | 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 'develop-olympus' into developAndreas Fischer2011-06-193-11/+39
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 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 'develop-olympus' into developAndreas Fischer2011-06-181-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10229] On languge/acp/styles.php "%s" should be %s
| * | | 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 'develop-olympus' into developAndreas Fischer2011-06-161-0/+8
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.
| * | 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 'develop-olympus' into developAndreas Fischer2011-06-162-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| * | 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 'develop-olympus' into developAndreas Fischer2011-06-151-3/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.
| * | 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 'develop-olympus' into developAndreas Fischer2011-06-156-245/+139
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 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 'develop-olympus' into developAndreas Fischer2011-06-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10220] Limit user agent value length for storage in login attempt table
| * | | 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 'develop-olympus' into developAndreas Fischer2011-06-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10219] Remove invalid and invisible character from web.config.
| * | | 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
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-130-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus.Andreas Fischer2011-06-133-3/+3
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-132-4/+4
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10214] Correct Oracle create table query syntax in db_tools
| * 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 branch 'develop-olympus' into developAndreas Fischer2011-06-138-25/+25
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10213] Update install schema with shorter index names.
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-22 17:22:49 +0000