LimeSurvey: 2.5 0907cc4b

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.5 2015-10-02 14:21:43 2.5 fc95bdec
Changeset

Merge branch 'master' into 2.5

Conflicts:

application/controllers/admin/tokens.php

application/core/plugins/AuthLDAP/AuthLDAP.php

application/models/Survey.php

application/views/admin/token/invite.php

application/views/admin/token/remind.php

docs/release_notes.txt

locale/_template/limesurvey.pot

locale/ca/ca.mo

locale/es/es.mo

locale/fr/fr.mo

locale/it-informal/it-informal.mo

locale/it/it.mo

locale/ja/ja.mo

locale/ko/ko.mo

locale/nb/nb.mo

locale/nl-informal/nl-informal.mo

locale/nl/nl.mo

locale/nn/nn.mo

locale/pl/pl.mo

locale/ru/ru.mo

locale/th/th.mo

locale/zh-Hant-TW/zh-Hant-TW.mo
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/labels/editlabel_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