LimeSurvey: develop 9d7567d6

Diff Back to Repository
Author Committer Branch Timestamp Parent
TonisOrmisson TonisOrmisson develop 2017-11-08 15:39:13 develop a48cb29d
Changeset

Merge remote-tracking branch 'upstream/develop' into fix-tests-cleanup

Conflicts:
tests/TestBaseClass.php
tests/TestBaseClassView.php
tests/TestBaseClassWeb.php
tests/questions/DateTimeValidationTest.php
mod - .gitignore Diff File
mod - .travis.yml Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/console.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/core/db/PgsqlSchema.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
add - application/views/admin/expressions/test/survey_logic_form.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - composer.json Diff File
mod - composer.lock Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/id/id.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/th/th.mo Diff File
mod - tests/TestBaseClassView.php Diff File
mod - tests/TestBaseClassWeb.php Diff File
mod - tests/controllers/AdminViewsTest.php Diff File
mod - tests/controllers/TemplateControllerTest.php Diff File
add - tests/data/travis/travis-ci-apache Diff File
mod - tests/data/views/adminSurveyViews.php Diff File
mod - tests/helpers/GroupRandomizationTest.php Diff File
mod - tests/questions/DateTimeValidationTest.php Diff File
rm - third_party/bin/phpunit Diff File
mod - third_party/composer/autoload_classmap.php Diff File
rm - third_party/composer/autoload_files.php Diff File
mod - third_party/composer/autoload_namespaces.php Diff File
mod - third_party/composer/autoload_psr4.php Diff File
mod - third_party/composer/autoload_real.php Diff File
mod - third_party/composer/autoload_static.php Diff File
mod - third_party/composer/installed.json Diff File
rm - third_party/doctrine/instantiator Diff File
rm - third_party/facebook/webdriver Diff File
rm - third_party/myclabs/deep-copy/.gitattributes Diff File
rm - third_party/myclabs/deep-copy/.gitignore Diff File
rm - third_party/myclabs/deep-copy/LICENSE Diff File
rm - third_party/myclabs/deep-copy/composer.json Diff File
rm - third_party/myclabs/deep-copy/doc/clone.png Diff File
rm - third_party/myclabs/deep-copy/doc/deep-clone.png Diff File
rm - third_party/myclabs/deep-copy/doc/deep-copy.png Diff File
rm - third_party/myclabs/deep-copy/doc/graph.png Diff File
rm - third_party/myclabs/deep-copy/fixtures/f001/A.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f001/B.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f002/A.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f003/Foo.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f004/UnclonableItem.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f005/Foo.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f006/A.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f006/B.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f007/FooDateInterval.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f007/FooDateTimeZone.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f008/A.php Diff File
rm - third_party/myclabs/deep-copy/fixtures/f008/B.php Diff File
rm - third_party/phar-io/manifest Diff File
rm - third_party/phar-io/version/.gitignore Diff File
rm - third_party/phar-io/version/LICENSE Diff File
rm - third_party/phar-io/version/build.xml Diff File
rm - third_party/phar-io/version/composer.json Diff File
rm - third_party/phar-io/version/phive.xml Diff File
rm - third_party/phar-io/version/phpunit.xml Diff File
rm - third_party/phpdocumentor/reflection-common Diff File
rm - third_party/phpdocumentor/reflection-docblock/LICENSE Diff File
rm - third_party/phpdocumentor/reflection-docblock/composer.json Diff File
rm - third_party/phpdocumentor/type-resolver/LICENSE Diff File
rm - third_party/phpdocumentor/type-resolver/composer.json Diff File
rm - third_party/phpspec/prophecy Diff File
rm - third_party/phpunit/php-code-coverage Diff File
rm - third_party/phpunit/php-file-iterator Diff File
rm - third_party/phpunit/php-text-template/.gitattributes Diff File
rm - third_party/phpunit/php-text-template/.gitignore Diff File
rm - third_party/phpunit/php-text-template/LICENSE Diff File
rm - third_party/phpunit/php-text-template/composer.json Diff File
rm - third_party/phpunit/php-timer Diff File
rm - third_party/phpunit/php-token-stream Diff File
rm - third_party/phpunit/phpunit Diff File
rm - third_party/phpunit/phpunit-mock-objects Diff File
rm - third_party/sebastian/code-unit-reverse-lookup Diff File
rm - third_party/sebastian/comparator Diff File
rm - third_party/sebastian/diff Diff File
rm - third_party/sebastian/environment Diff File
rm - third_party/sebastian/exporter Diff File
rm - third_party/sebastian/global-state Diff File
rm - third_party/sebastian/object-enumerator Diff File
rm - third_party/sebastian/object-reflector Diff File
rm - third_party/sebastian/recursion-context Diff File
rm - third_party/sebastian/resource-operations Diff File
rm - third_party/sebastian/version Diff File
rm - third_party/symfony/process Diff File
rm - third_party/theseer/tokenizer/.gitignore Diff File
rm - third_party/theseer/tokenizer/LICENSE Diff File
rm - third_party/theseer/tokenizer/build.xml Diff File
rm - third_party/theseer/tokenizer/composer.json Diff File
rm - third_party/theseer/tokenizer/phive.xml Diff File
rm - third_party/theseer/tokenizer/phpunit.xml Diff File
rm - third_party/webmozart/assert Diff File