aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-3/+3
|\
| * Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-3/+3
| |\
| | * [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
|\ \ \ | |/ /
| * | 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
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'naderman/ticket/10220' into prep-release-3.0.9Andreas 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
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'bantu/ticket/10219' into prep-release-3.0.9Igor Wiedler2011-06-151-1/+1
| | |\ \ | | | |/ | | |/|
| | | * [ticket/10219] Remove invalid and invisible character from web.config.Andreas Fischer2011-06-141-1/+1
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-130-0/+0
|\ \ \ | |/ /
| * | [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
|\ \ | |/
| * Merge remote-tracking branch 'naderman/ticket/10214' into develop-olympusAndreas 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
|\ \ | |/
| * Merge remote-tracking branch 'naderman/ticket/10213' into develop-olympusAndreas 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
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-0/+7
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympusAndreas Fischer2011-06-121-0/+7
| |\ \
| | * | [ticket/9992] The table name constant needs to be defined in the updaterNils Adermann2011-06-121-0/+7
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-1/+1
|\ \ \ \ | |/ / /
| * | | [develop-olympus] Also build packages for 3.0.7.Andreas Fischer2011-06-121-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-123-21/+354
|\ \ \ \ | |/ / /
| * | | [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 branch 'develop-olympus' into developAndreas Fischer2011-06-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'naderman/ticket/10211' into develop-olympusAndreas Fischer2011-06-121-1/+1
| |\ \ \
| | * | | [ticket/10211] Add spce after dot in new language stringNils Adermann2011-06-121-1/+1
| |/ / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-126-14/+388
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympusAndreas Fischer2011-06-126-15/+388
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/9892] Correct copyright yearNils Adermann2011-06-121-1/+1
| | * | [ticket/9892] Remove incorrect use of camel caseNils Adermann2011-06-121-2/+2
| | * | [ticket/9892] Removing closing php tag from create_schema_filesNils Adermann2011-06-121-1/+0
| | * | [ticket/9892] Transaction support for database update sql execution functionNils Adermann2011-06-121-5/+16
| | * | [ticket/9892] count is a keyword in firebird, so renaming this aliasNils Adermann2011-06-121-2/+2
| | * | [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change configNils Adermann2011-06-121-6/+3
| | * | [ticket/9892] Shorten login_attempt key names to avoid firebird length problemsNils Adermann2011-06-121-3/+3
| | * | [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent stateNils Adermann2011-06-121-0/+24
| | * | [ticket/9892] Adding a number of tests for db_toolsNils Adermann2011-06-121-0/+268