Changesets: LimeSurvey
|
develop 589cf5f6 2018-05-30 17:46:43 Details Diff |
Merge branch 'master' into develop Conflicts: application/config/internal.php application/config/version.php application/views/admin/survey/surveySummary_view.php |
||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/SurveysController.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/survey/index.php | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/models/Participant.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/views/admin/participants/attributeMap_view.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
| mod - assets/scripts/admin/participantpanel.js | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
| mod - locale/hr/hr.mo | Diff File | ||
| mod - locale/ja/ja.mo | Diff File | ||
| mod - themes/survey/fruity/options/options.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/messages/assessments.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/messages/warnings.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig | Diff File | ||
|
develop 7e167a1e 2018-05-30 17:43:15 Details Diff |
Dev: Add screenshot code to test | ||
| mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
| mod - tests/controllers/SaveDualScaleAnswerOptionsTest.php | Diff File | ||
|
master_13513 2a6f8fd5 2018-05-30 17:35:01 Details Diff |
New feature 13513 : allow plugins to add expresssion manager function |
Affected Issues 13513 |
|
| mod - application/controllers/admin/expressions.php | Diff File | ||
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| add - plugins/Demo/demoAddEmFunction/assets/demoAddEmFunction.js | Diff File | ||
| add - plugins/Demo/demoAddEmFunction/demoAddEmFunction.php | Diff File | ||
| add - plugins/Demo/demoAddEmFunction/exampleFunctions.php | Diff File | ||
|
develop 31a9650c 2018-05-30 17:24:13 Dominik Vitt Details Diff |
Dev: Fix some merge problems related to L10n | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/models/Answer.php | Diff File | ||
| mod - application/views/admin/survey/Question/answerOptionsEdit_view.twig | Diff File | ||
| mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
|
master 6f561be8 2018-05-30 17:12:28
|
Fixed issue 13570: Out of quota, user gets the following message at the end even though the survey is activated |
Affected Issues 13570 |
|
| mod - application/helpers/frontend_helper.php | Diff File | ||
|
master 4d83aee4 2018-05-30 16:46:48
|
Fixed issue 12357: Survey List page Variable token replacement |
Affected Issues 12357 |
|
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
master 750f0f01 2018-05-30 16:33:56
|
Fixed issue 13535: title tag empty on demo.limesurvey.org |
Affected Issues 13535 |
|
| mod - application/controllers/SurveysController.php | Diff File | ||
|
master 4d166813 2018-05-30 16:21:04
|
Fixed issue 13128: Vanilla theme error page admin-name missing |
Affected Issues 13128 |
|
| mod - application/controllers/survey/index.php | Diff File | ||
|
master 2bb22688 2018-05-30 16:10:08
|
Dev: fixed merge typo | ||
| mod - application/config/internal.php | Diff File | ||
|
master 485fb709 2018-05-30 15:54:38
|
Fixed issue 12945: {PERC} not working (works now as in 2.x) |
Affected Issues 12945 |
|
| mod - application/config/internal.php | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/messages/assessments.twig | Diff File | ||
|
master 97d8e1d5 2018-05-30 13:59:17 Dominik Vitt Details Diff |
Fixed issue 13514: Don't translate Theme name |
Affected Issues 13514 |
|
| mod - themes/survey/fruity/options/options.twig | Diff File | ||
|
master 090174f0 2018-05-30 13:43:54 Dominik Vitt Details Diff |
Dev: string functions added to a list of Twig accepted functions | ||
| mod - application/config/internal.php | Diff File | ||
|
master 709440da 2018-05-30 11:56:37 Dominik Vitt Details Diff |
Fixed issue 12406: Group filter selection gets lost after deleting a question from the question list |
Affected Issues 12406 |
|
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
|
master 540cad99 2018-05-30 11:50:23
|
Fixed issue 13490: GID placeholderfield missing sometimes |
Affected Issues 13490 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
master df1af8ea 2018-05-30 11:41:03
|
Fixed issue 13574: Some placeholders no longer available in 3.x |
Affected Issues 13574 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
master 044f83bd 2018-05-30 11:12:57
|
Fixed issue: preview in theme options not working | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
|
master 44a2c86c 2018-05-30 11:06:00 LimeSurvey Translations Bot Details Diff |
Updated translation: German by c_schmitz Updated translation: Croatian by dominikvitt Updated translation: Japanese by nomoto |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
| mod - locale/hr/hr.mo | Diff File | ||
| mod - locale/ja/ja.mo | Diff File | ||
|
master 6df7b0d7 2018-05-30 10:24:40 Details Diff |
Dev Translation fix | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/messages/warnings.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig | Diff File | ||
|
master 36e41303 2018-05-29 18:13:03
|
Release 3.8.2+180529 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master d68cb782 2018-05-29 18:01:32
|
Fixed issue: Small nuisances in the cpdb | ||
| mod - application/models/Participant.php | Diff File | ||
| mod - application/views/admin/participants/attributeMap_view.php | Diff File | ||
| mod - assets/scripts/admin/participantpanel.js | Diff File | ||
|
develop 9615c081 2018-05-29 17:11:37 Details Diff |
Dev: Indentation | ||
| mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
|
develop 45e61433 2018-05-29 16:58:05 Details Diff |
Merge branch 'master' into develop Conflicts: application/views/admin/survey/Question/answerOptions_view.php |
||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
| add - application/views/admin/survey/Question/answerOptionsEdit_view.twig | Diff File | ||
| mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
| rm - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php | Diff File | ||
| add - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig | Diff File | ||
| rm - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.php | Diff File | ||
| add - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/ca.mo | Diff File | ||
| mod - locale/es-AR/es-AR.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/ru/ru.mo | Diff File | ||
|
develop 91fc8aeb 2018-05-29 16:47:56 Details Diff |
Dev: Remove sleep from test | ||
| mod - tests/surveys/AutoCalcTest.php | Diff File | ||
|
develop 34b73fa5 2018-05-29 16:46:14 Details Diff |
Fixed issue: Missing class for equation question type | ||
| mod - application/views/survey/questions/answer/equation/answer.twig | Diff File | ||
|
develop 3ad77ce5 2018-05-29 16:36:50 Details Diff |
Dev: Small test fix | ||
| mod - tests/surveys/AutoCalcTest.php | Diff File | ||
