LimeSurvey: develop 4a91ce3e
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| TonisOrmisson | TonisOrmisson | develop | 2017-07-03 13:24:45 | develop 6784ecd0 |
| Changeset | Merge remote-tracking branch 'upstream/develop' into develop |
|||
| mod - .gitignore | Diff File | |||
| mod - application/config/internal.php | Diff File | |||
| mod - application/config/packages.php | Diff File | |||
| mod - application/config/third_party.php | Diff File | |||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/InstallerController.php | Diff File | |||
| mod - application/controllers/OptoutController.php | Diff File | |||
| mod - application/controllers/RegisterController.php | Diff File | |||
| mod - application/controllers/SurveyController.php | Diff File | |||
| mod - application/controllers/SurveysController.php | Diff File | |||
| mod - application/controllers/admin/NotificationController.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/homepagesettings.php | Diff File | |||
| mod - application/controllers/admin/htmleditor_pop.php | Diff File | |||
| mod - application/controllers/admin/limereplacementfields.php | Diff File | |||
| mod - application/controllers/admin/questiongroups.php | Diff File | |||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/controllers/admin/remotecontrol.php | Diff File | |||
| mod - application/controllers/admin/statistics.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/update.php | Diff File | |||
| mod - application/controllers/admin/useraction.php | Diff File | |||
| mod - application/controllers/admin/usergroups.php | Diff File | |||
| mod - application/core/LSETwigViewRenderer.php | Diff File | |||
| mod - application/core/LSHttpRequest.php | Diff File | |||
| mod - application/core/LSYii_Application.php | Diff File | |||
| mod - application/core/LSYii_ClientScript.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/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/ExportSTATAxml.php | Diff File | |||
| mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | |||
| mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php | Diff File | |||
| mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php | Diff File | |||
| mod - application/extensions/AdminFooter/views/footer.php | Diff File | |||
| mod - application/extensions/LimeScript/LimeScript.php | Diff File | |||
| mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php | Diff File | |||
| mod - application/extensions/PanelBoxWidget/views/box.php | Diff File | |||
| mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php | Diff File | |||
| add - application/extensions/captchaExtended/CHANGELOG | Diff File | |||
| add - application/extensions/captchaExtended/CaptchaExtendedAction.php | Diff File | |||
| add - application/extensions/captchaExtended/CaptchaExtendedValidator.php | Diff File | |||
| add - application/extensions/captchaExtended/LICENSE | Diff File | |||
| add - application/extensions/captchaExtended/README | Diff File | |||
| add - application/extensions/captchaExtended/fonts/nimbus.ttf | Diff File | |||
| add - application/extensions/captchaExtended/fonts/readme.txt | Diff File | |||
| add - application/extensions/captchaExtended/words.de.txt | Diff File | |||
| add - application/extensions/captchaExtended/words.en.txt | Diff File | |||
| add - application/extensions/captchaExtended/words.ru.txt | Diff File | |||
| add - application/extensions/captchaExtended/words.sk.txt | Diff File | |||
| add - application/extensions/captchaExtended/words.txt | Diff File | |||
| mod - application/favicon.ico | Diff File | |||
| mod - application/helpers/ClassFactory.php | Diff File | |||
| mod - application/helpers/Hash.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/Zend/Server/Definition.php | Diff File | |||
| mod - application/helpers/Zend/XmlRpc/Generator/GeneratorAbstract.php | Diff File | |||
| mod - application/helpers/Zend/XmlRpc/Generator/XmlWriter.php | Diff File | |||
| mod - application/helpers/Zend/XmlRpc/Server.php | Diff File | |||
| mod - application/helpers/Zend/XmlRpc/Value/Collection.php | Diff File | |||
| mod - application/helpers/admin/activate_helper.php | Diff File | |||
| mod - application/helpers/admin/ajax_helper.php | Diff File | |||
| mod - application/helpers/admin/export/FormattingOptions.php | Diff File | |||
| mod - application/helpers/admin/export/HtmlWriter.php | Diff File | |||
| mod - application/helpers/admin/export/IWriter.php | Diff File | |||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | |||
| mod - application/helpers/admin/export/Writer.php | Diff File | |||
| mod - application/helpers/admin/exportresults_helper.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/statistics_helper.php | Diff File | |||
| mod - application/helpers/admin/template_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/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/globals.php | Diff File | |||
| mod - application/helpers/globalsettings_helper.php | Diff File | |||
| mod - application/helpers/ldap_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/updatedb_helper.php | Diff File | |||
| mod - application/helpers/userstatistics_helper.php | Diff File | |||
| mod - application/helpers/viewHelper.php | Diff File | |||
| mod - application/libraries/Date_Time_Converter.php | Diff File | |||
| mod - application/libraries/PluginManager/Storage/DbStorage.php | Diff File | |||
| mod - application/libraries/Save.php | Diff File | |||
| mod - application/libraries/admin/pclzip/pclzip.php | Diff File | |||
| mod - application/models/Answer.php | Diff File | |||
| mod - application/models/Label.php | Diff File | |||
| mod - application/models/LabelSet.php | Diff File | |||
| mod - application/models/Notification.php | Diff File | |||
| mod - application/models/Participant.php | Diff File | |||
| mod - application/models/Permission.php | Diff File | |||
| mod - application/models/Question.php | Diff File | |||
| mod - application/models/QuestionGroup.php | Diff File | |||
| mod - application/models/QuestionTemplate.php | Diff File | |||
| mod - application/models/QuotaLanguageSetting.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 | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| mod - application/models/Token.php | Diff File | |||
| mod - application/models/TokenDynamic.php | Diff File | |||
| mod - application/models/UpdateForm.php | Diff File | |||
| mod - application/models/User.php | Diff File | |||
| mod - application/models/UserGroup.php | Diff File | |||
| mod - application/views/admin/authentication/ajaxLogin.php | Diff File | |||
| mod - application/views/admin/authentication/login.php | Diff File | |||
| mod - application/views/admin/checkintegrity/check_view.php | Diff File | |||
| mod - application/views/admin/checkintegrity/fix_view.php | Diff File | |||
| mod - application/views/admin/dataentry/vvimport_result.php | Diff File | |||
| mod - application/views/admin/export/statistics_subviews/_question.php | Diff File | |||
| mod - application/views/admin/globalSettings_view.php | Diff File | |||
| mod - application/views/admin/global_settings/_email.php | Diff File | |||
| mod - application/views/admin/global_settings/_security.php | Diff File | |||
| mod - application/views/admin/labels/labelsets_view.php | Diff File | |||
| mod - application/views/admin/labels/labelview_view.php | Diff File | |||
| mod - application/views/admin/limeReplacementFields_view.php | Diff File | |||
| mod - application/views/admin/notification/index.php | Diff File | |||
| mod - application/views/admin/participants/attributeControl_view.php | Diff File | |||
| mod - application/views/admin/participants/attributeMap_view.php | Diff File | |||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | |||
| mod - application/views/admin/participants/modal_subviews/_addToSurvey.php | Diff File | |||
| mod - application/views/admin/participants/modal_subviews/_editParticipant.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/remotecontrol/index_view.php | Diff File | |||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | |||
| mod - application/views/admin/super/_configuration_menu.php | Diff File | |||
| mod - application/views/admin/super/admin_notifications.php | Diff File | |||
| mod - application/views/admin/super/adminmenu.php | Diff File | |||
| mod - application/views/admin/super/footer.php | Diff File | |||
| mod - application/views/admin/super/header.php | Diff File | |||
| mod - application/views/admin/super/messagebox.php | Diff File | |||
| mod - application/views/admin/super/title_bar.php | Diff File | |||
| mod - application/views/admin/super/welcome.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | |||
| mod - application/views/admin/survey/listSurveys_view.php | Diff File | |||
| mod - application/views/admin/survey/newSurvey_view.php | Diff File | |||
| mod - application/views/admin/survey/prepareEditorScript_view.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_publication_panel.php | Diff File | |||
| mod - application/views/admin/survey/subview/tab_survey_view.php | Diff File | |||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | |||
| mod - application/views/admin/templates/importform_view.php | Diff File | |||
| mod - application/views/admin/templates/importuploaded_view.php | Diff File | |||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | |||
| mod - application/views/admin/token/emailpost.php | Diff File | |||
| mod - application/views/admin/token/exportdialog.php | Diff File | |||
| mod - application/views/admin/token/invite.php | Diff File | |||
| mod - application/views/admin/token/remind.php | Diff File | |||
| mod - application/views/admin/translate/translatefields_view.php | Diff File | |||
| mod - application/views/admin/translate/translatefieldsfooter_view.php | Diff File | |||
| mod - application/views/admin/translate/translatefooter_view.php | Diff File | |||
| mod - application/views/admin/translate/translateformheader_view.php | Diff File | |||
| mod - application/views/admin/translate/translateheader_view.php | Diff File | |||
| mod - application/views/admin/translate/translatetabs_view.php | Diff File | |||
| mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable.php | Diff File | |||
| mod - application/views/admin/update/manage/manage_key.php | Diff File | |||
| mod - application/views/admin/update/manage/subscribe.php | Diff File | |||
| mod - application/views/admin/update/updater/_error.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/user/personalsettings.php | Diff File | |||
| mod - application/views/admin/user/setuserpermissions.php | Diff File | |||
| mod - application/views/admin/user/setusertemplates.php | Diff File | |||
| mod - application/views/admin/usergroup/addUserGroup_view.php | Diff File | |||
| mod - application/views/admin/usergroup/editUserGroup_view.php | Diff File | |||
| mod - application/views/admin/usergroup/mailUserGroup_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/installer/precheck_view.php | Diff File | |||
| mod - application/views/survey/questions/answer/multiplechoice/rows/answer_row.twig | Diff File | |||
| mod - application/views/survey/questions/answer/multiplechoice/rows/answer_row_other.php | Diff File | |||
| mod - application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row_other.php | Diff File | |||
| add - assets/packages/bootstrap/bootstrap.css | Diff File | |||
| add - assets/packages/bootstrap/bootstrap.js | Diff File | |||
| add - assets/packages/bootstrap/bootstrap.min.css | Diff File | |||
| add - assets/packages/bootstrap/bootstrap.min.js | Diff File | |||
| add - assets/packages/bootstrap/yiistrap.css | Diff File | |||
| add - assets/packages/bootstrap/yiistrap.min.css | Diff File | |||
| mod - assets/packages/limesurvey/survey.css | Diff File | |||
| mod - assets/packages/limesurvey/survey.js | Diff File | |||
| mod - assets/packages/template-default/template-core.js | Diff File | |||
| mod - assets/scripts/admin/admin_core.js | Diff File | |||
| mod - assets/scripts/admin/comfortupdater/comfortupdater.js | Diff File | |||
| mod - assets/scripts/admin/listresponse.js | Diff File | |||
| mod - assets/scripts/admin/statistics.js | Diff File | |||
| mod - assets/scripts/admin/subquestions.js | Diff File | |||
| mod - assets/scripts/admin/translation.js | Diff File | |||
| mod - assets/styles-admin/Apple_Blossom/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Apple_Blossom/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Apple_Blossom/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Apple_Blossom/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Apple_Blossom/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Bay_of_Many/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Bay_of_Many/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Bay_of_Many/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Bay_of_Many/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Bay_of_Many/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Black_Pearl/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Black_Pearl/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Black_Pearl/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Black_Pearl/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Black_Pearl/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Dark_Sky/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Dark_Sky/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Dark_Sky/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Dark_Sky/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Dark_Sky/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Free_Magenta/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Free_Magenta/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Free_Magenta/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Free_Magenta/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Free_Magenta/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Noto_All_Languages/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Noto_All_Languages/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Noto_All_Languages/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Purple_Tentacle/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Purple_Tentacle/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Purple_Tentacle/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Sea_Green/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Sea_Green/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Sea_Green/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Sea_Green/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Sea_Green/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Sea_Green/images/logo.png | Diff File | |||
| mod - assets/styles-admin/Sunset_Orange/css/lime-admin-colors.css | Diff File | |||
| mod - assets/styles-admin/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | |||
| mod - assets/styles-admin/Sunset_Orange/css/lime-admin-common.css | Diff File | |||
| mod - assets/styles-admin/Sunset_Orange/images/Limesurvey_logo.png | Diff File | |||
| mod - assets/styles-admin/Sunset_Orange/images/donate.png | Diff File | |||
| mod - assets/styles-admin/Sunset_Orange/images/logo.png | Diff File | |||
| mod - assets/styles-admin/favicon.ico | Diff File | |||
| mod - composer.json | Diff File | |||
| mod - docs/demosurveys/ls205_randomization_group_test.lss | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
