LimeSurvey: master ab54c15e

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar master 2016-04-25 08:57:25 master c773ec68
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

Conflicts:
application/views/survey/questions/date/selector/answer.php
mod - application/config/third_party.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/layouts/installer.php Diff File
mod - application/views/survey/questions/arrays/dualscale/answer.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/system/questionhelp/mandatory_tip.php Diff File
mod - application/views/survey/system/questionhelp/questionhelp.php Diff File
mod - application/views/survey/system/questionhelp/tips.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
rm - installer/css/font-awesome.css Diff File
rm - installer/fonts/DejaVuSans - CREDITS Diff File
rm - installer/fonts/DejaVuSans.ttf Diff File
rm - installer/fonts/FontAwesome.otf Diff File
rm - installer/fonts/FreeSans - CREDITS Diff File
rm - installer/fonts/FreeSans.ttf Diff File
rm - installer/fonts/TlwgTypist - Thai.ttf.txt Diff File
rm - installer/fonts/UnBatang - Korean.ttf.txt Diff File
rm - installer/fonts/fireflysung - Chinese.ttf.txt Diff File
rm - installer/fonts/fontawesome-webfont.eot Diff File
rm - installer/fonts/fontawesome-webfont.svg Diff File
rm - installer/fonts/fontawesome-webfont.ttf Diff File
rm - installer/fonts/fontawesome-webfont.woff Diff File
rm - installer/fonts/fontawesome-webfont.woff2 Diff File
rm - installer/fonts/glyphicons-halflings-regular.svg Diff File
rm - installer/fonts/glyphicons-halflings-regular.ttf Diff File
rm - installer/fonts/glyphicons-halflings-regular.woff Diff File
rm - installer/fonts/glyphicons-halflings-regular.woff2 Diff File
rm - installer/fonts/migmix-1p-regular - Japanese.ttf.txt Diff File
mod - templates/default/config.xml Diff File
rm - templates/default/fonts/FontAwesome.otf Diff File
rm - templates/default/fonts/fontawesome-webfont.eot Diff File
rm - templates/default/fonts/fontawesome-webfont.svg Diff File
rm - templates/default/fonts/fontawesome-webfont.ttf Diff File
rm - templates/default/fonts/fontawesome-webfont.woff Diff File
mod - templates/news_paper/config.xml Diff File
rm - templates/news_paper/css/font-awesome.css Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.eot Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.ttf Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.woff Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.woff2 Diff File
mod - templates/ubuntu_orange/config.xml Diff File
rm - templates/ubuntu_orange/fonts/FontAwesome.otf Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.eot Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.svg Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff2 Diff File
rm - third_party/font-awesome/css/font-awesome.css Diff File
rm - third_party/font-awesome/css/font-awesome.min.css Diff File
rm - third_party/font-awesome/fonts/FontAwesome.otf Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.eot Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.svg Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.ttf Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.woff Diff File
rm - third_party/font-awesome/less/mixins.less Diff File
rm - third_party/font-awesome/scss/_mixins.scss Diff File
add - third_party/fontawesome/.gitignore Diff File
add - third_party/fontawesome/.npmignore Diff File
add - third_party/fontawesome/HELP-US-OUT.txt Diff File
add - third_party/fontawesome/bower.json Diff File
add - third_party/fontawesome/css/font-awesome.css.map Diff File
add - third_party/fontawesome/css/font-awesome.min.css Diff File
add - third_party/fontawesome/fonts/4.4.0/index.html Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.eot Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.woff Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.woff2 Diff File
add - third_party/fontawesome/less/mixins.less Diff File
add - third_party/fontawesome/less/screen-reader.less Diff File
add - third_party/fontawesome/scss/_mixins.scss Diff File
add - third_party/fontawesome/scss/_screen-reader.scss Diff File