LimeSurvey: master df56734f

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master 2016-03-22 15:41:17 master e0044440
Changeset

Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/labels/labelsets_view.php Diff File
mod - application/views/admin/quotas/newanswererror_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/viewquotasfooter_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/responses/browseallfiltered_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_tabs.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/templates/importform_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
add - application/views/survey/questions/arrays/5point/close_row Diff File
add - application/views/survey/questions/arrays/5point/close_row.php Diff File
add - application/views/survey/questions/arrays/5point/close_table.php Diff File
add - application/views/survey/questions/arrays/5point/close_table_head.php Diff File
add - application/views/survey/questions/arrays/5point/col.php Diff File
add - application/views/survey/questions/arrays/5point/header.php Diff File
add - application/views/survey/questions/arrays/5point/open_table_head.php Diff File
add - application/views/survey/questions/arrays/5point/table_headers Diff File
add - application/views/survey/questions/arrays/5point/table_headers.php Diff File
add - application/views/survey/questions/arrays/5point/td_answertext.php Diff File
add - application/views/survey/questions/arrays/5point/td_input.php Diff File
add - application/views/survey/questions/arrays/5point/tr_open.php Diff File
rm - application/views/survey/questions/arrays/header.php Diff File
add - application/views/survey/questions/list_dropdown/othertext.php Diff File
mod - application/views/survey/questions/listradio/item_row.php Diff File
mod - application/views/survey/questions/multiplechoice/item_other_row.php Diff File
mod - application/views/survey/questions/multiplechoice/item_row.php Diff File
mod - application/views/survey/questions/multiplenumeric/item.php Diff File
add - application/views/survey/questions/ranking/script.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.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/ru/ru.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/numeric-slider.js Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
add - styles/htmleditor.css Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/scripts/template.js Diff File