LimeSurvey: 2.5 bf2d6fce

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar 2.5 2016-01-29 13:05:17 2.5 a4f44884
Changeset

Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/htmleditor_pop.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/db/DbConnection.php Diff File
add - application/core/web/DbHttpSession.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.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/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Permission.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
add - application/views/survey/questions/gender/buttons/item.php Diff File
mod - application/views/survey/questions/yesno/buttons/item.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
add - framework/LICENSE Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/bg.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/sq/sq.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - scripts/admin/subquestions.js Diff File
add - templates/blue_sky/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/blue_sky/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/blue_sky/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/blue_sky/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/blue_sky/fonts/glyphicons-halflings-regular.woff2 Diff File
mod - templates/default/css/print_template.css Diff File
mod - templates/default/css/template.css Diff File
add - templates/default/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/default/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/default/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/default/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/default/fonts/glyphicons-halflings-regular.woff2 Diff File
mod - templates/default/scripts/template.js Diff File
mod - templates/default/views/groupdescription.pstpl Diff File
mod - templates/default/views/startgroup.pstpl Diff File
add - templates/electric_black/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/electric_black/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/electric_black/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/electric_black/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/electric_black/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/gunmetal/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/gunmetal/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/gunmetal/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/gunmetal/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/gunmetal/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/light_and_shadow/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/light_and_shadow/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/light_and_shadow/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/light_and_shadow/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/light_and_shadow/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/material_design/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/material_design/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/material_design/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/material_design/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/material_design/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/metro_ode/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/metro_ode/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/metro_ode/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/metro_ode/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/metro_ode/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/minimalist/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/minimalist/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/minimalist/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/minimalist/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/minimalist/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/news_paper/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/news_paper/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/news_paper/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/news_paper/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/news_paper/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/night_mode/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/night_mode/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/night_mode/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/night_mode/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/night_mode/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/readable/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/readable/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/readable/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/readable/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/readable/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/sandstone/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/sandstone/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/sandstone/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/sandstone/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/sandstone/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/super_blue/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/super_blue/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/super_blue/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/super_blue/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/super_blue/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.woff2 Diff File
add - templates/yeti/fonts/glyphicons-halflings-regular.eot Diff File
add - templates/yeti/fonts/glyphicons-halflings-regular.svg Diff File
add - templates/yeti/fonts/glyphicons-halflings-regular.ttf Diff File
add - templates/yeti/fonts/glyphicons-halflings-regular.woff Diff File
add - templates/yeti/fonts/glyphicons-halflings-regular.woff2 Diff File