LimeSurvey: 2.5 bb072d1f

Author Committer Branch Timestamp Parent
Olle Haerstedt Olle Haerstedt 2.5 2015-10-02 14:55:16 2.5 bafc1df8
Changeset

Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/tokens.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/Authwebserver/Authwebserver.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/htmleditor_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/helpers/replacements_helper.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/authentication/error.php Diff File
rm - application/views/admin/authentication/success.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/import.php Diff File
mod - application/views/admin/dataentry/vvimport_result.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
rm - application/views/admin/labels/labelbar_view.php Diff File
rm - application/views/admin/labels/labelsummary_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/editquotalang_view.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/newquota_view.php Diff File
mod - application/views/admin/quotas/viewquotas_view.php Diff File
mod - application/views/admin/quotas/viewquotasrowsub_view.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - index.php Diff File