LimeSurvey: develop 3a11346f

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2017-02-07 11:35 develop 1a7fab79
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: hope i didn't break update

Conflicts:

application/config/version.php

application/helpers/update/updatedb_helper.php

docs/release_notes.txt

templates/default/views/load.pstpl
mod - application/config/version.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/views/admin/export/generatestats/_header.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
mod - templates/default/css/template.css Diff File