Changesets: LimeSurvey
|
develop 17c8574b 2018-04-11 13:51 Details Diff |
Dev: Check active != Y instead of !active | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
develop 13745c3f 2018-04-11 13:15 Details Diff |
Dev: Missing Twig function after merge | ||
| mod - application/config/internal.php | Diff File | ||
|
develop 6f1e4af2 2018-04-11 13:12 Details Diff |
Dev: Fix merge problem | ||
| mod - application/views/admin/survey/breadcrumb.php | Diff File | ||
|
develop 95fa8a3a 2018-04-11 12:34 Details Diff |
Dev: Missing processString() Twig function | ||
| mod - application/config/internal.php | Diff File | ||
|
develop 38ef7ac1 2018-04-11 12:27 Details Diff |
Merge branch 'master' into develop Conflicts: application/config/internal.php application/config/version.php application/core/LSETwigViewRenderer.php application/helpers/frontend_helper.php application/views/admin/survey/breadcrumb.php |
||
| mod - application/config/internal.php | Diff File | ||
| mod - application/config/packages.php | Diff File | ||
| mod - application/controllers/admin/PluginHelper.php | Diff File | ||
| mod - application/controllers/admin/homepagesettings.php | Diff File | ||
| mod - application/controllers/admin/index.php | Diff File | ||
| mod - application/controllers/admin/themeoptions.php | Diff File | ||
| mod - application/controllers/admin/themes.php | Diff File | ||
| mod - application/controllers/admin/useraction.php | Diff File | ||
| mod - application/core/LS_Twig_Extension.php | Diff File | ||
| mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/models/Box.php | Diff File | ||
| mod - application/models/Template.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/views/admin/dataentry/import.php | Diff File | ||
| mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
| mod - application/views/admin/super/welcome.php | Diff File | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/editdefaultvalues_view.php | Diff File | ||
| mod - application/views/admin/survey/_activation_feedback.php | Diff File | ||
| mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
| mod - application/views/admin/survey/breadcrumb.php | Diff File | ||
| mod - application/views/admin/survey/deactivateSurvey_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_integration_panel.php | Diff File | ||
| add - application/views/admin/themeoptions/import_modal.php | Diff File | ||
| mod - application/views/admin/themeoptions/index.php | Diff File | ||
| add - application/views/admin/themeoptions/surveythememenu.php | Diff File | ||
| mod - application/views/admin/themes/importuploaded_view.php | Diff File | ||
| mod - application/views/admin/themes/templateeditorbar_view.php | Diff File | ||
| mod - application/views/admin/themes/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/user/personalsettings.php | Diff File | ||
| add - assets/packages/adminbasics/js/confirmdeletemodal.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/de-informal/de-informal.mo | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fi/fi.mo | Diff File | ||
| mod - locale/fr/fr.mo | Diff File | ||
| mod - locale/hu/hu.mo | Diff File | ||
| mod - locale/ja/ja.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/ro/ro.mo | Diff File | ||
| mod - locale/sr/sr.mo | Diff File | ||
| mod - locale/tr/tr.mo | Diff File | ||
| mod - locale/vi/vi.mo | Diff File | ||
| mod - tests/LimeSurveyWebDriver.php | Diff File | ||
| mod - tests/TestHelper.php | Diff File | ||
| mod - tests/bootstrap.php | Diff File | ||
| rm - tests/controllers/TemplateControllerTest.php | Diff | ||
| add - tests/controllers/ThemeControllerTest.php | Diff File | ||
| add - tests/data/file_upload/dalahorse.jpg | Diff File | ||
| mod - tests/data/travis/travis_setup.sh | Diff File | ||
| mod - tests/models/TemplateInstanceTest.php | Diff File | ||
| mod - themes/admin/favicon.ico | 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/subviews/header/head.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/header/progress_bar.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/messages/welcome.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/survey/group_subviews/group_desc.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/survey/group_subviews/group_name.twig | Diff File | ||
|
master 62f7bf36 2018-04-10 20:10 Details Diff |
Fixed issue 13587: Date control show always as error Dev: readded id='dateformat{{name}}' Dev: double attribute for button |
Affected Issues 13587 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/answer/date/selector/answer.twig | Diff File | ||
| mod - assets/scripts/expressions/em_javascript.js | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/navigation/navigator.twig | Diff File | ||
|
master 8d42159c 2018-04-10 18:38 Details Diff |
Dev: Add test to export and import a theme | ||
| mod - tests/LimeSurveyWebDriver.php | Diff File | ||
| mod - tests/controllers/ThemeControllerTest.php | Diff File | ||
|
master e646c315 2018-04-10 18:38 Details Diff |
Dev: Configure webdriver to handle automatic downloads in tests | ||
| mod - tests/TestHelper.php | Diff File | ||
|
master 7fbe14f5 2018-04-10 18:37 Details Diff |
Dev: Add some ids to make tests easier | ||
| mod - application/views/admin/themes/importuploaded_view.php | Diff File | ||
| mod - application/views/admin/themes/templateeditorbar_view.php | Diff File | ||
|
master f1be791a 2018-04-10 14:51 LimeSurvey Translations Bot Details Diff |
Updated translation: German by c_schmitz Updated translation: German (Informal) by c_schmitz, HonkXL |
||
| mod - locale/de-informal/de-informal.mo | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
|
master e80ade72 2018-04-10 14:31 LimeSurvey Translations Bot Details Diff |
Dev Automatic translation update | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
|
master a74b63a8 2018-04-10 14:29 LimeSurvey Translations Bot Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
| mod - application/models/Boxes.php | Diff File | ||
|
master 000fe389 2018-04-10 14:28 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by qualitatuvic Updated translation: German by sebuin, c_schmitz Updated translation: French (France) by arnaud21 Updated translation: Hungarian by kkd Updated translation: Japanese by nomoto Updated translation: Dutch by Han Updated translation: Polish by elissa Updated translation: Turkish by kayazeren Updated translation: Vietnamese by namphuong Updated translation: Dutch (Informal) by Han Updated translation: Polish (Informal) by elissa |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/ca.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/ja/ja.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/tr/tr.mo | Diff File | ||
| mod - locale/vi/vi.mo | Diff File | ||
|
master 7bdbb30d 2018-04-10 14:28 Details Diff |
Dev Translation fix | ||
| mod - application/models/Boxes.php | Diff File | ||
|
master e9cd2ee0 2018-04-10 14:05 Details Diff |
Dev: Add test for theme file upload and delete | ||
| mod - application/views/admin/themes/templatesummary_view.php | Diff File | ||
| mod - tests/controllers/ThemeControllerTest.php | Diff File | ||
|
master 31db3d50 2018-04-10 13:40 Details Diff |
Fixed issue: Unsupported escape method when deleting uploaded theme file | ||
| mod - application/views/admin/themes/templatesummary_view.php | Diff File | ||
|
master e5d22dc5 2018-04-10 13:33 Details Diff |
Dev: Add picture of dala horse (test) | ||
| add - tests/data/file_upload/dalahorse.jpg | Diff File | ||
|
master fb91966c 2018-04-10 13:27 Details Diff |
Dev: Test that theme iframe preview is working | ||
| mod - tests/controllers/ThemeControllerTest.php | Diff File | ||
|
master d29eaedb 2018-04-10 13:14 Details Diff |
Fixed issue: Preview not working in theme editor | ||
| mod - application/views/admin/themes/templatesummary_view.php | Diff File | ||
|
master ad7838dd 2018-04-10 12:20 Details Diff |
Dev: Remove unused sleep | ||
| mod - tests/controllers/ThemeControllerTest.php | Diff File | ||
|
master a401a6b4 2018-04-10 11:29 Details Diff |
Fixed issue 13579: First calendar are always in English Dev: register needed script before call twig |
Affected Issues 13579 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
master 109af0e9 2018-04-10 11:21 Details Diff |
Dev: good order for $.fn.datetimepicker.defaults Dev: related to 13579 |
Affected Issues 13579 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
master 67093a65 2018-04-09 18:35 Details Diff |
Dev: Rename test | ||
|
master 53b56ee9 2018-04-09 18:33 Details Diff |
Dev: Add test to rename theme | ||
| mod - tests/controllers/TemplateControllerTest.php | Diff File | ||
|
master 95154b10 2018-04-09 18:18 Details Diff |
Dev: Fix some template --> theme wording in theme editor | ||
| mod - application/views/admin/themes/templateeditorbar_view.php | Diff File | ||
| mod - application/views/admin/themes/templatesummary_view.php | Diff File | ||
