LimeSurvey: 2.06 859a4bdb

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.06 2014-11-21 17:44 2.06 6acf730b
Changeset

Merge branch 'master' into 2.06

Manually resolved conflicts in:
application/config/version.php
application/controllers/admin/tokens.php
application/controllers/survey/index.php
application/helpers/admin/export/Writer.php
application/helpers/common_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/qanda_helper.php
application/helpers/update/updatedb_helper.php
application/models/Token.php
installer/sql/create-mssql.sql
locale/_template/limesurvey.pot
locale/de-informal/LC_MESSAGES/de-informal.mo
locale/de/LC_MESSAGES/de.mo
locale/el/el.mo
locale/es/es.mo
locale/nl-informal/LC_MESSAGES/nl-informal.mo
locale/nl/nl.mo
locale/pl/LC_MESSAGES/pl.mo
mod - application/config/tcpdf.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/statistics_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/pdfHelper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/es-CL/es-CL.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/hr/hr.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/ja/ja.mo Diff File
mod - locale/lt/lt.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/sr/sr.mo Diff File
mod - locale/tr/tr.mo Diff File
rm - scripts/admin/tokenbounce.js Diff
mod - scripts/admin/tokens.js Diff File
mod - styles/adminstyle.css Diff File