LimeSurvey: develop 63176e83

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-01-22 15:42:51 develop a765b67e
Changeset

Dev Merge branch 'master' into develop
mod - .gitignore Diff File
mod - .travis.yml Diff File
mod - README.md Diff File
add - application/commands/DemomodeCommand.php Diff File
mod - application/commands/WipeCommand.php Diff File
mod - application/commands/console.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/questiontypes.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
add - application/core/ConsoleHttpSession.php Diff File
add - application/core/LSCaptcha.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/extensions/captchaExtended/CaptchaExtendedAction.php Diff File
mod - application/helpers/SurveyRuntimeHelper.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/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/global_settings/_email.php Diff File
mod - application/views/admin/super/layout_insurvey.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_ajax_variables.php Diff File
mod - application/views/admin/survey/_activation_error.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/survey/questions/answer/list_dropdown/rows/othertext.php Diff File
mod - application/views/survey/questions/answer/listradio/rows/answer_row_other.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic_slider.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - assets/scripts/multiplechoice_withcomments.js Diff File
mod - assets/scripts/survey_runtime.js Diff File
mod - docs/release_notes.txt Diff File
mod - framework/cli/views/webapp/protected/controllers/SiteController.php Diff File
mod - index.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.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/hu/hu.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/ka/ka.mo Diff File
mod - locale/nb/nb.mo Diff File
rm - locale/pap-AW/index.html Diff File
rm - locale/pap-AW/pap-AW.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/css/errors.css Diff File
add - themes/survey/vanilla/files/block.gif Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/layout_user_forms.twig Diff File
add - themes/survey/vanilla/views/subviews/content/userforms.twig Diff File
add - themes/survey/vanilla/views/subviews/logincomponents/captcha.twig Diff File
add - themes/survey/vanilla/views/subviews/logincomponents/token.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_head.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_question.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_table.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-increase-same-decrease.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-yes-uncertain-no.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_boilerplate.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_gender.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_upload-files.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_yes-no.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_form.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_message.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_success.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/required.twig Diff File
rm - upload/surveys/index.html Diff File
rm - upload/surveys/readme.txt Diff File
rm - upload/templates/index.html Diff File
rm - upload/templates/readme.txt Diff File
rm - upload/themes/question/index.html Diff File
rm - upload/themes/survey/index.html Diff File