aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-201-11/+14
|\
| * Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-201-11/+14
| |\
| | * Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-201-11/+14
| | |\
| | | * [ticket/10223] Make definition of phpbb_require_updated conditionalNils Adermann2011-06-201-11/+14
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-192-26/+26
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-192-26/+26
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-192-26/+26
| | |\ \ | | | |/
| | | * [ticket/10223] Replace spaces with tabsNils Adermann2011-06-192-26/+26
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-191-3/+6
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'rxu/ticket/10227' into develop-olympusAndreas Fischer2011-06-191-3/+6
| |\ \ \
| | * | | [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+rxu2011-06-191-3/+6
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-195-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-195-5/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9Andreas Fischer2011-06-195-5/+5
| | |\ \ \
| | | * | | [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDSNils Adermann2011-06-185-5/+5
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-193-11/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-193-11/+39
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-193-11/+39
| | |\ \ \
| | | * | | [ticket/10223] The search fid parameter is an array of forums not just an idNils Adermann2011-06-191-1/+1
| | | | |/ | | | |/|
| | | * | [ticket/10223] Check optional before file_exists and correct require pathNils Adermann2011-06-182-4/+4
| | | * | [ticket/10223] requiring the new startup.php file conditionally.Nils Adermann2011-06-182-10/+38
| | | |/
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-181-4/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-181-4/+4
| |\ \ \ | | |/ /
| | * | [ticket/10229] On languge/acp/styles.php "%s" should be %sRaimon2011-06-181-4/+4
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-161-0/+8
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-161-0/+8
| |\ \ | | |/
| | * [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
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-162-2/+2
| |\ \ | | |/
| | * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-162-2/+2
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.Andreas Fischer2011-06-153-3/+9
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-156-245/+139
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-156-245/+139
| |\ \ | | |/
| | * Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9Andreas Fischer2011-06-156-245/+139
| | |\
| | | * [ticket/10218] Prevent startime from being overwritten by deregister_globals()Yuriy Rusko2011-06-151-2/+3
| | | * [ticket/10218] Moving global deregistration, etc. to startup.phpYuriy Rusko2011-06-146-245/+138
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/10220] Limit user agent value length for storage in login attempt tableNils Adermann2011-06-151-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/10219] Remove invalid and invisible character from web.config.Andreas Fischer2011-06-141-1/+1
| | |/
| * | [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
|\ \ | |/
| * [ticket/10214] Correct Oracle create table query syntax in db_toolsNils Adermann2011-06-132-4/+4
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-138-25/+25
|\ \ | |/
| * [ticket/10213] Update install schema with shorter index names.Nils Adermann2011-06-138-25/+25
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-131-2/+2
|\ \ | |/
| * Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympusAndreas Fischer2011-06-131-2/+2
| |\
| | * [ticket/9892] _sql in the updater needs to return the transaction resultsNils Adermann2011-06-121-2/+2