LimeSurvey: 2.06 df0e7bcc

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.06 2014-08-05 13:51 2.06 d89df5ae
Changeset

Merge branch 'master' into 2.06

Conflicts:
application/extensions/SettingsWidget/assets/settingswidget.css
application/views/installer/dbconfig_view.php
mod - application/commands/InstallCommand.php Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/messages/cs-informal.mo Diff File
mod - application/messages/cs.mo Diff File
mod - application/messages/de-informal.mo Diff File
mod - application/messages/de.mo Diff File
mod - application/messages/el.mo Diff File
mod - application/messages/fi.mo Diff File
mod - application/messages/fr.mo Diff File
mod - application/messages/hu.mo Diff File
mod - application/messages/it-informal.mo Diff File
mod - application/messages/it.mo Diff File
mod - application/messages/ja.mo Diff File
mod - application/messages/limesurvey.pot Diff File
mod - application/messages/ms.mo Diff File
mod - application/messages/nb.mo Diff File
mod - application/messages/nl-informal.mo Diff File
mod - application/messages/nl.mo Diff File
mod - application/messages/nn.mo Diff File
mod - application/messages/pl.mo Diff File
mod - application/messages/pt-BR.mo Diff File
mod - application/messages/ru.mo Diff File
mod - application/messages/sq.mo Diff File
mod - application/messages/sv.mo Diff File
mod - application/messages/ta.mo Diff File
mod - application/messages/th.mo Diff File
mod - application/messages/tr.mo Diff File
mod - application/messages/zh-Hant-TW.mo Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/third_party/phpmailer/LICENSE Diff File
add - application/third_party/phpmailer/PHPMailerAutoload.php Diff File
add - application/third_party/phpmailer/README.md Diff File
rm - application/third_party/phpmailer/README.php Diff
mod - application/third_party/phpmailer/class.phpmailer.php Diff File
mod - application/third_party/phpmailer/class.smtp.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ar.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-be.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-br.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ca.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ch.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-cz.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-de.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-dk.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-el.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-en.php Diff
add - application/third_party/phpmailer/language/phpmailer.lang-eo.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-es.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-et.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-fa.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fi.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fo.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fr.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-gl.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-he.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-hr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-hu.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-it.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ja.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-lt.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-lv.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-nl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-no.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pl.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-pt.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ro.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ru.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-se.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-sk.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-sr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-tr.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-uk.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-vi.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-zh.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-zh_cn.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/survey/editSurvey_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/installer/dbconfig_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/ckeditor-config.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/numeric-slider.js Diff File