LimeSurvey: 2.5 9d7bd82c

Diff Back to Repository
Author Committer Branch Timestamp Parent
LouisGac LouisGac 2.5 2016-01-08 15:03 2.5 130ece84
Changeset

Merge branch 'master' into 2.5

Conflicts:
application/helpers/expressions/em_manager_helper.php
application/helpers/qanda_helper.php
application/helpers/update/updatedb_helper.php
application/views/admin/labels/labelview_view.php
application/views/admin/participants/viewAttribute_view.php
scripts/admin/labels.js
scripts/admin/viewAttribute.js
templates/citronade/template.js
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Token.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fi/fi.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/nn/nn.mo Diff File
mod - locale/th/th.mo Diff File
mod - scripts/admin/labels.js Diff File
mod - scripts/admin/viewAttribute.js Diff File
mod - scripts/date.js Diff File