aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2010-11-292-3/+23
|\
| * Merge branch 'task/github-readme' into develop-olympusIgor Wiedler2010-11-291-0/+20
| |\
| | * [task/github-readme] Add README file for GitHubIgor Wiedler2010-11-291-0/+20
| |/
| * Merge branch 'ticket/rmcgirr83/9897' into develop-olympusIgor Wiedler2010-11-211-3/+3
| |\
| | * [ticket/9897] A few language fixesRMcGirr832010-11-211-3/+3
* | | Merge branch 'develop-olympus' into developNils Adermann2010-11-207-45/+265
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.8' into develop-olympusNils Adermann2010-11-207-46/+266
| |\ \
| | * | [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelogNils Adermann2010-11-195-10/+28
| | * | Merge branch 'ticket/9903' into prep-release-3.0.8Nils Adermann2010-11-192-0/+172
| | |\ \
| | | * | [ticket/9903] Script for detecting potentially malicious flash bbcodesIgor Wiedler2010-11-191-0/+163
| | | * | [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.Ruslan Uzdenov2010-11-181-0/+9
| | * | | Merge branch 'ticket/igorw/9904' into prep-release-3.0.8Nils Adermann2010-11-191-41/+71
| | |\ \ \
| | | * | | [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.Chris Sfanos2010-11-191-41/+71
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-185-8/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.8' into develop-olympusAndreas Fischer2010-11-182-3/+4
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch 'ticket/igorw/9509' into prep-release-3.0.8Andreas Fischer2010-11-181-2/+2
| | |\ \
| | | * | [ticket/9509] Fix a typo and wrong period placementIgor Wiedler2010-11-181-2/+2
| | | |/
| | * | Merge branch 'ticket/rmcgirr83/9899' into prep-release-3.0.8Andreas Fischer2010-11-181-1/+2
| | |\ \ | | | |/ | | |/|
| | | * [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.RMcGirr832010-11-181-1/+2
| | |/
| * | [develop-olympus] Revert accidental revert of db update lang fix and versionNils Adermann2010-11-111-2/+2
| * | [develop-olympus] Remove accidentally added trailing newlines.Nils Adermann2010-11-112-8/+8
| * | [develop-olympus] Incrementing the version number to 3.0.9-dev.Nils Adermann2010-11-113-5/+5
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-103-3/+5
|\ \ | |/
| * [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.Nils Adermann2010-11-101-0/+2
| * Merge branch 'ticket/nickvergessen/9140' into develop-olympusNils Adermann2010-11-101-2/+2
| |\
| | * [ticket/9140] Check current board version in incremental update packagesJoas Schilling2010-11-101-2/+2
| * | Merge branch 'ticket/nickvergessen/9891' into develop-olympusNils Adermann2010-11-101-1/+1
| |\ \ | | |/ | |/|
| | * [ticket/9891] Updater drops language-selection after database-updateJoas Schilling2010-11-101-1/+1
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-101-2/+14
|\ \ | |/
| * [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1Nils Adermann2010-11-101-2/+14
* | Merge branch 'develop-olympus' into developNils Adermann2010-11-101-2/+1
|\ \ | |/
| * Merge branch 'ticket/nickvergessen/9886' into develop-olympusNils Adermann2010-11-101-2/+1
| |\
| | * [ticket/9886] Update fails on PostgreSQL because of an error in _add_moduleJoas Schilling2010-11-091-2/+1
* | | Merge branch 'develop-olympus' into developNils Adermann2010-11-102-2/+13
|\ \ \ | |/ /
| * | Merge branch 'ticket/igorw/9884' into develop-olympusNils Adermann2010-11-102-2/+13
| |\ \
| | * | [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20Igor Wiedler2010-11-102-2/+13
| |/ /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-0818-130/+569
|\ \ \ | |/ /
| * | Merge branch 'ticket/nickvergessen/9888' into develop-olympusAndreas Fischer2010-11-081-40/+51
| |\ \
| | * | [ticket/9888] Update fails when Bing [Bot] was already added to the users tableJoas Schilling2010-11-081-40/+51
| | |/
| * | Merge branch 'ticket/bantu/9885' into develop-olympusNils Adermann2010-11-081-24/+46
| |\ \
| | * | [ticket/9885] Fix extension group name updater. Loop through all languages.Andreas Fischer2010-11-081-24/+46
| * | | [develop-olympus] Bumping version number for 3.0.8-RC1.Nils Adermann2010-11-0815-62/+465
| | |/ | |/|
| * | Merge branch 'ticket/sa007/9847' into develop-olympusAndreas Fischer2010-11-081-2/+2
| |\ \
| | * | [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.SA0072010-11-081-2/+2
| | |/
| * | Merge branch 'ticket/sa007/9883' into develop-olympusChris Smith2010-11-081-1/+1
| |\ \ | | |/ | |/|
| | * [ticket/9883] Change an American English spelling to British English.SA0072010-11-081-1/+1
| |/
| * Merge branch 'task/naderman/phing-build' into develop-olympusAndreas Fischer2010-11-081-1/+4
| |\
| | * [task/phing-build] Correct the path for update package patch files.Nils Adermann2010-11-081-1/+4
* | | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-078-360/+219
|\ \ \ | |/ /
| * | Merge branch 'ticket/bantu/9880' into develop-olympusAndreas Fischer2010-11-073-36/+36
| |\ \