LimeSurvey: global_participants 58893986

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar global_participants 2016-09-20 12:27 global_participants 00d8e8ea
Changeset

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

Conflicts:
application/models/TokenDynamic.php
locale/_template/limesurvey.pot
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
add - application/core/LSDbCriteria.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.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/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/token/browse.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/system/LanguageChanger/LanguageChanger.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/he/he.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - styles-public/browse.css Diff File
mod - templates/default/css/template.css Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
mod - third_party/kcfinder/core/bootstrap.php Diff File