LimeSurvey: develop 31fe5568

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-02-21 13:02 develop a4ad7877
Changeset

Dev Merge branch 'master' into develop

Resolved conflicts:

application/config/internal.php

application/config/version.php

application/controllers/admin/questions.php

application/controllers/admin/usergroups.php

application/views/admin/survey/Question/editQuestion_view.php

assets/packages/lshelp/build/lshelper.js

assets/packages/lshelp/build/lshelper.min.js

assets/packages/lshelp/src/LimeHelper.js

assets/scripts/admin/questions.js
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSYii_AssetManager.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/PluginBase.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php 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/frontend_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/third_party/phpmailer/LICENSE Diff File
rm - application/third_party/phpmailer/PHPMailerAutoload.php Diff
add - application/third_party/phpmailer/README.md Diff File
add - application/third_party/phpmailer/SECURITY.md Diff File
add - application/third_party/phpmailer/UPGRADING.md Diff File
mod - application/third_party/phpmailer/VERSION Diff File
rm - application/third_party/phpmailer/class.phpmaileroauth.php Diff
rm - application/third_party/phpmailer/class.phpmaileroauthgoogle.php Diff
rm - application/third_party/phpmailer/composer.json Diff
rm - application/third_party/phpmailer/composer.lock Diff
rm - application/third_party/phpmailer/extras/EasyPeasyICS.php Diff
rm - application/third_party/phpmailer/extras/README.md Diff
rm - application/third_party/phpmailer/extras/htmlfilter.php Diff
rm - application/third_party/phpmailer/extras/ntlm_sasl_client.php Diff
rm - application/third_party/phpmailer/get_oauth_token.php Diff
mod - application/third_party/phpmailer/language/phpmailer.lang-am.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ar.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-az.php Diff File
add - application/third_party/phpmailer/language/phpmailer.lang-ba.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-be.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-bg.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-cs.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-da.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-de.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-el.php Diff File
mod - 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
mod - 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
mod - application/third_party/phpmailer/language/phpmailer.lang-gl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-he.php Diff File
mod - 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-id.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
mod - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ko.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-lt.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-lv.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ms.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-nb.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-nl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pt.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pt_br.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-sk.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-sl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-sv.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-tr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-uk.php Diff File
mod - 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
add - application/third_party/phpmailer/load_phpmailer.php Diff File
add - application/third_party/phpmailer/src/Exception.php Diff File
add - application/third_party/phpmailer/src/OAuth.php Diff File
mod - application/third_party/tcpdf/CHANGELOG.TXT Diff File
mod - application/third_party/tcpdf/README.md Diff File
mod - application/third_party/tcpdf/composer.json Diff File
mod - application/third_party/tcpdf/include/barcodes/pdf417.php Diff File
mod - application/third_party/tcpdf/include/tcpdf_fonts.php Diff File
mod - application/third_party/tcpdf/include/tcpdf_static.php Diff File
mod - application/third_party/tcpdf/tcpdf.php Diff File
mod - application/third_party/tcpdf/tools/tcpdf_addfont.php Diff File
mod - application/views/admin/conditions/includes/copyform.php Diff File
mod - application/views/admin/databaseupdate/verify.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/title_bar.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File
mod - application/views/admin/surveymenu/_form.php Diff File
mod - application/views/admin/surveymenu_entries/_form.php Diff File
mod - application/views/admin/surveymenu_entries/index.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/admin/usergroup/usergroups_view.php Diff File
mod - assets/packages/adminbasics/js/admin_core.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.debug.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.js Diff File
mod - assets/packages/adminpanel/src/components/sidebar.vue Diff File
mod - assets/packages/adminpanel/src/store/vuex-store.js Diff File
mod - assets/packages/bootstrap/plugins/datetimepicker/build/js/bootstrap-datetimepicker.min.js Diff File
mod - assets/packages/bootstrap/plugins/datetimepicker/src/js/bootstrap-datetimepicker.js Diff File
rm - assets/packages/lshelp/package-lock.json Diff
rm - assets/packages/lshelp/package.json Diff
rm - assets/packages/lshelp/rollup.config.js Diff
rm - assets/packages/lshelp/src/main.js Diff
rm - assets/packages/lshelp/src/popoverTemplate.js Diff
mod - assets/packages/pjax/min/pjax.combined.min.js Diff File
mod - assets/packages/pjax/min/pjax.min.js Diff File
mod - assets/packages/pjax/pjax.js Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - docs/release_notes.txt Diff File
mod - framework/logging/CProfileLogRoute.php Diff File
mod - framework/vendors/markdown/markdown.php Diff File
mod - framework/web/CHttpRequest.php Diff File
mod - framework/yiilite.php 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/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/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/ro/ro.mo Diff File
add - tests/models/TemplateInstanceTest.php Diff File
mod - tests/questions/MultipleChoiceMandatoryWithCommentTest.php Diff File
mod - themes/survey/bootswatch/config.xml Diff File
mod - themes/survey/fruity/css/theme.css Diff File
mod - themes/survey/fruity/options/options.js Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/css/theme.css Diff File
mod - themes/survey/vanilla/options/options.js Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/layout_global.twig Diff File
mod - themes/survey/vanilla/views/layout_print.twig Diff File
add - themes/survey/vanilla/views/layout_printanswers.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/outerframe.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/submit.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/submit_preview.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/question_index_menu.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_head.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_text-long.twig Diff File