LimeSurvey: develop 72993976

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-01-23 15:14:51 develop 841d6505
Changeset

Merge branch 'tmp' into develop

Conflicts:
application/config/version.php
application/controllers/admin/update.php
application/core/LSYii_Application.php
application/helpers/update/updatedb_helper.php
third_party/devbridge-autocomplete/dist/license.txt
third_party/devbridge-autocomplete/scripts/jquery-2.1.1.js
third_party/jquery-ui/AUTHORS.txt
third_party/jquery-ui/jquery-ui.css
third_party/jquery-ui/jquery-ui.theme.css
third_party/jquery-ui/package.json
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/views/admin/authentication/ajaxLogin.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/authentication/message.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_dataselection.php Diff File
mod - application/views/admin/export/statistics_subviews/_outputformat.php Diff File
mod - application/views/admin/export/statistics_subviews/_outputoptions.php Diff File
mod - application/views/admin/export/statistics_subviews/_responseid.php Diff File
mod - application/views/admin/export/statistics_subviews/_submissiondate.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/group_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - application/views/admin/usergroup/usergroups_view.php Diff File
mod - docs/release_notes.txt 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/et/et.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - scripts/admin/tokens.js Diff File