LimeSurvey: develop 55913302

Diff Back to Repository
Author Committer Branch Timestamp Parent
LouisGac LouisGac develop 2017-10-20 11:55:10 develop e691c140
Changeset

Dev: Merge branch 'master' into develop
add - CONTRIBUTING.md Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.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/SurveyDao.php Diff File
mod - application/helpers/admin/exportresults_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/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/frontend_helper.php Diff File
mod - application/helpers/globals.php Diff File
mod - application/helpers/ldap_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/PluginSetting.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/User.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/global_settings/_language.php Diff File
add - application/views/admin/global_settings/_storage.php Diff File
add - application/views/admin/global_settings/_storage_ajax.php Diff File
mod - application/views/admin/responses/browseallrow_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/ldapform.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
add - application/views/admin/token/massive_actions/_update.php Diff File
add - application/views/admin/token/massive_actions/_update_results.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php Diff File
mod - assets/styles-admin/Apple_Blossom/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Bay_of_Many/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Black_Pearl/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Dark_Sky/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Free_Magenta/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Sea_Green/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Sunset_Orange/css/lime-admin-colors.css Diff File
mod - assets/styles-public/browse.css Diff File
add - docs/PULL_REQUEST_TEMPLATE Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/ar.mo Diff File
mod - locale/ca-valencia/ca-valencia.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/es-AR-informal/es-AR-informal.mo Diff File
mod - locale/es-CL/es-CL.mo Diff File
mod - locale/es-MX/es-MX.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/gl/gl.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/ms/ms.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/pt/pt.mo Diff File
add - locale/run/index.html Diff File
add - locale/run/run.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File
mod - templates/default/css/template.css Diff File
mod - tests/helpers/ExpressionCoreHelperTest.php Diff File
mod - tests/questions/DateTimeTest.php Diff File