LimeSurvey: olle_tmp faba5efc

Author Committer Branch Timestamp Parent
ollehar1 ollehar1 olle_tmp 2016-05-05 18:16:26 olle_tmp 08c6cacf
Changeset

Merge branch 'master' into olle_tmp

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
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/common_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/UserGroup.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - application/views/survey/questions/arrays/10point/answer.php Diff File
mod - application/views/survey/questions/date/dropdown/answer.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/questions/gender/radio/answer.php Diff File
mod - application/views/survey/questions/list_dropdown/rows/othertext.php Diff File
mod - application/views/survey/questions/multiplechoice/rows/answer_row_other.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php Diff File
mod - application/views/survey/questions/shortfreetext/location_mapservice/item_100.php Diff File
mod - application/views/survey/questions/yesno/radio/item.php Diff File
add - styles/browse.css Diff File
mod - templates/default/views/endpage.pstpl Diff File
mod - templates/default/views/surveylist.pstpl Diff File
mod - templates/news_paper/views/endpage.pstpl Diff File
mod - templates/news_paper/views/surveylist.pstpl Diff File
mod - templates/ubuntu_orange/views/endpage.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File