LimeSurvey: develop 3981feab

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-02-17 16:57:41 develop d06f7777
Changeset

Merge remote-tracking branch 'origin/master' into develop

Conflicts:
application/controllers/survey/index.php
application/libraries/PluginManager/PluginBase.php
mod - application/commands/PluginCommand.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_delete_results.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/da/da.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/hu/hu.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/pt-BR/pt-BR.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sl/sl.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File