Changesets: LimeSurvey
|
develop 0ab67121 2018-05-31 14:08 Details Diff |
Dev: Check for syntax errors on Travis | ||
| mod - .travis.yml | Diff File | ||
|
develop b870ae4a 2018-05-31 12:56 Details Diff |
Dev: Stupid Vim abbreviations | ||
| mod - .travis.yml | Diff File | ||
|
master_13513 d5959d98 2018-05-30 20:41 Details Diff |
Dev: fix call_user_func_array not call_user_func | ||
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
|
develop 7a2b6362 2018-05-30 20:14 Details Diff |
Dev: Check syntax of files on Travis | ||
| mod - .travis.yml | Diff File | ||
| mod - tests/data/travis/travis_setup.sh | Diff File | ||
|
develop 1f94db98 2018-05-30 20:08 Details Diff |
Dev: Fix old syntax error | ||
| mod - application/controllers/admin/ExpressionValidate.php | Diff File | ||
|
develop 868dec41 2018-05-30 20:00 Details Diff |
Dev: Fix syntax error after merge | ||
| mod - application/config/internal.php | Diff File | ||
|
develop 29178633 2018-05-30 19:52 Details Diff |
Merge branch 'develop' of https://github.com/LimeSurvey/LimeSurvey into develop Conflicts: application/views/admin/survey/Question/answerOptions_view.php |
||
| 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 | ||
|
develop 589cf5f6 2018-05-30 19:46 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 19:43 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 19:35 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 19:24 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 19:12
Details Diff |
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 18:46
Details Diff |
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 18:33
Details Diff |
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 18:21
Details Diff |
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 18:10
Details Diff |
Dev: fixed merge typo | ||
| mod - application/config/internal.php | Diff File | ||
|
master 485fb709 2018-05-30 17:54
Details Diff |
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 15:59 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 15:43 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 13:56 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 13:50
Details Diff |
Fixed issue 13490: GID placeholderfield missing sometimes |
Affected Issues 13490 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
master df1af8ea 2018-05-30 13:41
Details Diff |
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 13:12
Details Diff |
Fixed issue: preview in theme options not working | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
|
master 44a2c86c 2018-05-30 13:06 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 12:24 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 | ||
