aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/imkingdavid/ticket/11551' into develop-...Nathan Guse2013-05-202-2/+2
|\
| * [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-202-2/+2
|/
* Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympusAndreas Fischer2013-05-191-9/+8
|\
| * [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
* | Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympusAndreas Fischer2013-05-171-0/+8
|\ \
| * | [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.Andreas Fischer2013-05-171-0/+8
* | | Merge remote-tracking branch 'nickvergessen/ticket/11542-2' into develop-olympusAndreas Fischer2013-05-172-7/+7
|\ \ \
| * | | [ticket/11542] Use Czech as example as it contains non-latin charactersJoas Schilling2013-05-172-7/+7
|/ / /
* | | Merge remote-tracking branch 'marc1706/ticket/11544' into develop-olympusAndreas Fischer2013-05-171-0/+44
|\ \ \ | |/ / |/| |
| * | [ticket/11544] Add admin_login() method to 3.0 functional test caseMarc Alexander2013-05-141-0/+44
| |/
* | Merge remote-tracking branch 'nickvergessen/ticket/11542' into develop-olympusAndreas Fischer2013-05-172-0/+60
|\ \
| * | [ticket/11542] Add non-existing default value for language selectJoas Schilling2013-05-161-0/+1
| * | [ticket/11542] Add lang_english_name to fixtureJoas Schilling2013-05-151-0/+3
| * | [ticket/11542] Add unit tests for language_select()Joas Schilling2013-05-142-0/+56
* | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into develop-oly...Andreas Fischer2013-05-161-2/+2
|\ \ \
| * | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | |/ | |/|
* | | Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympusAndreas Fischer2013-05-162-5/+26
|\ \ \
| * | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-162-5/+26
|/ / /
* | | Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympusAndreas Fischer2013-05-152-0/+64
|\ \ \
| * | | [ticket/11541] Add unit tests for style_select()Joas Schilling2013-05-142-0/+64
| | |/ | |/|
* | | Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympusAndreas Fischer2013-05-152-1/+2
|\ \ \
| * | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-152-1/+2
|/ / /
* | | Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympusAndreas Fischer2013-05-151-0/+34
|\ \ \ | |_|/ |/| |
| * | [ticket/11540] Add unit tests for is_absolute()Joas Schilling2013-05-141-0/+34
| |/
* | Merge pull request #1403 from bantu/ticket/11105Nils Adermann2013-05-122-2/+2
|\ \ | |/ |/|
| * [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
* | Merge pull request #1396 from bantu/ticket/11324Nils Adermann2013-05-091-4/+0
|\ \ | |/ |/|
| * [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.Andreas Fischer2013-05-091-4/+0
* | Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympusAndreas Fischer2013-05-091-3/+5
|\ \ | |/ |/|
| * [ticket/11529] Format markdown code correctlyNils Adermann2013-05-091-3/+5
| * [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.mdNils Adermann2013-05-091-0/+0
|/
* Merge pull request #1387 from bantu/ticket/11513Nils Adermann2013-05-096-17/+483
|\
| * [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.Andreas Fischer2013-05-091-3/+8
| * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-093-7/+9
| * [ticket/11513] Use PHPUnit from composer in .travis.yml.Andreas Fischer2013-05-091-5/+3
| * [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| * [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
|/
* Merge pull request #1393 from bantu/ticket/11526Nils Adermann2013-05-092-145/+135
|\
| * [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| * [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
| * Merge branch 'ticket/11527' into ticket/11526Andreas Fischer2013-05-091-0/+0
| |\
* | \ Merge pull request #1392 from bantu/ticket/11527Nils Adermann2013-05-091-0/+0
|\ \ \ | |/ / |/| / | |/
| * [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.Andreas Fischer2013-05-091-0/+0
|/
* Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-067-28/+42
|\
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-1/+1
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-067-28/+42
* | Merge remote-tracking branch 'hjpotter92/ticket/11517' into develop-olympusAndreas Fischer2013-05-021-1/+1
|\ \
| * | [ticket/11517] Fix list numberinghjpotter922013-05-021-1/+1
|/ /
* | Merge pull request #1358 from MGaetan89/ticket/9975Nils Adermann2013-04-242-1/+2
|\ \ | |/ |/|
| * [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-212-1/+2
|/