Changesets: LimeSurvey
|
master b8f1a9ee 2017-07-11 16:41:07 Details Diff |
Dev: Oups $this->event | ||
| mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
|
master ec1f5004 2017-07-11 16:40:06 Details Diff |
Fixed issue : QuickMenu break usage of newDirectRequest for other plugin | ||
| mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
|
develop aced8889 2017-07-11 16:19:00
|
Dev: update template model to use templates table Dev: now template name can be different from template folder |
||
| mod - application/models/Template.php | Diff File | ||
|
develop 9f4b182a 2017-07-11 16:19:00
Committer: TonisOrmisson Details Diff |
Dev: update template model to use templates table Dev: now template name can be different from template folder |
||
| mod - application/models/Template.php | Diff File | ||
|
develop ad9fbf12 2017-07-11 16:18:15
|
Dev: quick fix | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
|
develop 78a95e22 2017-07-11 16:18:15
Committer: TonisOrmisson Details Diff |
Dev: quick fix | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
|
develop b973decc 2017-07-11 16:16:30
|
Dev: added tables for templates and template configuration Dev: old templates table must be removed for testing. |
||
| mod - installer/sql/create-mysql.sql | Diff File | ||
|
develop 6861253a 2017-07-11 16:16:30
Committer: TonisOrmisson Details Diff |
Dev: added tables for templates and template configuration Dev: old templates table must be removed for testing. |
||
| mod - installer/sql/create-mysql.sql | Diff File | ||
|
develop c9f95015 2017-07-11 16:02:33
Committer: |
DEV: Survey Tablenames 2 (#766) Fixed issue 12394: Adding question to quota shoult order questions in display order Dev: add quoteColumnName for order Dev: Put the grouping criteria in separate method (reusable) Dev: Survey Tabenames Dev: Survey responsestablename Dev: Survey tokenstablename Dev: fix surveyid |
Affected Issues 12394 |
|
| mod - application/controllers/Statistics_userController.php | Diff File | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - application/controllers/admin/responses.php | Diff File | ||
| mod - application/controllers/admin/saved.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/survey/index.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/export_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/libraries/Save.php | Diff File | ||
| mod - application/models/Participant.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyDynamic.php | Diff File | ||
| mod - application/views/admin/dataentry/caption_view.php | Diff File | ||
|
develop 37228040 2017-07-11 15:19:57 Details Diff |
Merge remote-tracking branch 'upstream/develop' into develop | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/assessments.php | Diff File | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/emailtemplates.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/expressions.php | Diff File | ||
| mod - application/controllers/admin/index.php | Diff File | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/controllers/admin/quotas.php | Diff File | ||
| mod - application/controllers/admin/responses.php | Diff File | ||
| mod - application/controllers/admin/saved.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/surveypermission.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/admin/translate.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/extensions/bootstrap/helpers/TbHtml.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/libraries/Save.php | Diff File | ||
| mod - application/models/QuotaMember.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyDynamic.php | Diff File | ||
| mod - application/models/SurveyLink.php | Diff File | ||
| mod - application/models/SurveyTimingDynamic.php | Diff File | ||
| mod - application/models/Timing.php | Diff File | ||
| mod - application/views/admin/conditions/conditionshead_view.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
| mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
| mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
| mod - application/views/admin/quotas/editquota_view.php | Diff File | ||
| mod - application/views/admin/quotas/newquota_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_actions.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_members.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_members_item.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_view.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
| mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| mod - application/views/admin/super/title_bar.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/editGroup_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
| mod - application/views/admin/survey/breadcrumb.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
| mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/_template_carousel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_presentation_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_publication_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_tokens_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/addPanelIntegrationParameter_view.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
| mod - application/views/admin/token/token_bar.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
| mod - assets/packages/adminpanel/scss/bootstrapadditions.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
| mod - assets/packages/adminpanel/src/components/questionsgroups.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | ||
| mod - assets/scripts/admin/answers.js | Diff File | ||
| mod - assets/scripts/admin/labels.js | Diff File | ||
| mod - assets/scripts/admin/subquestions.js | Diff File | ||
| mod - assets/styles-admin/Sea_Green/scripts/save.js | Diff File | ||
| mod - installer/sql/create-mssql.sql | Diff File | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
| mod - installer/sql/create-pgsql.sql | Diff File | ||
| mod - tests/questions/DateTimeDefaultAnswerExpressionTest.php | Diff File | ||
|
develop fede4388 2017-07-11 14:40:43
Committer: |
DEV: use implement survey->timingsTableName from Survey object (#765) DEV: use implement survey->timingsTableName from Survey object DEV: fixed model::tablenames() |
||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | ||
| mod - application/libraries/Save.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyDynamic.php | Diff File | ||
| mod - application/models/SurveyTimingDynamic.php | Diff File | ||
| mod - application/models/Timing.php | Diff File | ||
|
develop da3049ba 2017-07-11 14:04:01
Committer: |
DEV: use Survey object in StartSurvey() (#764) DEV: Kill surveyinfo: remove SurveyLink->getSurveyInfo() (UNUSED) DEV: add boolean getters for all survey Y/N properties DEV: use Survey object in StartSurvey() |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - tests/questions/DateTimeDefaultAnswerExpressionTest.php | Diff File | ||
|
develop 2ab30cb5 2017-07-11 13:30:11
Committer: |
DEV: add boolean getters for all survey Y/N properties (#763) DEV: Kill surveyinfo: remove SurveyLink->getSurveyInfo() (UNUSED) DEV: add boolean getters for all survey Y/N properties |
||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyLink.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
|
develop 96d22ac7 2017-07-11 11:36:38
|
Dev: removed unused params from template manifest | ||
| mod - templates/default/config.xml | Diff File | ||
|
develop 8144c1c6 2017-07-11 11:36:38
Committer: TonisOrmisson Details Diff |
Dev: removed unused params from template manifest | ||
| mod - templates/default/config.xml | Diff File | ||
|
develop 8bfec7db 2017-07-11 11:20:28
Committer: |
DEV: Kill surveyinfo: vol 2 (#762) Fixed issue 12394: Adding question to quota shoult order questions in display order Dev: add quoteColumnName for order Dev: Put the grouping criteria in separate method (reusable) Dev: clean out survey->surveyinfo :export Dev: clean out survey->surveyinfo : questiongroups Dev: clean out survey->surveyinfo : quotas Dev: clean out survey->surveyinfo : responses/saved Dev: clean out survey->surveyinfo : surveyadmin Dev: clean out survey->surveyinfo : surveypermission Dev: clean out survey->surveyinfo : tokens Dev: clean out survey->surveyinfo : surveybar Dev: clean out survey->surveyinfo : surveyinfo Dev: clean out survey->surveyinfo : kill all Survey->getSurveyinfo() Dev: clean out survey->surveyinfo : fix views 1 Dev: clean out survey->surveyinfo : fix views 2 Dev: clean out survey->surveyinfo : fix views tokens Dev: clean out survey->surveyinfo : fix views 4 Dev: clean out survey->surveyinfo : fix views quotas Dev: clean out survey->surveyinfo : fix views publication Dev: clean out survey->surveyinfo : fix views general Dev: clean out survey->surveyinfo : fix surveyadmin controller Dev: bugfixing functionality in the new adminpanel Dev: Finished moving the breadcrums to the titlebar Dev: Fixed saving of subviews and some minor css errors |
Affected Issues 12394 |
|
| mod - application/controllers/admin/assessments.php | Diff File | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/controllers/admin/emailtemplates.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/expressions.php | Diff File | ||
| mod - application/controllers/admin/index.php | Diff File | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/controllers/admin/quotas.php | Diff File | ||
| mod - application/controllers/admin/responses.php | Diff File | ||
| mod - application/controllers/admin/saved.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/surveypermission.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/admin/translate.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/models/QuotaMember.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyLink.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_members.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_members_item.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/_template_carousel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_presentation_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_publication_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_tokens_panel.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
|
develop e46890cb 2017-07-11 08:58:22 Details Diff |
Merge remote-tracking branch 'upstream/develop' into develop | ||
| mod - .gitignore | Diff File | ||
| add - .vscode/settings.json | Diff File | ||
| mod - application/commands/InstallCommand.php | Diff File | ||
| mod - application/commands/PluginCommand.php | Diff File | ||
| mod - application/commands/ResetPasswordCommand.php | Diff File | ||
| mod - application/commands/UpdateDbCommand.php | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/config/packages.php | Diff File | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/UploaderController.php | Diff File | ||
| add - application/controllers/admin/SurveymenuController.php | Diff File | ||
| add - application/controllers/admin/SurveymenuEntryController.php | Diff File | ||
| mod - application/controllers/admin/assessments.php | Diff File | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/expressions.php | Diff File | ||
| mod - application/controllers/admin/limereplacementfields.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/admin/quotas.php | Diff File | ||
| mod - application/controllers/admin/responses.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/surveypermission.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/admin/translate.php | Diff File | ||
| mod - application/controllers/admin/useraction.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/controllers/survey/index.php | Diff File | ||
| mod - application/core/ConsoleApplication.php | Diff File | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
| mod - application/core/LSUserIdentity.php | Diff File | ||
| mod - application/core/LSWebUser.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| mod - application/core/LSYii_CaseValidator.php | Diff File | ||
| mod - application/core/LSYii_ClientScript.php | Diff File | ||
| mod - application/core/LSYii_Controller.php | Diff File | ||
| mod - application/core/LSYii_Validators.php | Diff File | ||
| mod - application/core/LS_Twig_Extension.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/core/UserIdentity.php | Diff File | ||
| mod - application/core/db/DbConnection.php | Diff File | ||
| mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
| mod - application/core/plugins/Authdb/Authdb.php | Diff File | ||
| mod - application/core/plugins/ExportR/RDataWriter.php | Diff File | ||
| mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php | Diff File | ||
| mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
| mod - application/core/plugins/QuickMenu/QuickMenuButton.php | Diff File | ||
| mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php | Diff File | ||
| mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php | Diff File | ||
| mod - application/extensions/PanelBoxWidget/views/box.php | Diff File | ||
| mod - application/extensions/PanelBoxWidget/views/row_footer.php | Diff File | ||
| mod - application/extensions/PanelBoxWidget/views/row_header.php | Diff File | ||
| mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty.php | Diff File | ||
| mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/first-select.php | Diff File | ||
| mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php | Diff File | ||
| mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php | Diff File | ||
| mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php | Diff File | ||
| mod - application/extensions/bootstrap/helpers/TbHtml.php | Diff File | ||
| mod - application/extensions/bootstrap/tests/unit/TbHtmlTest.php | Diff File | ||
| mod - application/extensions/questionTypes/listRadio/listRadio.php | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/daterangepicker/assets/js/daterangepicker.js | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/bootstrap-datetimepicker.js | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/formhelpers/assets/js/bootstrap-formhelpers.js | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/formhelpers/assets/js/bootstrap-formhelpers.min.js | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/grid/WhToggleColumn.php | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/multiselect/assets/js/bootstrap-multiselect.js | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/timepicker/WhTimePicker.php | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/timepicker/assets/js/bootstrap-timepicker.js | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/timepicker/assets/js/bootstrap-timepicker.min.js | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/Zend/Server/Abstract.php | Diff File | ||
| mod - application/helpers/Zend/Server/Reflection/Function/Abstract.php | Diff File | ||
| mod - application/helpers/Zend/XmlRpc/Server/Fault.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/admin/export/CsvWriter.php | Diff File | ||
| mod - application/helpers/admin/export/ExcelWriter.php | Diff File | ||
| mod - application/helpers/admin/export/PdfWriter.php | Diff File | ||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | ||
| mod - application/helpers/admin/export/SurveyObj.php | Diff File | ||
| mod - application/helpers/admin/export/Writer.php | Diff File | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/helpers/admin/label_helper.php | Diff File | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
| mod - application/helpers/adodb/adodb-time.inc_helper.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/database_helper.php | Diff File | ||
| mod - application/helpers/export_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_core_helper.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/helpers/questionIndexHelper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/helpers/sanitize_helper.php | Diff File | ||
| mod - application/helpers/update/update_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/helpers/userstatistics_helper.php | Diff File | ||
| mod - application/libraries/PluginManager/LimesurveyApi.php | Diff File | ||
| mod - application/models/AdminTheme.php | Diff File | ||
| mod - application/models/Answer.php | Diff File | ||
| mod - application/models/Boxes.php | Diff File | ||
| mod - application/models/Condition.php | Diff File | ||
| mod - application/models/LabelSet.php | Diff File | ||
| mod - application/models/Participant.php | Diff File | ||
| mod - application/models/ParticipantShare.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/models/QuestionAttribute.php | Diff File | ||
| mod - application/models/QuestionGroup.php | Diff File | ||
| mod - application/models/Quota.php | Diff File | ||
| mod - application/models/QuotaLanguageSetting.php | Diff File | ||
| mod - application/models/QuotaMember.php | Diff File | ||
| mod - application/models/Response.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyDynamic.php | Diff File | ||
| mod - application/models/SurveyLanguageSetting.php | Diff File | ||
| mod - application/models/SurveyTimingDynamic.php | Diff File | ||
| add - application/models/Surveymenu.php | Diff File | ||
| add - application/models/SurveymenuEntries.php | Diff File | ||
| mod - application/models/Template.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/models/Token.php | Diff File | ||
| mod - application/models/TokenDynamic.php | Diff File | ||
| mod - application/models/User.php | Diff File | ||
| mod - application/models/UserGroup.php | Diff File | ||
| mod - application/third_party/pclzip/pclzip.lib.php | Diff File | ||
| mod - application/views/admin/assessments_view.php | Diff File | ||
| mod - application/views/admin/conditions/conditionshead_view.php | Diff File | ||
| mod - application/views/admin/conditions/includes/conditions_edit.php | Diff File | ||
| mod - application/views/admin/conditions/includes/conditions_scenario.php | Diff File | ||
| mod - application/views/admin/dataentry/content_view.php | Diff File | ||
| mod - application/views/admin/dataentry/import.php | Diff File | ||
| mod - application/views/admin/dataentry/vvimport.php | Diff File | ||
| mod - application/views/admin/export/exportresults_view.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/_question.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_response_filter_choice.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_subviews/_statistics_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_submissiondate.php | Diff File | ||
| mod - application/views/admin/export/statistics_user_view.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - application/views/admin/export/vv_view.php | Diff File | ||
| mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
| mod - application/views/admin/labels/_labelviewrightcontent_view.php | Diff File | ||
| mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
| mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
| mod - application/views/admin/participants/massive_actions/_selector.php | Diff File | ||
| mod - application/views/admin/participants/massive_actions/_selector_attribute.php | Diff File | ||
| mod - application/views/admin/participants/massive_actions/_selector_share.php | Diff File | ||
| mod - application/views/admin/participants/participantsPanel_view.php | Diff File | ||
| mod - application/views/admin/participants/viewAttribute_view.php | Diff File | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_actions.php | Diff File | ||
| mod - application/views/admin/responses/browseallheader_view.php | Diff File | ||
| mod - application/views/admin/responses/browseallrow_view.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
| mod - application/views/admin/responses/browsetimeheader_view.php | Diff File | ||
| mod - application/views/admin/responses/browsetimerow_view.php | Diff File | ||
| mod - application/views/admin/responses/massive_actions/_selector.php | Diff File | ||
| mod - application/views/admin/saved/savedlist_view.php | Diff File | ||
| mod - application/views/admin/super/_configuration_menu.php | Diff File | ||
| mod - application/views/admin/super/_question_explorer.php | Diff File | ||
| add - application/views/admin/super/_renderJson.php | Diff File | ||
| mod - application/views/admin/super/footer.php | Diff File | ||
| mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
| mod - application/views/admin/super/quickmenu.php | Diff File | ||
| mod - application/views/admin/super/sidebody.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| mod - application/views/admin/super/title_bar.php | Diff File | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/editdefaultvalues_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/massive_actions/_selector.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_accordion_container.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_tabs.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/addGroup_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/editGroup_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
| mod - application/views/admin/survey/deleteSurvey_view.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
| add - application/views/admin/survey/subview/_create_survey_text.php | Diff File | ||
| mod - application/views/admin/survey/subview/_template_carousel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_integration_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_plugin_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_plugins_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_presentation_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_publication_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_resources_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_tokens_panel.php | Diff File | ||
| mod - application/views/admin/survey/subview/addPanelIntegrationParameter_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabCreate_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/tab_edit_view.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditor_surveylist_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/token/invite.php | Diff File | ||
| mod - application/views/admin/token/managetokenattributes.php | Diff File | ||
| mod - application/views/admin/token/massive_actions/_selector.php | Diff File | ||
| mod - application/views/admin/token/token_bar.php | Diff File | ||
| mod - application/views/admin/token/tokenform.php | Diff File | ||
| mod - application/views/admin/token/tokensummary.php | Diff File | ||
| mod - application/views/admin/token/tokenwarning.php | Diff File | ||
| mod - application/views/admin/update/manage/manage_key.php | Diff File | ||
| mod - application/views/admin/user/editusers.php | Diff File | ||
| mod - application/views/admin/user/modifyuser.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroups_view.php | Diff File | ||
| mod - application/views/admin/usergroup/viewUserGroup_view.php | Diff File | ||
| mod - application/views/layouts/installer.php | Diff File | ||
| add - assets/packages/adminpanel/.eslint.json | Diff File | ||
| add - assets/packages/adminpanel/build/app.js | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
| mod - assets/packages/adminpanel/gulpfile.js | Diff File | ||
| mod - assets/packages/adminpanel/lime_surveymenu.sql | Diff File | ||
| mod - assets/packages/adminpanel/package.json | Diff File | ||
| mod - assets/packages/adminpanel/scss/bootstrapadditions.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/colors.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/lsflex.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/lsspaces.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/main.scss | Diff File | ||
| mod - assets/packages/adminpanel/src/components/adminmenu.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/components/questions.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/components/questionsgroups.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/components/topbar.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/main.js | Diff File | ||
| mod - assets/packages/adminpanel/src/mixins/runAjax.js | Diff File | ||
| mod - assets/packages/adminpanel/webpack.config.js | Diff File | ||
| mod - assets/packages/adminpanel/yarn.lock | Diff File | ||
| mod - assets/scripts/admin/admin_core.js | Diff File | ||
| mod - assets/scripts/admin/answers.js | Diff File | ||
| mod - assets/scripts/admin/assessments.js | Diff File | ||
| mod - assets/scripts/admin/emailtemplates.js | Diff File | ||
| mod - assets/scripts/admin/labels.js | Diff File | ||
| mod - assets/scripts/admin/notifications.js | Diff File | ||
| mod - assets/scripts/admin/statistics.js | Diff File | ||
| mod - assets/scripts/admin/subquestions.js | Diff File | ||
| mod - assets/scripts/admin/surveysettings.js | Diff File | ||
| mod - assets/scripts/admin/tokens.js | Diff File | ||
| mod - assets/styles-admin/Apple_Blossom/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Bay_of_Many/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Black_Pearl/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Dark_Sky/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Free_Magenta/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Noto_All_Languages/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Purple_Tentacle/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Sea_Green/config.xml | Diff File | ||
| mod - assets/styles-admin/Sea_Green/css/lime-admin-common.css | Diff File | ||
| mod - assets/styles-admin/Sea_Green/scripts/sidemenu.js | Diff File | ||
| mod - assets/styles-admin/Sunset_Orange/scripts/sidemenu.js | Diff File | ||
| mod - installer/css/fonts.css | Diff File | ||
| mod - installer/sql/create-mssql.sql | Diff File | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
| mod - installer/sql/create-pgsql.sql | Diff File | ||
| mod - templates/default/config.xml | Diff File | ||
| mod - templates/default/css/animate.css | Diff File | ||
| mod - templates/default/css/background-image.css | Diff File | ||
| mod - templates/default/css/survey-list.css | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
| mod - templates/default/files/logo_340.png | Diff File | ||
| mod - templates/default/files/logo_w_s.png | Diff File | ||
| mod - templates/default/files/pattern.png | Diff File | ||
| mod - templates/default/views/layout_global.twig | Diff File | ||
| mod - templates/default/views/layout_survey_list.twig | Diff File | ||
| mod - templates/default/views/subviews/head.twig | Diff File | ||
| mod - templates/default/views/subviews/nav_bar.twig | Diff File | ||
| mod - templates/default/views/subviews/progess_bar.twig | Diff File | ||
| mod - templates/default/views/subviews/survey/question.twig | Diff File | ||
| mod - templates/default/views/subviews/warnings.twig | Diff File | ||
| mod - tests/DummyController.php | Diff File | ||
| mod - tests/bootstrap.php | Diff File | ||
| mod - tests/helpers/UpdateDbHelperTest.php | Diff File | ||
| mod - tests/questions/DateTimeDefaultAnswerExpressionTest.php | Diff File | ||
| mod - third_party/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js | Diff File | ||
|
develop 1f6ddadf 2017-07-10 19:32:22
|
Fixed issue #12511: PHP notice when going to copied templates |
Affected Issues 12511 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
|
develop c503fdde 2017-07-10 19:32:22
Committer: TonisOrmisson Details Diff |
Fixed issue #12511: PHP notice when going to copied templates |
Affected Issues 12511 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
|
develop_adminpanel 60f0f087 2017-07-10 17:43:36
|
Dev: bugfixing functionality in the new adminpanel Finished moving the breadcrums to the titlebar Fixed saving of subviews and some minor css errors |
||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/assessments.php | Diff File | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/emailtemplates.php | Diff File | ||
| mod - application/controllers/admin/quotas.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/surveypermission.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/extensions/bootstrap/helpers/TbHtml.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/views/admin/conditions/conditionshead_view.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
| mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
| mod - application/views/admin/quotas/editquota_view.php | Diff File | ||
| mod - application/views/admin/quotas/newquota_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_quota_actions.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_view.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
| mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| mod - application/views/admin/super/title_bar.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/editGroup_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
| mod - application/views/admin/survey/breadcrumb.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
| mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/addPanelIntegrationParameter_view.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
| mod - application/views/admin/token/token_bar.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
| mod - assets/packages/adminpanel/scss/bootstrapadditions.scss | Diff File | ||
| mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
| mod - assets/packages/adminpanel/src/components/questionsgroups.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | ||
| mod - assets/scripts/admin/answers.js | Diff File | ||
| mod - assets/scripts/admin/labels.js | Diff File | ||
| mod - assets/scripts/admin/subquestions.js | Diff File | ||
| mod - assets/styles-admin/Sea_Green/scripts/save.js | Diff File | ||
| mod - installer/sql/create-mssql.sql | Diff File | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
| mod - installer/sql/create-pgsql.sql | Diff File | ||
|
develop 74c533b8 2017-07-10 10:57:43
|
Dev: Merge branch 'master' into develop | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/third_party/pclzip/pclzip.lib.php | Diff File | ||
|
develop bfea6fa3 2017-07-10 10:19:05
Committer: |
DEV: clean out survey->surveyinfo VOL1 (#761) Fixed issue 12394: Adding question to quota shoult order questions in display order add quoteColumnName for order. Put the grouping criteria in separate method (reusable) DEV: implement Survey->currentLanguageSettings DEV: clean out survey->surveyinfo 1 DEV: clean out survey->surveyinfo dataentry 2 DEV: clean out survey->surveyinfo questions DEV: clean out survey->surveyinfo tokens DEV: clean out survey->surveyinfo tokens 2 DEV: clean out survey->surveyinfo questions DEV: clean out survey->surveyinfo questions 2, remerge Survey |
Affected Issues 12394 |
|
| mod - application/controllers/admin/assessments.php | Diff File | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/views/admin/dataentry/import.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/editdefaultvalues_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_tabs.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | ||
| mod - application/views/admin/templates/templateeditor_surveylist_view.php | Diff File | ||
| mod - application/views/admin/token/invite.php | Diff File | ||
| mod - application/views/admin/token/managetokenattributes.php | Diff File | ||
| mod - application/views/admin/token/token_bar.php | Diff File | ||
| mod - application/views/admin/token/tokensummary.php | Diff File | ||
| mod - application/views/admin/token/tokenwarning.php | Diff File | ||
|
develop d960a205 2017-07-09 01:17:47 Committer: GitHub Details Diff |
Merge pull request #742 from TonisOrmisson/inspect40 FIX: Installation duplicate column hash for prefix_notifications |
||
| mod - installer/sql/create-mssql.sql | Diff File | ||
|
develop df7640c3 2017-07-07 17:23:38 Details Diff |
Dev: fix 12522 $this->preview |
Affected Issues 12522 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
develop 535af5dc 2017-07-07 16:04:20
Committer: |
Deb: clean frontend_helper (#760) Dev: about cookieConsentLocalization() https://github.com/LimeSurvey/LimeSurvey/pull/760/commits/b8a41f2f7cc211b7cbdd9c5c2b6149e29dd1e8ee Dev: put a date and a nick is better |
||
| mod - application/controllers/survey/index.php | Diff File | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
