aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.Andreas Fischer2013-11-291-1/+2
* [ticket/11699] Exclude build/new_version and build/old_versions from lint.Andreas Fischer2013-11-291-0/+2
* Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympusJoas Schilling2013-11-262-1/+2
|\
| * [ticket/12037] Fix hard-coded text in acp_inactive.html.Cesar G2013-11-252-1/+2
|/
* Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympusJoas Schilling2013-11-191-2/+1
|\
| * [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
|/
* Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympusNils Adermann2013-10-262-7/+9
|\
| * [ticket/11970] Make apt-get less quiet.Andreas Fischer2013-10-262-7/+7
| * [ticket/11970] Add set -x to Travis setup scripts.Andreas Fischer2013-10-262-0/+2
|/
* Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympusAndreas Fischer2013-10-251-1/+11
|\
| * [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.Andreas Fischer2013-10-251-1/+11
* | Merge branch 'task/github-readme/travis' into develop-olympusNils Adermann2013-10-241-2/+2
|\ \
| * | [task/github-readme/travis] Fix Travis-Badge and linkFalk Seidel2013-10-241-2/+2
|/ /
* | Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympusNils Adermann2013-10-202-1/+2
|\ \
| * | [ticket/11951] Add MariaDB to platforms we test on.Andreas Fischer2013-10-191-1/+1
| * | [ticket/11951] Add MariaDB to supported DBMSes in requirement section.Andreas Fischer2013-10-191-0/+1
|/ /
* | Merge pull request #1782 from bantu/ticket/11920Nils Adermann2013-10-152-0/+6
|\ \ | |/
| * [ticket/11920] Print MariaDB version after successful setup.Andreas Fischer2013-10-161-0/+2
| * [ticket/11920] Manually purge mysql-common.Andreas Fischer2013-10-161-0/+3
| * [ticket/11920] Actually call travis/setup-mariadb.sh.Andreas Fischer2013-10-151-0/+1
* | Merge pull request #1780 from bantu/ticket/11920Nils Adermann2013-10-153-1/+76
|\ \ | |/
| * [ticket/11920] Have to use empty root password otherwise db creation fails.Andreas Fischer2013-10-152-1/+8
| * [ticket/11920] Add MariaDB environment to Travis-CI.Andreas Fischer2013-10-153-1/+69
|/
* Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympusNathan Guse2013-10-032-0/+110
|\
| * [ticket/11877] Create package links and checksums for announcement via script.Andreas Fischer2013-10-012-0/+110
* | Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympusAndreas Fischer2013-10-021-1/+1
|\ \ | |/ |/|
| * [ticket/11879] Replace .live() with .on()Vjacheslav Trushkin2013-10-021-1/+1
* | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
* | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-15/+18
* | [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.Andreas Fischer2013-09-301-1/+1
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-283-0/+16
|\ \ | |/ |/|
| * [prep-release-3.0.12] Update changelog for 3.0.12 release.Andreas Fischer2013-09-281-0/+1
| * Merge branch 'ticket/11873' into prep-release-3.0.12Andreas Fischer2013-09-282-0/+15
| |\
| | * [ticket/11873] Add unit test for large password input.Joas Schilling2013-09-281-0/+8
| | * [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| |/
* | [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-272-2/+8
|\ \ | |/
| * [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-274-5/+11
* | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympusAndreas Fischer2013-09-261-1/+0
|\ \
| * | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
|/ /
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into develop-o...Nathan Guse2013-09-133-0/+23
|\ \
| * | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
|/ /
* | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-123-155/+299
|\ \
| * | [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| * | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
* | | Merge pull request #1698 from rechosen/ticket/11829Nathan Guse2013-09-124-3/+5
|\ \ \
| * | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-044-3/+5
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-053-2/+11
|\ \ \ | |/ / | | / | |/ |/|