LimeSurvey: master 0d1e5ecc

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar master 2016-04-06 15:36 master cf4cde09
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - .gitignore Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
add - application/views/survey/questions/ranking/answer.php Diff File
rm - application/views/survey/questions/ranking/header.php Diff
rm - application/views/survey/questions/ranking/item_list_footer.php Diff
rm - application/views/survey/questions/ranking/item_list_header.php Diff
rm - application/views/survey/questions/ranking/script.php Diff
rm - application/views/survey/questions/ranking/second_list.php Diff
mod - docs/release_notes.txt Diff File
rm - templates/default/fonts/FontAwesome.otf Diff
rm - templates/default/fonts/Roboto-100/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-100/Roboto-100.eot Diff
rm - templates/default/fonts/Roboto-100/Roboto-100.svg Diff
rm - templates/default/fonts/Roboto-100/Roboto-100.ttf Diff
rm - templates/default/fonts/Roboto-100/Roboto-100.woff Diff
rm - templates/default/fonts/Roboto-100/Roboto-100.woff2 Diff
rm - templates/default/fonts/Roboto-100italic/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-100italic/Roboto-100italic.eot Diff
rm - templates/default/fonts/Roboto-100italic/Roboto-100italic.svg Diff
rm - templates/default/fonts/Roboto-100italic/Roboto-100italic.ttf Diff
rm - templates/default/fonts/Roboto-100italic/Roboto-100italic.woff Diff
rm - templates/default/fonts/Roboto-100italic/Roboto-100italic.woff2 Diff
rm - templates/default/fonts/Roboto-300/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-300/Roboto-300.eot Diff
rm - templates/default/fonts/Roboto-300/Roboto-300.svg Diff
rm - templates/default/fonts/Roboto-300/Roboto-300.ttf Diff
rm - templates/default/fonts/Roboto-300/Roboto-300.woff Diff
rm - templates/default/fonts/Roboto-300/Roboto-300.woff2 Diff
rm - templates/default/fonts/Roboto-300italic/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-300italic/Roboto-300italic.eot Diff
rm - templates/default/fonts/Roboto-300italic/Roboto-300italic.svg Diff
rm - templates/default/fonts/Roboto-300italic/Roboto-300italic.ttf Diff
rm - templates/default/fonts/Roboto-300italic/Roboto-300italic.woff Diff
rm - templates/default/fonts/Roboto-300italic/Roboto-300italic.woff2 Diff
rm - templates/default/fonts/Roboto-500/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-500/Roboto-500.eot Diff
rm - templates/default/fonts/Roboto-500/Roboto-500.svg Diff
rm - templates/default/fonts/Roboto-500/Roboto-500.ttf Diff
rm - templates/default/fonts/Roboto-500/Roboto-500.woff Diff
rm - templates/default/fonts/Roboto-500/Roboto-500.woff2 Diff
rm - templates/default/fonts/Roboto-500italic/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-500italic/Roboto-500italic.eot Diff
rm - templates/default/fonts/Roboto-500italic/Roboto-500italic.svg Diff
rm - templates/default/fonts/Roboto-500italic/Roboto-500italic.ttf Diff
rm - templates/default/fonts/Roboto-500italic/Roboto-500italic.woff Diff
rm - templates/default/fonts/Roboto-500italic/Roboto-500italic.woff2 Diff
rm - templates/default/fonts/Roboto-700/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-700/Roboto-700.eot Diff
rm - templates/default/fonts/Roboto-700/Roboto-700.svg Diff
rm - templates/default/fonts/Roboto-700/Roboto-700.ttf Diff
rm - templates/default/fonts/Roboto-700/Roboto-700.woff Diff
rm - templates/default/fonts/Roboto-700/Roboto-700.woff2 Diff
rm - templates/default/fonts/Roboto-700italic/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-700italic/Roboto-700italic.eot Diff
rm - templates/default/fonts/Roboto-700italic/Roboto-700italic.svg Diff
rm - templates/default/fonts/Roboto-700italic/Roboto-700italic.ttf Diff
rm - templates/default/fonts/Roboto-700italic/Roboto-700italic.woff Diff
rm - templates/default/fonts/Roboto-700italic/Roboto-700italic.woff2 Diff
rm - templates/default/fonts/Roboto-900/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-900/Roboto-900.eot Diff
rm - templates/default/fonts/Roboto-900/Roboto-900.svg Diff
rm - templates/default/fonts/Roboto-900/Roboto-900.ttf Diff
rm - templates/default/fonts/Roboto-900/Roboto-900.woff Diff
rm - templates/default/fonts/Roboto-900/Roboto-900.woff2 Diff
rm - templates/default/fonts/Roboto-900italic/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-900italic/Roboto-900italic.eot Diff
rm - templates/default/fonts/Roboto-900italic/Roboto-900italic.svg Diff
rm - templates/default/fonts/Roboto-900italic/Roboto-900italic.ttf Diff
rm - templates/default/fonts/Roboto-900italic/Roboto-900italic.woff Diff
rm - templates/default/fonts/Roboto-900italic/Roboto-900italic.woff2 Diff
rm - templates/default/fonts/Roboto-italic/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-italic/Roboto-italic.eot Diff
rm - templates/default/fonts/Roboto-italic/Roboto-italic.svg Diff
rm - templates/default/fonts/Roboto-italic/Roboto-italic.ttf Diff
rm - templates/default/fonts/Roboto-italic/Roboto-italic.woff Diff
rm - templates/default/fonts/Roboto-italic/Roboto-italic.woff2 Diff
rm - templates/default/fonts/Roboto-regular/LICENSE.txt Diff
rm - templates/default/fonts/Roboto-regular/Roboto-regular.eot Diff
rm - templates/default/fonts/Roboto-regular/Roboto-regular.svg Diff
rm - templates/default/fonts/Roboto-regular/Roboto-regular.ttf Diff
rm - templates/default/fonts/Roboto-regular/Roboto-regular.woff Diff
rm - templates/default/fonts/Roboto-regular/Roboto-regular.woff2 Diff
rm - templates/default/fonts/fontawesome-webfont.eot Diff
rm - templates/default/fonts/fontawesome-webfont.svg Diff
rm - templates/default/fonts/fontawesome-webfont.ttf Diff
rm - templates/default/fonts/fontawesome-webfont.woff Diff
rm - templates/default/fonts/fontawesome-webfont.woff2 Diff
rm - templates/default/fonts/icomoon.eot Diff
rm - templates/default/fonts/icomoon.svg Diff
rm - templates/default/fonts/icomoon.ttf Diff
rm - templates/default/fonts/icomoon.woff Diff
rm - templates/news_paper/fonts/FontAwesome.otf Diff
rm - templates/news_paper/fonts/Roboto-100/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-100/Roboto-100.eot Diff
rm - templates/news_paper/fonts/Roboto-100/Roboto-100.svg Diff
rm - templates/news_paper/fonts/Roboto-100/Roboto-100.ttf Diff
rm - templates/news_paper/fonts/Roboto-100/Roboto-100.woff Diff
rm - templates/news_paper/fonts/Roboto-100/Roboto-100.woff2 Diff
rm - templates/news_paper/fonts/Roboto-100italic/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-100italic/Roboto-100italic.eot Diff
rm - templates/news_paper/fonts/Roboto-100italic/Roboto-100italic.svg Diff
rm - templates/news_paper/fonts/Roboto-100italic/Roboto-100italic.ttf Diff
rm - templates/news_paper/fonts/Roboto-100italic/Roboto-100italic.woff Diff
rm - templates/news_paper/fonts/Roboto-100italic/Roboto-100italic.woff2 Diff
rm - templates/news_paper/fonts/Roboto-300/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-300/Roboto-300.eot Diff
rm - templates/news_paper/fonts/Roboto-300/Roboto-300.svg Diff
rm - templates/news_paper/fonts/Roboto-300/Roboto-300.ttf Diff
rm - templates/news_paper/fonts/Roboto-300/Roboto-300.woff Diff
rm - templates/news_paper/fonts/Roboto-300/Roboto-300.woff2 Diff
rm - templates/news_paper/fonts/Roboto-300italic/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-300italic/Roboto-300italic.eot Diff
rm - templates/news_paper/fonts/Roboto-300italic/Roboto-300italic.svg Diff
rm - templates/news_paper/fonts/Roboto-300italic/Roboto-300italic.ttf Diff
rm - templates/news_paper/fonts/Roboto-300italic/Roboto-300italic.woff Diff
rm - templates/news_paper/fonts/Roboto-300italic/Roboto-300italic.woff2 Diff
rm - templates/news_paper/fonts/Roboto-500/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-500/Roboto-500.eot Diff
rm - templates/news_paper/fonts/Roboto-500/Roboto-500.svg Diff
rm - templates/news_paper/fonts/Roboto-500/Roboto-500.ttf Diff
rm - templates/news_paper/fonts/Roboto-500/Roboto-500.woff Diff
rm - templates/news_paper/fonts/Roboto-500/Roboto-500.woff2 Diff
rm - templates/news_paper/fonts/Roboto-500italic/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-500italic/Roboto-500italic.eot Diff
rm - templates/news_paper/fonts/Roboto-500italic/Roboto-500italic.svg Diff
rm - templates/news_paper/fonts/Roboto-500italic/Roboto-500italic.ttf Diff
rm - templates/news_paper/fonts/Roboto-500italic/Roboto-500italic.woff Diff
rm - templates/news_paper/fonts/Roboto-500italic/Roboto-500italic.woff2 Diff
rm - templates/news_paper/fonts/Roboto-700/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-700/Roboto-700.eot Diff
rm - templates/news_paper/fonts/Roboto-700/Roboto-700.svg Diff
rm - templates/news_paper/fonts/Roboto-700/Roboto-700.ttf Diff
rm - templates/news_paper/fonts/Roboto-700/Roboto-700.woff Diff
rm - templates/news_paper/fonts/Roboto-700/Roboto-700.woff2 Diff
rm - templates/news_paper/fonts/Roboto-700italic/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-700italic/Roboto-700italic.eot Diff
rm - templates/news_paper/fonts/Roboto-700italic/Roboto-700italic.svg Diff
rm - templates/news_paper/fonts/Roboto-700italic/Roboto-700italic.ttf Diff
rm - templates/news_paper/fonts/Roboto-700italic/Roboto-700italic.woff Diff
rm - templates/news_paper/fonts/Roboto-700italic/Roboto-700italic.woff2 Diff
rm - templates/news_paper/fonts/Roboto-900/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-900/Roboto-900.eot Diff
rm - templates/news_paper/fonts/Roboto-900/Roboto-900.svg Diff
rm - templates/news_paper/fonts/Roboto-900/Roboto-900.ttf Diff
rm - templates/news_paper/fonts/Roboto-900/Roboto-900.woff Diff
rm - templates/news_paper/fonts/Roboto-900/Roboto-900.woff2 Diff
rm - templates/news_paper/fonts/Roboto-900italic/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-900italic/Roboto-900italic.eot Diff
rm - templates/news_paper/fonts/Roboto-900italic/Roboto-900italic.svg Diff
rm - templates/news_paper/fonts/Roboto-900italic/Roboto-900italic.ttf Diff
rm - templates/news_paper/fonts/Roboto-900italic/Roboto-900italic.woff Diff
rm - templates/news_paper/fonts/Roboto-900italic/Roboto-900italic.woff2 Diff
rm - templates/news_paper/fonts/Roboto-italic/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-italic/Roboto-italic.eot Diff
rm - templates/news_paper/fonts/Roboto-italic/Roboto-italic.svg Diff
rm - templates/news_paper/fonts/Roboto-italic/Roboto-italic.ttf Diff
rm - templates/news_paper/fonts/Roboto-italic/Roboto-italic.woff Diff
rm - templates/news_paper/fonts/Roboto-italic/Roboto-italic.woff2 Diff
rm - templates/news_paper/fonts/Roboto-regular/LICENSE.txt Diff
rm - templates/news_paper/fonts/Roboto-regular/Roboto-regular.eot Diff
rm - templates/news_paper/fonts/Roboto-regular/Roboto-regular.svg Diff
rm - templates/news_paper/fonts/Roboto-regular/Roboto-regular.ttf Diff
rm - templates/news_paper/fonts/Roboto-regular/Roboto-regular.woff Diff
rm - templates/news_paper/fonts/Roboto-regular/Roboto-regular.woff2 Diff
rm - templates/news_paper/fonts/fontawesome-webfont.eot Diff
rm - templates/news_paper/fonts/fontawesome-webfont.svg Diff
rm - templates/news_paper/fonts/fontawesome-webfont.ttf Diff
rm - templates/news_paper/fonts/fontawesome-webfont.woff Diff
rm - templates/news_paper/fonts/fontawesome-webfont.woff2 Diff
rm - templates/news_paper/fonts/icomoon.eot Diff
rm - templates/news_paper/fonts/icomoon.svg Diff
rm - templates/news_paper/fonts/icomoon.ttf Diff
rm - templates/news_paper/fonts/icomoon.woff Diff
rm - templates/ubuntu_orange/fonts/FontAwesome.otf Diff
rm - templates/ubuntu_orange/fonts/Roboto-100/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-100/Roboto-100.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-100/Roboto-100.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-100/Roboto-100.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-100/Roboto-100.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-100/Roboto-100.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-100italic/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-100italic/Roboto-100italic.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-100italic/Roboto-100italic.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-100italic/Roboto-100italic.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-100italic/Roboto-100italic.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-100italic/Roboto-100italic.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-300/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-300/Roboto-300.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-300/Roboto-300.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-300/Roboto-300.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-300/Roboto-300.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-300/Roboto-300.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-300italic/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-300italic/Roboto-300italic.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-300italic/Roboto-300italic.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-300italic/Roboto-300italic.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-300italic/Roboto-300italic.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-300italic/Roboto-300italic.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-500/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-500/Roboto-500.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-500/Roboto-500.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-500/Roboto-500.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-500/Roboto-500.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-500/Roboto-500.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-500italic/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-500italic/Roboto-500italic.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-500italic/Roboto-500italic.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-500italic/Roboto-500italic.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-500italic/Roboto-500italic.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-500italic/Roboto-500italic.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-700/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-700/Roboto-700.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-700/Roboto-700.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-700/Roboto-700.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-700/Roboto-700.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-700/Roboto-700.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-700italic/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-700italic/Roboto-700italic.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-700italic/Roboto-700italic.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-700italic/Roboto-700italic.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-700italic/Roboto-700italic.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-700italic/Roboto-700italic.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-900/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-900/Roboto-900.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-900/Roboto-900.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-900/Roboto-900.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-900/Roboto-900.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-900/Roboto-900.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-900italic/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-900italic/Roboto-900italic.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-900italic/Roboto-900italic.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-900italic/Roboto-900italic.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-900italic/Roboto-900italic.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-900italic/Roboto-900italic.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-italic/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-italic/Roboto-italic.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-italic/Roboto-italic.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-italic/Roboto-italic.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-italic/Roboto-italic.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-italic/Roboto-italic.woff2 Diff
rm - templates/ubuntu_orange/fonts/Roboto-regular/LICENSE.txt Diff
rm - templates/ubuntu_orange/fonts/Roboto-regular/Roboto-regular.eot Diff
rm - templates/ubuntu_orange/fonts/Roboto-regular/Roboto-regular.svg Diff
rm - templates/ubuntu_orange/fonts/Roboto-regular/Roboto-regular.ttf Diff
rm - templates/ubuntu_orange/fonts/Roboto-regular/Roboto-regular.woff Diff
rm - templates/ubuntu_orange/fonts/Roboto-regular/Roboto-regular.woff2 Diff
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.eot Diff
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.svg Diff
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.ttf Diff
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff Diff
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff2 Diff
rm - templates/ubuntu_orange/fonts/icomoon.eot Diff
rm - templates/ubuntu_orange/fonts/icomoon.svg Diff
rm - templates/ubuntu_orange/fonts/icomoon.ttf Diff
rm - templates/ubuntu_orange/fonts/icomoon.woff Diff