Changesets: LimeSurvey
|
develop 33649f57 2018-06-13 14:57:13 Details Diff |
Dev: Remove faulty merge code | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
develop b24a6dc1 2018-06-13 14:43:25 Details Diff |
Merge branch 'master' into develop Conflicts: .travis.yml application/config/version.php application/controllers/admin/questions.php application/helpers/export_helper.php application/helpers/expressions/em_manager_helper.php application/views/admin/survey/Question/editQuestion_view.php application/views/admin/survey/surveySummary_view.php |
||
| mod - .travis.yml | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/checkintegrity.php | Diff File | ||
| mod - application/controllers/admin/conditionsaction.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/survey/index.php | Diff File | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
| add - application/core/LSYii_ImageValidator.php | Diff File | ||
| mod - application/core/LS_Twig_Extension.php | Diff File | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
| mod - application/extensions/PanelBoxWidget/views/box.php | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.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/export_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/globalsettings_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/AssetVersion.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/Template.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/views/admin/super/_tutorial_menu.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/importQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/import_view.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
| mod - application/views/admin/token/invite.php | Diff File | ||
| mod - application/views/survey/questions/answer/shortfreetext/location_mapservice/item.twig | 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/components/subcomponents/_questionsgroups.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/store/vuex-store.js | Diff File | ||
| mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js | Diff File | ||
| mod - assets/scripts/admin/questions.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/de-informal/de-informal.mo | Diff File | ||
| mod - locale/de/de.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/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 - locale/pt-BR/pt-BR.mo | Diff File | ||
| mod - locale/ru/ru.mo | Diff File | ||
| mod - locale/zh-Hant-HK/zh-Hant-HK.mo | Diff File | ||
| mod - locale/zh-Hant-TW/zh-Hant-TW.mo | Diff File | ||
| mod - themes/admin/Apple_Blossom/css/lime-admin-colors.css | Diff File | ||
| mod - themes/admin/Bay_of_Many/css/lime-admin-colors.css | Diff File | ||
| mod - themes/admin/Black_Pearl/css/lime-admin-colors.css | Diff File | ||
| mod - themes/admin/Dark_Sky/css/lime-admin-colors.css | Diff File | ||
| mod - themes/admin/Free_Magenta/css/lime-admin-colors.css | Diff File | ||
| mod - themes/admin/Noto_All_Languages/css/lime-admin-colors.css | Diff File | ||
| mod - themes/admin/Purple_Tentacle/css/lime-admin-colors.css | Diff File | ||
| mod - themes/survey/bootswatch/config.xml | Diff File | ||
| mod - themes/survey/bootswatch/options/options.twig | Diff File | ||
| add - themes/survey/bootswatch/scripts/index.html | Diff File | ||
| mod - themes/survey/fruity/config.xml | Diff File | ||
| mod - themes/survey/fruity/options/options.twig | Diff File | ||
| add - themes/survey/fruity/scripts/sticky.min.js | 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/options/options.twig | 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_survey_list.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/header/head.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/privacy/privacy.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig | Diff File | ||
|
master eb4174ab 2018-06-13 14:26:55
|
Dev: updated default data set to contain new options | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
|
master b7f1a3c9 2018-06-13 14:24:52
|
Dev: refined sticky headers | ||
| mod - themes/survey/fruity/scripts/sticky.min.js | Diff File | ||
| mod - themes/survey/fruity/views/subviews/header/custom_header.twig | Diff File | ||
|
master d1859356 2018-06-13 13:12:12
|
New feature: added crosshover functionality to fruity theme | ||
| mod - application/core/LS_Twig_Extension.php | Diff File | ||
| mod - themes/survey/fruity/config.xml | Diff File | ||
| mod - themes/survey/fruity/options/options.twig | Diff File | ||
| mod - themes/survey/fruity/views/subviews/header/custom_header.twig | Diff File | ||
|
master 94735ceb 2018-06-13 10:46:48 LimeSurvey Translations Bot Details Diff |
Updated translation: French (France) by c_schmitz, b00z00, arnaud21, DenisChenu | ||
| mod - locale/fr/fr.mo | Diff File | ||
|
master 448aa5a0 2018-06-13 10:43:00 LimeSurvey Translations Bot Details Diff |
Updated translation: German by c_schmitz Updated translation: German (Informal) by c_schmitz, markusfluer |
||
| mod - locale/de-informal/de-informal.mo | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
|
master 2c4eec20 2018-06-13 10:32:52 LimeSurvey Translations Bot Details Diff |
Updated translation: German by c_schmitz | ||
| mod - locale/de/de.mo | Diff File | ||
|
master 6832e445 2018-06-13 10:22:16 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by qualitatuvic Updated translation: German by surveyunihi, c_schmitz Updated translation: Chinese (Taiwan) (Traditional) by sylsylsylvie, imacat |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/ca.mo | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
| mod - locale/zh-Hant-TW/zh-Hant-TW.mo | Diff File | ||
|
master e9e51494 2018-06-13 10:21:53 Details Diff |
Dev Small text fix | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
|
master 3afc0063 2018-06-13 10:19:58 Details Diff |
Dev Small text fix | ||
| mod - themes/survey/vanilla/views/subviews/messages/welcome.twig | Diff File | ||
|
master 56bbb0db 2018-06-12 17:45:21
|
Release 3.11.0+180612 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 174a71d1 2018-06-12 17:39:47 Dominik Vitt Details Diff |
Dev: fix for question themes without attributes | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
|
master 0f75310d 2018-06-12 17:01:56
|
Dev: added a question group coherence check + autofix to check integrity | ||
| mod - application/controllers/admin/checkintegrity.php | Diff File | ||
|
master 19473490 2018-06-12 16:52:57 Dominik Vitt Details Diff |
Fixed issue#12435: Wrong exports | ||
| mod - application/helpers/export_helper.php | Diff File | ||
|
master e352ce9f 2018-06-12 16:19:01 Dominik Vitt Details Diff |
Dev: moved validateImage function to own class file | ||
| mod - application/controllers/admin/themes.php | Diff File | ||
| add - application/core/LSYii_ImageValidator.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
|
master 23a37b5e 2018-06-12 16:16:44 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by c_schmitz Updated translation: German by c_schmitz |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/ca.mo | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
|
master 9254a825 2018-06-12 16:16:21 Details Diff |
Dev Some text fixes | ||
| mod - application/views/admin/survey/Question/importQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/import_view.php | Diff File | ||
|
master 121c42ec 2018-06-12 16:06:09 Details Diff |
Dev Some text fixes | ||
| 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 | ||
|
master c568d3ba 2018-06-12 16:02:07 LimeSurvey Translations Bot Details Diff |
Dev Automatic translation update | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
|
master a4f0cccf 2018-06-12 15:42:39 LimeSurvey Translations Bot Details Diff |
Dev Automatic translation update | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
|
master ffcadd64 2018-06-12 15:38:25 LimeSurvey Translations Bot Details Diff |
Dev Automatic translation update | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
|
master 2d7f1041 2018-06-12 15:33:40 LimeSurvey Translations Bot Details Diff |
Dev Automatic translation update | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
|
master 0699ec34 2018-06-12 15:29:35 LimeSurvey Translations Bot Details Diff |
Updated translation: Croatian by dominikvitt | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/hr/hr.mo | Diff File | ||
|
master 132db02e 2018-06-12 14:49:38 Dominik Vitt Details Diff |
Fixed issue 13739: Relevance equation broken for array by column |
Affected Issues 13739 |
|
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - assets/scripts/admin/questions.js | Diff File | ||
