LimeSurvey: master fe46a532

Author Committer Branch Timestamp Parent
markusfluer markusfluer master 2017-09-25 11:54:48 master 6cb2ce5a
Changeset

Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

add - CONTRIBUTING.md Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/globals.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
add - application/views/admin/global_settings/_storage.php Diff File
add - application/views/admin/global_settings/_storage_ajax.php 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/ca-valencia/ca-valencia.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.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/nl-informal/nl-informal.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/globalsettings.js Diff File
mod - templates/default/css/template.css Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/ubuntu_orange/css/template.css Diff File