LimeSurvey: master d148129b

Diff Back to Repository
Author Committer Branch Timestamp Parent
mfavetti mfavetti master 2016-02-23 21:02 master 3c6105b0
Changeset

Fixing merge conflicts
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Template.php Diff File
mod - application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php Diff File
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_nograph.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/export/statistics_subviews/_response_filter_choice.php Diff File
mod - application/views/admin/export/statistics_user_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/participants/attributeMapToken_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_textarea.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.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/pt-BR/pt-BR.mo Diff File
mod - locale/th/th.mo Diff File
mod - scripts/admin/attributeMapToken.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - styles/Apple_Blossom/css/lime-admin.css Diff File
mod - styles/Bay_of_Many/css/lime-admin.css Diff File
mod - styles/Black_Pearl/css/lime-admin.css Diff File
mod - styles/Dark_Sky/css/lime-admin.css Diff File
mod - styles/Free_Magenta/css/lime-admin.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin.css Diff File
mod - styles/Sea_Green/css/attributeMapToken.css Diff File
mod - styles/Sea_Green/css/lime-admin.css Diff File
mod - styles/Sunset_Orange/css/lime-admin.css Diff File
rm - templates/default/chart.jpg Diff
mod - templates/default/config.xml Diff File
mod - templates/default/css/jquery-ui-custom.css Diff File
mod - templates/default/css/print_template.css Diff File
mod - templates/default/css/template.css Diff File
add - templates/default/files/logo.png Diff File
rm - templates/default/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png Diff
rm - templates/default/images/ui-bg_flat_15_cd0a0a_40x100.png Diff
rm - templates/default/images/ui-bg_glass_100_e4f1fb_1x400.png Diff
rm - templates/default/images/ui-bg_glass_50_3baae3_1x400.png Diff
rm - templates/default/images/ui-bg_glass_65_ffffff_1x400.png Diff
rm - templates/default/images/ui-bg_glass_75_dadada_1x400.png Diff
rm - templates/default/images/ui-bg_glass_75_e6e6e6_1x400.png Diff
rm - templates/default/images/ui-bg_glass_80_d7ebf9_1x400.png Diff
rm - templates/default/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png Diff
rm - templates/default/images/ui-bg_highlight-hard_70_000000_1x100.png Diff
rm - templates/default/images/ui-bg_highlight-soft_100_deedf7_1x100.png Diff
rm - templates/default/images/ui-bg_highlight-soft_25_ffef8f_1x100.png Diff
rm - templates/default/images/ui-icons_222222_256x240.png Diff
rm - templates/default/images/ui-icons_2694e8_256x240.png Diff
rm - templates/default/images/ui-icons_2e83ff_256x240.png Diff
rm - templates/default/images/ui-icons_3d80b3_256x240.png Diff
rm - templates/default/images/ui-icons_454545_256x240.png Diff
rm - templates/default/images/ui-icons_72a7cf_256x240.png Diff
rm - templates/default/images/ui-icons_888888_256x240.png Diff
rm - templates/default/images/ui-icons_ffffff_256x240.png Diff
rm - templates/default/print_img_textspike.gif Diff
mod - templates/default/scripts/template.js Diff File
rm - templates/default/slider-handle.gif Diff
mod - templates/default/views/surveylist.pstpl Diff File
rm - templates/news_paper/chart.jpg Diff
mod - templates/news_paper/config.xml Diff File
mod - templates/news_paper/css/jquery-ui-custom.css Diff File
mod - templates/news_paper/css/print_template.css Diff File
mod - templates/news_paper/css/template.css Diff File
add - templates/news_paper/files/logo.png Diff File
rm - templates/news_paper/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png Diff
rm - templates/news_paper/images/ui-bg_flat_15_cd0a0a_40x100.png Diff
rm - templates/news_paper/images/ui-bg_glass_100_e4f1fb_1x400.png Diff
rm - templates/news_paper/images/ui-bg_glass_50_3baae3_1x400.png Diff
rm - templates/news_paper/images/ui-bg_glass_65_ffffff_1x400.png Diff
rm - templates/news_paper/images/ui-bg_glass_75_dadada_1x400.png Diff
rm - templates/news_paper/images/ui-bg_glass_75_e6e6e6_1x400.png Diff
rm - templates/news_paper/images/ui-bg_glass_80_d7ebf9_1x400.png Diff
rm - templates/news_paper/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png Diff
rm - templates/news_paper/images/ui-bg_highlight-hard_70_000000_1x100.png Diff
rm - templates/news_paper/images/ui-bg_highlight-soft_100_deedf7_1x100.png Diff
rm - templates/news_paper/images/ui-bg_highlight-soft_25_ffef8f_1x100.png Diff
rm - templates/news_paper/images/ui-icons_222222_256x240.png Diff
rm - templates/news_paper/images/ui-icons_2694e8_256x240.png Diff
rm - templates/news_paper/images/ui-icons_2e83ff_256x240.png Diff
rm - templates/news_paper/images/ui-icons_3d80b3_256x240.png Diff
rm - templates/news_paper/images/ui-icons_454545_256x240.png Diff
rm - templates/news_paper/images/ui-icons_72a7cf_256x240.png Diff
rm - templates/news_paper/images/ui-icons_888888_256x240.png Diff
rm - templates/news_paper/images/ui-icons_ffffff_256x240.png Diff
rm - templates/news_paper/print_img_textspike.gif Diff
mod - templates/news_paper/scripts/template.js Diff File
rm - templates/news_paper/slider-handle.gif Diff
mod - templates/news_paper/views/groupdescription.pstpl Diff File
mod - templates/news_paper/views/surveylist.pstpl Diff File
rm - templates/ubuntu_orange/chart.jpg Diff
mod - templates/ubuntu_orange/config.xml Diff File
mod - templates/ubuntu_orange/css/jquery-ui-custom.css Diff File
mod - templates/ubuntu_orange/css/print_template.css Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
add - templates/ubuntu_orange/files/logo.png Diff File
rm - templates/ubuntu_orange/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png Diff
rm - templates/ubuntu_orange/images/ui-bg_flat_15_cd0a0a_40x100.png Diff
rm - templates/ubuntu_orange/images/ui-bg_glass_100_e4f1fb_1x400.png Diff
rm - templates/ubuntu_orange/images/ui-bg_glass_50_3baae3_1x400.png Diff
rm - templates/ubuntu_orange/images/ui-bg_glass_65_ffffff_1x400.png Diff
rm - templates/ubuntu_orange/images/ui-bg_glass_75_dadada_1x400.png Diff
rm - templates/ubuntu_orange/images/ui-bg_glass_75_e6e6e6_1x400.png Diff
rm - templates/ubuntu_orange/images/ui-bg_glass_80_d7ebf9_1x400.png Diff
rm - templates/ubuntu_orange/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png Diff
rm - templates/ubuntu_orange/images/ui-bg_highlight-hard_70_000000_1x100.png Diff
rm - templates/ubuntu_orange/images/ui-bg_highlight-soft_100_deedf7_1x100.png Diff
rm - templates/ubuntu_orange/images/ui-bg_highlight-soft_25_ffef8f_1x100.png Diff
rm - templates/ubuntu_orange/images/ui-icons_222222_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_2694e8_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_2e83ff_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_3d80b3_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_454545_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_72a7cf_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_888888_256x240.png Diff
rm - templates/ubuntu_orange/images/ui-icons_ffffff_256x240.png Diff
rm - templates/ubuntu_orange/print_img_textspike.gif Diff
mod - templates/ubuntu_orange/scripts/template.js Diff File
rm - templates/ubuntu_orange/slider-handle.gif Diff
mod - templates/ubuntu_orange/views/groupdescription.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File
mod - third_party/jquery-price-format/jquery_price_format.js Diff File