LimeSurvey: 2.5 3225a6ef

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.5 2015-12-09 12:31 2.5 8102ecf4
Changeset

Merge branch 'master' into 2.5

Conflicts:

application/config/internal.php

application/views/admin/super/adminmenu.php

application/views/admin/survey/subview/tabNotification_view.php

application/views/admin/token/tokenform.php

application/views/plugins/index.php

locale/de-informal/de-informal.mo

locale/el/el.mo

locale/ru/ru.mo

locale/th/th.mo
mod - application/config/internal.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LSYii_Application.php Diff File
rm - application/extensions/ExtendedClientScript/ExtendedClientScript.php Diff
rm - application/extensions/ExtendedClientScript/cssmin/cssmin.php Diff
rm - application/extensions/ExtendedClientScript/jsmin/JSMin.php Diff
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - application/views/plugins/index.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.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/en/en.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.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/pl/pl.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sq/sq.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/vi/vi.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File