LimeSurvey: 2.5 3ff4864c

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.5 2016-01-29 11:05:23 2.5 e580a5e8
Changeset

Merge branch 'master' into 2.5

Conflicts:

application/controllers/admin/dataentry.php

docs/release_notes.txt

third_party/kcfinder/core/bootstrap.php
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/htmleditor_pop.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/db/DbConnection.php Diff File
add - application/core/web/DbHttpSession.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/Permission.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
add - framework/LICENSE Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/bg.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fr/fr.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/sq/sq.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File