Changesets: LimeSurvey
|
2.5 ab91d574 2015-12-17 14:47:33 Details Diff |
Fixed issue 10142: Disable survey quick action in question summary when survey is active |
Affected Issues 10142 |
|
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_view.php | Diff File | ||
|
develop eea4416d 2015-12-17 14:35:43 Details Diff |
Dev Improved navigation | ||
| mod - protected/views/labels/update.php | Diff File | ||
|
2.5 06bf6cf4 2015-12-17 14:24:16 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_outputformat.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_response_filter_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_responseid.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/labels.js | Diff File | ||
| mod - scripts/admin/statistics.js | Diff File | ||
| mod - styles/Sea_Green/config.xml | Diff File | ||
| mod - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc | Diff File | ||
| add - styles/Sea_Green/css/bootstrap-switch.min.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css.map | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.scss | Diff File | ||
| add - styles/Sea_Green/scripts/bootstrap-switch.min.js | Diff File | ||
|
2.5 23cbd076 2015-12-17 14:24:12 Details Diff |
Fixed issue 10142: Make sure you can't save question while survey is active |
Affected Issues 10142 |
|
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
|
2.5 c78b56bc 2015-12-17 14:22:04
|
Dev: redesigned statistics view filters | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_outputformat.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_response_filter_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_responseid.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/statistics.js | Diff File | ||
| mod - styles/Sea_Green/config.xml | Diff File | ||
| mod - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc | Diff File | ||
| add - styles/Sea_Green/css/bootstrap-switch.min.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css.map | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.scss | Diff File | ||
| add - styles/Sea_Green/scripts/bootstrap-switch.min.js | Diff File | ||
|
develop d729daf8 2015-12-17 14:04:03 Details Diff |
Dev Set last column to read only. | ||
| mod - protected/views/labels/update.php | Diff File | ||
|
develop e3da8c4f 2015-12-17 14:02:57 Details Diff |
Dev updated table entry preview for labels. | ||
| mod - protected/models/Label.php | Diff File | ||
| mod - protected/models/LabelSet.php | Diff File | ||
| mod - protected/views/labels/update.php | Diff File | ||
|
master f36f1414 2015-12-17 14:00:06 Details Diff |
Fixed issue: Label editing was not properly synchronizing across translations on deletion and code/assessments value | ||
| mod - scripts/admin/labels.js | Diff File | ||
|
2.5 adde88a8 2015-12-17 13:57:16 Details Diff |
Fixed issue: Label editing was not properly synchronizing across translations on deletion and code/assessments value | ||
| mod - scripts/admin/labels.js | Diff File | ||
|
master a89ed2fe 2015-12-17 13:24:53 Details Diff |
Merge pull request #395 from sieutruc/wrongFieldMap Fixed issue 10102, deactivate , update seetings, reactivate a randomized survey can break Database |
Affected Issues 10102 |
|
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
|
2.5 5640a97e 2015-12-17 13:17:38 Details Diff |
Fixed issue 10142: Make sure you can't save question group while survey is active |
Affected Issues 10142 |
|
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/models/QuestionGroup.php | Diff File | ||
|
2.5 4c42e3db 2015-12-17 13:00:25 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_header.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_outputformat.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_response_filter_choice.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_response_filter_header.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_responseid.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_statistics_header.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_statistics_view_scripts.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_submissiondate.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
|
2.5 03d48ca6 2015-12-17 13:00:17 Details Diff |
Dev: Remove duplicate tooltip for 'Active this survey'-button | ||
| mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
|
2.5 238ad438 2015-12-17 12:21:25
|
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/models/QuestionGroup.php | Diff File | ||
|
2.5 d4de2c04 2015-12-17 12:20:59
|
Dev: cleaning, create subview & helper function for statistics view | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_header.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_outputformat.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_response_filter_choice.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_response_filter_header.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_responseid.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_statistics_header.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_statistics_view_scripts.php | Diff File | ||
| add - application/views/admin/export/statistics_subviews/_submissiondate.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
|
develop 8bb820f9 2015-12-17 11:42:02 Details Diff |
Dev Implemented example for label editor. | ||
| mod - composer.json | Diff File | ||
| mod - composer.lock | Diff File | ||
| mod - protected/config/packages.php | Diff File | ||
| mod - protected/controllers/AdminController.php | Diff File | ||
| mod - protected/controllers/Controller.php | Diff File | ||
| mod - protected/controllers/FilesController.php | Diff File | ||
| add - protected/controllers/LabelsController.php | Diff File | ||
| mod - protected/controllers/UpgradeController.php | Diff File | ||
| mod - protected/controllers/UploaderController.php | Diff File | ||
| mod - protected/controllers/admin/assessments.php | Diff File | ||
| mod - protected/controllers/admin/conditionsaction.php | Diff File | ||
| mod - protected/controllers/admin/dataentry.php | Diff File | ||
| mod - protected/controllers/admin/export.php | Diff File | ||
| mod - protected/controllers/admin/expressions.php | Diff File | ||
| mod - protected/controllers/admin/labels.php | Diff File | ||
| mod - protected/controllers/admin/participantsaction.php | Diff File | ||
| mod - protected/controllers/admin/quotas.php | Diff File | ||
| mod - protected/controllers/admin/saved.php | Diff File | ||
| mod - protected/controllers/admin/statistics.php | Diff File | ||
| mod - protected/controllers/admin/translate.php | Diff File | ||
| mod - protected/controllers/admin/useraction.php | Diff File | ||
| mod - protected/core/Survey_Common_Action.php | Diff File | ||
| mod - protected/core/WebApplication.php | Diff File | ||
| mod - protected/extensions/LimeScript/LimeScript.php | Diff File | ||
| mod - protected/helpers/FrontEnd.php | Diff File | ||
| mod - protected/helpers/Replacements.php | Diff File | ||
| mod - protected/helpers/SurveyTranslator.php | Diff File | ||
| mod - protected/helpers/admin/statistics_helper.php | Diff File | ||
| mod - protected/helpers/common_helper.php | Diff File | ||
| mod - protected/helpers/qanda_helper.php | Diff File | ||
| mod - protected/models/Answer.php | Diff File | ||
| mod - protected/models/Label.php | Diff File | ||
| mod - protected/models/LabelSet.php | Diff File | ||
| mod - protected/models/Question.php | Diff File | ||
| mod - protected/models/forms/Settings.php | Diff File | ||
| mod - protected/models/questions/ShortTextQuestion.php | Diff File | ||
| mod - protected/themes/default/assets/css/style.css | Diff File | ||
| add - protected/themes/default/assets/limesurvey.pal | Diff File | ||
| mod - protected/views/admin/assessments_view.php | Diff File | ||
| mod - protected/views/admin/dataentry/active_html_view.php | Diff File | ||
| mod - protected/views/admin/dataentry/content_view.php | Diff File | ||
| mod - protected/views/admin/export/statistics_view.php | Diff File | ||
| mod - protected/views/admin/labels/editlabel_view.php | Diff File | ||
| mod - protected/views/admin/labels/labelview_view.php | Diff File | ||
| mod - protected/views/admin/participants/blacklist_view.php | Diff File | ||
| mod - protected/views/admin/participants/participantsPanel_view.php | Diff File | ||
| mod - protected/views/admin/participants/userControl_view.php | Diff File | ||
| mod - protected/views/admin/super/header.php | Diff File | ||
| mod - protected/views/global/menu.php | Diff File | ||
| mod - protected/views/global/surveyMenu.php | Diff File | ||
| add - protected/views/labels/create.php | Diff File | ||
| add - protected/views/labels/index.php | Diff File | ||
| add - protected/views/labels/update.php | Diff File | ||
| add - protected/views/labels/updateLabel.php | Diff File | ||
| mod - protected/views/layouts/main.php | Diff File | ||
| mod - protected/views/layouts/popup.php | Diff File | ||
| mod - protected/views/layouts/survey.php | Diff File | ||
| mod - protected/views/settings/global/language.php | Diff File | ||
| mod - protected/views/surveys/update/languages.php | Diff File | ||
| rm - public/styles/gringegreen/limesurvey.pal | Diff File | ||
|
2.5 d988add5 2015-12-17 11:39:44 Details Diff |
Fixed issue 10142: Disable group list add question-button when survey is active |
Affected Issues 10142 |
|
| mod - application/models/QuestionGroup.php | Diff File | ||
|
2.5 ac73d50d 2015-12-17 11:03:30
|
Dev: changed icons and text for language selector arrow | ||
| mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php | Diff File | ||
|
master 44c2ff32 2015-12-17 10:58:06 Details Diff |
Dev: 10011 : more detailed help Dev: don't take EM is it's already a date (format YYYY-MM-DD) |
Affected Issues 10011 |
|
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 b005b424 2015-12-17 10:35:22
|
Merge pull request #398 from Shnoulle/250_10101 Dev: Fixed issue 10101: Unable to test a survey or to see survey lis⦠|
Affected Issues 10101 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
2.5 3da2cdc7 2015-12-17 10:29:03
|
Fixed issue 10140: removed hide/show anim and added menu icon for bounce settings |
Affected Issues 10140 |
|
| mod - application/views/admin/token/token_bar.php | Diff File | ||
| mod - scripts/admin/tokenbounce.js | Diff File | ||
|
2.5 157cc129 2015-12-17 10:22:44
|
Fixed issue 10159: icons & tooltip for language selector arrows |
Affected Issues 10159 |
|
| mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php | Diff File | ||
|
master 9f6703c0 2015-12-17 10:20:21 Details Diff |
Fixed issue 09643: Date/Time question with drop down can break DB save with pgsql Fixed issue : Add an empty default tip for all date question Dev: Fix "INVALID" only when saving in DB, keep the session Dev: Use EM to validate in PHP: LEMval JS return empty string for "INVALID" : do it manually after EM |
Affected Issues 09643 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - scripts/date.js | Diff File | ||
|
2.5 0ede52f1 2015-12-17 10:01:30
|
Fixed issue 10156: CKeditor input field classes |
Affected Issues 10156 |
|
| mod - application/views/admin/htmleditor/pop_editor_view.php | Diff File | ||
| mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
| mod - application/views/admin/survey/prepareEditorScript_view.php | Diff File | ||
| mod - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css.map | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.scss | Diff File | ||
| mod - third_party/ckeditor/skins/kama/editor.css | Diff File | ||
|
2.5 04a5e962 2015-12-17 08:15:53 Details Diff |
Dev Adjusted ignored files | ||
| mod - .gitignore | Diff File | ||
