LimeSurvey: 2.5 bf9afa3b

Author Committer Branch Timestamp Parent
ollehar ollehar 2.5 2016-01-28 13:43:51 2.5 55aa9479
Changeset

Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

mod - application/config/third_party.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/5pointchoice/5pointchoice_footer.php Diff File
add - application/views/survey/questions/arrays/header.php Diff File
mod - application/views/survey/questions/date/dropdown/date_footer.php Diff File
mod - application/views/survey/questions/date/dropdown/day.php Diff File
mod - application/views/survey/questions/date/dropdown/hour.php Diff File
mod - application/views/survey/questions/date/dropdown/minute.php Diff File
mod - application/views/survey/questions/date/dropdown/month.php Diff File
mod - application/views/survey/questions/date/selector/selector.php Diff File
mod - application/views/survey/questions/list_dropdown/optgroup_footer.php Diff File
mod - application/views/survey/questions/list_dropdown/optgroup_header.php Diff File
mod - application/views/survey/questions/list_dropdown/select_footer.php Diff File
mod - application/views/survey/questions/listradio/item_other_row.php Diff File
mod - application/views/survey/questions/longfreetext/item.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/header.php Diff File
mod - application/views/survey/questions/multiplenumeric/footer.php Diff File
mod - application/views/survey/questions/multiplenumeric/item.php Diff File
mod - application/views/survey/questions/multipleshorttext/footer.php Diff File
mod - application/views/survey/questions/multipleshorttext/header.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_inputtext.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_textarea.php Diff File
mod - application/views/survey/questions/numerical/item.php Diff File
mod - application/views/survey/questions/ranking/item.php Diff File
mod - application/views/survey/questions/ranking/second_list.php Diff File
mod - application/views/survey/questions/shortfreetext/text/item.php Diff File
add - application/views/survey/system/questionhelp/questionhelp.php Diff File
add - application/views/survey/system/questionhelp/tips.php Diff File
add - scripts/bootstrap-slider.js Diff File
mod - scripts/date.js Diff File
mod - scripts/numeric-slider.js Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/numeric-slider.css Diff File
mod - templates/default/views/question.pstpl Diff File