LimeSurvey: master 3065832d
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
Jelle_S | Jelle_S | master | 2016-06-10 12:48 | master 9cf2317b |
Changeset | Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
|
|||
mod - .gitignore | Diff File | |||
mod - .scrutinizer.yml | Diff File | |||
mod - application/config/config-defaults.php | Diff File | |||
mod - application/config/internal.php | Diff File | |||
mod - application/config/third_party.php | Diff File | |||
mod - application/config/updater_version.php | Diff File | |||
mod - application/config/version.php | Diff File | |||
mod - application/controllers/AdminController.php | Diff File | |||
mod - application/controllers/InstallerController.php | Diff File | |||
mod - application/controllers/PluginsController.php | Diff File | |||
mod - application/controllers/RegisterController.php | Diff File | |||
mod - application/controllers/Statistics_userController.php | Diff File | |||
mod - application/controllers/SurveysController.php | Diff File | |||
mod - application/controllers/UploaderController.php | Diff File | |||
mod - application/controllers/admin/ExpressionValidate.php | Diff File | |||
add - application/controllers/admin/PluginHelper.php | Diff File | |||
mod - application/controllers/admin/assessments.php | Diff File | |||
mod - application/controllers/admin/authentication.php | Diff File | |||
mod - application/controllers/admin/checkintegrity.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/emailtemplates.php | Diff File | |||
mod - application/controllers/admin/export.php | Diff File | |||
mod - application/controllers/admin/expressions.php | Diff File | |||
mod - application/controllers/admin/globalsettings.php | Diff File | |||
mod - application/controllers/admin/homepagesettings.php | Diff File | |||
mod - application/controllers/admin/labels.php | Diff File | |||
mod - application/controllers/admin/participantsaction.php | Diff File | |||
mod - application/controllers/admin/pluginmanager.php | Diff File | |||
mod - application/controllers/admin/printablesurvey.php | Diff File | |||
mod - application/controllers/admin/questiongroups.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/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/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/controllers/survey/index.php | Diff File | |||
add - application/core/LSBootstrap.php | Diff File | |||
mod - application/core/LSYii_Application.php | Diff File | |||
mod - application/core/LSYii_Controller.php | Diff File | |||
mod - application/core/LSYii_EmailIDNAValidator.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/STATAxmlWriter.php | Diff File | |||
add - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | |||
add - application/core/plugins/QuickMenu/QuickMenuButton.php | Diff File | |||
add - application/core/plugins/QuickMenu/README.md | Diff File | |||
mod - application/extensions/AdminFooter/views/footer.php | Diff File | |||
mod - application/extensions/LimeDebug/LimeDebug.php | Diff File | |||
mod - application/extensions/LimeScript/assets/script.js | Diff File | |||
mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | |||
add - application/extensions/SettingsWidget/assets/settingswidget-rtl.css | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/PositionWidget.php | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/README.md | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/assets/reload_position.js | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/views/ajax_form_group.php | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/views/form_group.php | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/views/no_group.php | Diff File | |||
add - application/extensions/admin/survey/question/PositionWidget/views/unknown_view.php | Diff File | |||
rm - application/extensions/bootstrap/.force_asset | Diff | |||
mod - application/extensions/bootstrap/assets/css/bootstrap.css | Diff File | |||
mod - application/extensions/bootstrap/css/bootstrap.css | Diff File | |||
mod - application/extensions/bootstrap/css/bootstrap.min.css | Diff File | |||
mod - application/extensions/questionTypes/listRadio/listRadio.php | Diff File | |||
add - application/extensions/yiiwheels/assets/js/moment-with-locales.js | Diff File | |||
rm - application/extensions/yiiwheels/assets/js/moment.min.js | Diff | |||
add - application/extensions/yiiwheels/widgets/buttongroup/WhButtonGroup.php | Diff File | |||
mod - application/extensions/yiiwheels/widgets/daterangepicker/WhDateRangePicker.php | Diff File | |||
mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php | Diff File | |||
add - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/bootstrap-datetimepicker.js | Diff File | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/bootstrap-datetimepicker.min.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.bg.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.cs.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.da.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.de.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.es.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fa-IR.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fi.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fo.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.hr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.hu.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.id.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.is.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.it.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ja.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.kr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.lt.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.lv.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ms.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.nb.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.nl.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.pl.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.pt-BR.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.pt.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ro.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.rs-latin.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.rs.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ru.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.sk.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.sl.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.sv.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.th.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.tr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.zh-CN.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.zh-TW.js | Diff | |||
mod - application/extensions/yiiwheels/widgets/select2/WhSelect2.php | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/css/select2-bootstrap.css | Diff File | |||
mod - application/extensions/yiiwheels/widgets/select2/assets/css/select2.css | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ar.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/az.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/bg.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ca.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/cs.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/da.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/de.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/en.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/es.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/et.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/eu.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/fa.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/fi.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/fr.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/gl.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/he.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/hi.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/hr.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/hu.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/id.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/is.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/it.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ja.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ko.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/lt.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/lv.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/mk.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ms.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/nb.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/nl.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/pl.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/pt-BR.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/pt.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ro.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/ru.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/sk.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/sr-Cyrl.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/sr.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/sv.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/th.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/tr.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/uk.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/vi.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/zh-CN.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/i18n/zh-TW.js | Diff File | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ar.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_az.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_bg.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ca.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_cs.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_da.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_de.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_el.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_es.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_et.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_eu.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_fa.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_fi.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_fr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_gl.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_he.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_hr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_hu.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_id.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_is.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_it.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ja.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ka.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ko.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_lt.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_lv.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_mk.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ms.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_nl.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_no.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_pl.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_pt-BR.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_pt-PT.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ro.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_rs.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ru.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_sk.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_sv.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_th.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_tr.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ua.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_ug-CN.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_uk.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_vi.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_zh-CN.js | Diff | |||
rm - application/extensions/yiiwheels/widgets/select2/assets/js/locale/select2_locale_zh-TW.js | Diff | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/select2.full.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/select2.full.min.js | Diff File | |||
mod - application/extensions/yiiwheels/widgets/select2/assets/js/select2.js | Diff File | |||
add - application/extensions/yiiwheels/widgets/select2/assets/js/select2.min.js | Diff File | |||
mod - application/extensions/yiiwheels/widgets/switch/WhSwitch.php | Diff File | |||
add - application/extensions/yiiwheels/widgets/switch/assets/css/bootstrap-switch.min.css | Diff File | |||
mod - application/extensions/yiiwheels/widgets/switch/assets/js/bootstrap-switch.js | Diff File | |||
mod - application/extensions/yiiwheels/widgets/switch/assets/js/bootstrap-switch.min.js | Diff File | |||
mod - application/helpers/SurveyRuntimeHelper.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/Writer.php | Diff File | |||
mod - application/helpers/admin/htmleditor_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/admin/template_helper.php | Diff File | |||
mod - application/helpers/common_helper.php | Diff File | |||
mod - application/helpers/database_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/globalsettings_helper.php | Diff File | |||
mod - application/helpers/qanda_helper.php | Diff File | |||
add - application/libraries/MenuObjects/Menu.php | Diff File | |||
add - application/libraries/MenuObjects/MenuInterface.php | Diff File | |||
add - application/libraries/MenuObjects/MenuItem.php | Diff File | |||
add - application/libraries/MenuObjects/MenuItemInterface.php | Diff File | |||
add - application/third_party/xlsx_writer/LICENSE | Diff File | |||
add - application/third_party/xlsx_writer/README.md | Diff File | |||
add - application/third_party/xlsx_writer/xlsxwriter.class.php | Diff File |