Changesets: LimeSurvey
|
2.5 2870faf3 2015-12-15 12:15 Details Diff |
Dev: Show error message if tmp file is not found, instead of just die() | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
|
master 48b3cca1 2015-12-15 12:11 Details Diff |
Fixed issue : broken javascript for all in one and question by question survey Dev: LEMgseq is set only for group by group mode Dev: Use LEMqid for question by question mode Dev: Adding a onSamePage local var Dev: https://github.com/LimeSurvey/LimeSurvey/commit/7c8509707a92a3072d84552c946d6bba21270f97#diff-7bbc2d713569df2d0d3341beed3ba2e0R490 child |
||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
2.5 0c62c62d 2015-12-15 12:09
Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/models/UserInGroup.php | Diff File | ||
| mod - application/views/admin/user/editusers.php | Diff File | ||
| mod - scripts/admin/attributeControl.js | Diff File | ||
|
2.5 0881e072 2015-12-15 12:08
Details Diff |
Fixed issue 10136: hide export button when no participants |
Affected Issues 10136 |
|
| mod - application/views/admin/participants/participantsPanel_view.php | Diff File | ||
|
develop 8cb61cea 2015-12-15 12:05 Details Diff |
Dev Updated dependencies | ||
| mod - composer.json | Diff File | ||
| mod - composer.lock | Diff File | ||
|
2.5 ffd9ca48 2015-12-15 11:56
Details Diff |
Fixed issue 10135: choose the selected item in the option list |
Affected Issues 10135 |
|
| mod - application/views/admin/participants/importCSV_view.php | Diff File | ||
|
2.5 288c8452 2015-12-15 11:50
Details Diff |
Fixed issue 10139: replaced settingswidget by pure html |
Affected Issues 10139 |
|
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/views/admin/token/exportdialog.php | Diff File | ||
| mod - application/views/admin/token/token_bar.php | Diff File | ||
|
2.5 15d2564b 2015-12-15 11:36 Details Diff |
Fixed issue 10129: Add tooltips to icons |
Affected Issues 10129 |
|
| mod - application/views/admin/user/editusers.php | Diff File | ||
|
2.5 54208473 2015-12-15 11:22
Details Diff |
Fixed issue 10140 : replaced SettingsWidget by plain HTML. |
Affected Issues 10140 |
|
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/token/bounce.php | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
|
2.5 6e9b9b5f 2015-12-15 11:04 Details Diff |
Fixed issue 10133: primary key in model UserInGroup should return actual composite key |
Affected Issues 10133 |
|
| mod - application/models/UserInGroup.php | Diff File | ||
|
develop 1b3d8c05 2015-12-15 10:32 Details Diff |
Removed old files. | ||
| rm - protected/extensions/LimeDebug/LimeDebug.php | Diff | ||
| rm - protected/views/admin/database/database_view.php | Diff | ||
| rm - protected/views/admin/emailtemplates/email_language_tab.php | Diff | ||
| rm - protected/views/admin/emailtemplates/email_language_template_tab.php | Diff | ||
| rm - protected/views/admin/emailtemplates/emailtemplates_view.php | Diff | ||
| rm - protected/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff | ||
| rm - protected/views/admin/survey/prepareEditorScript_view.php | Diff | ||
| rm - protected/views/admin/survey/printablesurvey_view.php | Diff | ||
| rm - protected/views/admin/survey/queXMLSurvey_view.php | Diff | ||
| rm - protected/views/admin/survey/surveySummary_view.php | Diff | ||
| rm - protected/views/admin/survey/surveybar_view.php | Diff | ||
| rm - protected/views/admin/token/addtokenpost.php | Diff | ||
| rm - protected/views/admin/token/bounce.php | Diff | ||
| rm - protected/views/admin/token/dummytokenform.php | Diff | ||
| rm - protected/views/admin/token/emailpost.php | Diff | ||
| rm - protected/views/admin/token/emailwarning.php | Diff | ||
| rm - protected/views/admin/token/exportdialog.php | Diff | ||
| rm - protected/views/admin/token/invite.php | Diff | ||
| rm - protected/views/admin/token/ldapform.php | Diff | ||
| rm - protected/views/admin/token/ldappost.php | Diff | ||
| rm - protected/views/admin/token/managetokenattributes.php | Diff | ||
| rm - protected/views/admin/token/remind.php | Diff | ||
|
2.5 f95a01f9 2015-12-15 09:52
Details Diff |
Fixed issue 10138: added bootstrap 'table' class to jqgrid |
Affected Issues 10138 |
|
| mod - application/controllers/PluginsController.php | Diff File | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/newQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/nquestiongroupbar_view.php | Diff File | ||
|
2.5 df33faa7 2015-12-14 17:45
Details Diff |
Dev : Modular question type, give the possibility to add new question type. | ||
| mod - application/config/config-defaults.php | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| add - application/extensions/questionTypes/listRadio/config.xml | Diff File | ||
| add - application/extensions/questionTypes/listRadio/listRadio.php | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
|
2.5 d41fb003 2015-12-14 17:28 Details Diff |
Fixed issue 10138: Aligned columns to the left |
Affected Issues 10138 |
|
| mod - scripts/admin/attributeControl.js | Diff File | ||
|
2.5 f91b4fa5 2015-12-14 17:07 Details Diff |
Fixed issue 10131: Redirect to user group after user group is added |
Affected Issues 10131 |
|
| mod - application/controllers/admin/usergroups.php | Diff File | ||
|
2.5 b908e591 2015-12-14 16:38 Details Diff |
Dev: Add isset check for selectormodeclass |
Affected Issues 10112 |
|
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
2.5 43f2d447 2015-12-14 16:16 Details Diff |
Dev: parent_qid should compare to 0, not NULL, because it is DEFAULT 0 NOT NULL | ||
| mod - application/models/Question.php | Diff File | ||
|
2.5 fa79b8b3 2015-12-14 16:08 Details Diff |
Dev: Short fix of previuos commit | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/nquestiongroupbar_view.php | Diff File | ||
|
2.5 ba686054 2015-12-14 16:05 Details Diff |
Fixed issue 10142 (part 2): Disable add new question button when survey is active |
Affected Issues 10142 |
|
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/nquestiongroupbar_view.php | Diff File | ||
|
2.5 d8e09d31 2015-12-14 15:44 Details Diff |
Dev: Factor out abort survey to own function (might be needed in other places) | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
|
2.5 b1dd710c 2015-12-14 15:35 Details Diff |
Fixed issue 10142: Don't allow new question when survey is active |
Affected Issues 10142 |
|
| mod - application/controllers/admin/questions.php | Diff File | ||
|
2.5 cead471c 2015-12-14 15:18 Details Diff |
Dev: Add isset check on variable | ||
| mod - application/views/admin/survey/Question/newQuestion_view.php | Diff File | ||
|
2.5 7b344852 2015-12-14 14:03 Details Diff |
Change "" into NULL for parent_qid to handle PostgreSQL | ||
| mod - application/models/Question.php | Diff File | ||
|
2.5 96ec333a 2015-12-14 14:03 Details Diff |
Dev: Add curly braces around foreach statement | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
|
2.5 f98e61d9 2015-12-14 13:36 Details Diff |
Dev: Order plugins by name in plugin manager list | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
