aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
* [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
* Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympusOleg Pudeyev2013-01-244-2/+59
|\
| * [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| * [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-233-3/+3
| * [ticket/11337] Silence nginx config file writing.Andreas Fischer2013-01-231-1/+1
| * [ticket/11337] php-fpm.conf is no longer owned by root.Andreas Fischer2013-01-231-1/+1
| * [ticket/11337] Run functional tests on travis using nginx and php-fpm.Andreas Fischer2013-01-234-0/+56
|/
* Merge remote-tracking branch 'p/ticket/11295' into develop-olympusAndreas Fischer2013-01-231-2/+25
|\
| * [ticket/11295] Drop tables rather than database for postgres in test suite.Oleg Pudeyev2012-12-261-2/+25
* | Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympusAndreas Fischer2013-01-222-0/+9
|\ \
| * | [ticket/11323] Backport include_define test to olympus.Oleg Pudeyev2013-01-132-0/+9
* | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
|\ \ \
| * | | [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
* | | | Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympusOleg Pudeyev2013-01-133-1/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/11323] Add tests for inclusion of defined variablesMarc Alexander2013-01-143-1/+22
* | | | Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympusOleg Pudeyev2013-01-131-0/+5
|\ \ \ \
| * | | | [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.Andreas Fischer2013-01-131-0/+5
|/ / / /
* | | | Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympusOleg Pudeyev2013-01-091-1/+1
|\ \ \ \
| * | | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| * | | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
|\ \ \ \
| * | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'p/ticket/11293' into develop-olympusAndreas Fischer2012-12-311-0/+2
|\ \ \ \
| * | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| |/ / /
* | | | Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympusOleg Pudeyev2012-12-291-9/+33
|\ \ \ \
| * | | | [ticket/11291] phing: Also add checkreturn="true" to composer execution.Andreas Fischer2012-12-291-0/+1
| * | | | [ticket/11291] phing: Add checkreturn="true" to all new commands.Andreas Fischer2012-12-291-1/+4
| * | | | [ticket/11291] phing: Exclude vendor folder from diffs.Andreas Fischer2012-12-291-0/+1
| * | | | [ticket/11291] phing packaging: Export composer.phar and install dependencies.Andreas Fischer2012-12-291-4/+10
| * | | | [ticket/11291] phing: Remove no longer needed create-package target.Andreas Fischer2012-12-291-3/+2
| * | | | [ticket/11291] phing: The package target does not depend on composer.Andreas Fischer2012-12-291-1/+1
| * | | | [ticket/11291] phing: Adjust directory format of composer exec.Andreas Fischer2012-12-291-1/+1
| * | | | [ticket/11291] phing: Add description for composer target.Andreas Fischer2012-12-291-0/+5
| * | | | [ticket/11291] phing: Add --dev to composer install.Andreas Fischer2012-12-291-1/+1
| * | | | [ticket/11291] phing: Correct dependencies of composer target.Andreas Fischer2012-12-291-1/+1
| * | | | [ticket/11291] phing: Make sure composer is available before calling it.Andreas Fischer2012-12-231-3/+12
* | | | | Merge remote-tracking branch 'p/ticket/11294' into develop-olympusAndreas Fischer2012-12-261-2/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/11294] Capitalize phpunit.Oleg Pudeyev2012-12-261-3/+3
| * | | | [ticket/11294] Update required/optional extension list for olympus.Oleg Pudeyev2012-12-251-1/+18
|/ / / /
* | | | [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
|/ / /
* | | Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
|\ \ \
| * | | [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| * | | [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
* | | | Merge remote-tracking branch 'p/ticket/11285' into develop-olympusAndreas Fischer2012-12-201-7/+18
|\ \ \ \
| * | | | [ticket/11285] Use more granularity in dependency checks in compress testOleg Pudeyev2012-12-201-7/+18
|/ / / /
* | | | Merge remote-tracking branch 'p/ticket/10880' into develop-olympusAndreas Fischer2012-12-202-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-192-5/+7
|/ / /
* | | Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympusOleg Pudeyev2012-12-164-58/+168
|\ \ \
| * | | [ticket/8610] Update commentNathan Guse2012-12-151-1/+1