LimeSurvey: develop 6f6b7cdd

Diff Back to Repository
Author Committer Branch Timestamp Parent
markusfluer markusfluer develop 2017-01-13 13:44 develop 2476b527
Changeset

Merge branch 'master' into 'develop'
mod - .gitignore Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/UniqueNotification.php Diff File
rm - application/third_party/phpmailer/.gitattributes Diff
rm - application/third_party/phpmailer/.gitignore Diff
rm - application/third_party/phpmailer/.scrutinizer.yml Diff
rm - application/third_party/phpmailer/.travis.yml Diff
rm - application/third_party/phpmailer/README.md Diff
rm - application/third_party/phpmailer/SECURITY.md Diff
mod - application/third_party/phpmailer/VERSION Diff File
rm - application/third_party/phpmailer/changelog.md Diff
mod - application/third_party/phpmailer/class.phpmailer.php Diff File
mod - application/third_party/phpmailer/class.pop3.php Diff File
mod - application/third_party/phpmailer/class.smtp.php Diff File
mod - application/third_party/phpmailer/extras/htmlfilter.php Diff File
rm - application/third_party/phpmailer/travis.phpunit.xml.dist Diff
mod - application/views/admin/export/exportresults_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/sv/sv.mo Diff File