LimeSurvey: cint 8ce461ae

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-09-15 13:10 cint dac69553
Changeset

Merge branch 'master' into cint

Conflicts:
application/config/version.php
application/models/QuestionGroup.php
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/LSDbCriteria.php Diff File
mod - application/core/LSYii_CompareInsensitiveValidator.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_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/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
add - application/libraries/MersenneTwister.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/third_party/xlsx_writer/xlsxwriter.class.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - application/views/survey/frontpage/enterCaptcha.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/answer.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/column/answer.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/af.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/he/he.mo Diff File
mod - locale/id/id.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/ky/ky.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/sk/sk.mo Diff File
mod - locale/sr/sr.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/array-totalsum.js Diff File
mod - templates/default/css/flat_and_modern.css Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/views/survey.pstpl Diff File
mod - templates/default/views/surveylist.pstpl Diff File
mod - templates/news_paper/css/news_paper.css Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/news_paper/views/survey.pstpl Diff File
mod - templates/news_paper/views/surveylist.pstpl Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
mod - templates/ubuntu_orange/css/ubuntu_orange.css Diff File
mod - templates/ubuntu_orange/views/survey.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File
mod - third_party/ckeditor/CHANGES.md Diff File
mod - third_party/ckeditor/README.md Diff File
mod - third_party/ckeditor/build-config.js Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/lang/af.js Diff File
mod - third_party/ckeditor/lang/ar.js Diff File
mod - third_party/ckeditor/lang/bg.js Diff File
mod - third_party/ckeditor/lang/bn.js Diff File
mod - third_party/ckeditor/lang/bs.js Diff File
mod - third_party/ckeditor/lang/ca.js Diff File
mod - third_party/ckeditor/lang/cs.js Diff File
mod - third_party/ckeditor/lang/cy.js Diff File
mod - third_party/ckeditor/lang/da.js Diff File
mod - third_party/ckeditor/lang/de-ch.js Diff File
mod - third_party/ckeditor/lang/de.js Diff File
mod - third_party/ckeditor/lang/el.js Diff File
mod - third_party/ckeditor/lang/en-au.js Diff File
mod - third_party/ckeditor/lang/en-ca.js Diff File
mod - third_party/ckeditor/lang/en-gb.js Diff File
mod - third_party/ckeditor/lang/en.js Diff File
mod - third_party/ckeditor/lang/eo.js Diff File
mod - third_party/ckeditor/lang/es.js Diff File
mod - third_party/ckeditor/lang/et.js Diff File
mod - third_party/ckeditor/lang/eu.js Diff File
mod - third_party/ckeditor/lang/fa.js Diff File
mod - third_party/ckeditor/lang/fi.js Diff File
mod - third_party/ckeditor/lang/fo.js Diff File
mod - third_party/ckeditor/lang/fr-ca.js Diff File
mod - third_party/ckeditor/lang/fr.js Diff File
mod - third_party/ckeditor/lang/gl.js Diff File
mod - third_party/ckeditor/lang/gu.js Diff File