LimeSurvey: develop 08c69844
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| develop | 2018-03-15 16:03 | develop 673d6035 | ||
| Changeset | Merge branch 'origin/master' into develop |
|||
| mod - .gitignore | Diff File | |||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/admin/emailtemplates.php | Diff File | |||
| mod - application/controllers/admin/themes.php | Diff File | |||
| mod - application/controllers/admin/tokens.php | Diff File | |||
| mod - application/core/LS_Twig_Extension.php | Diff File | |||
| mod - application/core/LsDefaultDataSets.php | Diff File | |||
| mod - application/helpers/common_helper.php | Diff File | |||
| mod - application/helpers/update/update_helper.php | Diff File | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| mod - application/models/User.php | Diff File | |||
| mod - application/views/admin/emailtemplates/email_language_tab.php | Diff File | |||
| mod - application/views/admin/emailtemplates/email_language_template_tab.php | Diff File | |||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | |||
| mod - application/views/admin/survey/editLocalSettings_view.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/packages/emailtemplates/emailtemplates.js | Diff File | |||
| mod - assets/packages/limesurvey/survey.js | 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/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/pl/pl.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/options/options.twig | Diff File | |||
| mod - themes/survey/vanilla/views/layout_survey_list.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/clearall.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/load.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/quotas.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/save.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/logincomponents/captcha.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/logincomponents/token.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/assessments.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/bootstrap_alert_modal.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/warnings.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/welcome.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/language_changer_first_page.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/language_changer_top_menu.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/navigator.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/question_index_menu.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/save_links.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/print/print_question.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/privacy/privacy.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 | |||
| mod - themes/survey/vanilla/views/subviews/survey/question_subviews/question_text_content.twig | Diff File | |||
| add - upload/themes/survey/generalfiles/index.html | Diff File | |||
