LimeSurvey: 2.5 3594ac45

Diff Back to Repository
Author Committer Branch Timestamp Parent
LouisGac LouisGac 2.5 2016-01-21 12:09 2.5 5e4e0efd
Changeset

Merge remote-tracking branch 'origin/master' into 2.5

Conflicts:
application/core/LSYii_Application.php
application/core/LSYii_Controller.php
application/helpers/globalsettings_helper.php
application/models/Question.php
application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php
application/views/admin/export/statistics_view.php
application/views/admin/super/footer.php
application/views/admin/super/header.php
application/views/admin/survey/importSurvey_view.php
locale/sk/sk.mo
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/bg.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hu/hu.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/pl/pl.mo Diff File
mod - locale/pt/pt.mo Diff File
rm - locale/sk/sk.mo Diff
mod - locale/tr/tr.mo Diff File