LimeSurvey: master 0c103b16

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master 2016-03-20 16:49 master e9f79823
Changeset

Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/limeReplacementFields_view.php Diff File
mod - application/views/admin/responses/browseidheader_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/deleteSurvey_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
add - application/views/admin/survey/queXMLSurvey_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_accordion_container.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/update/_updateContainer.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable.php Diff File
mod - application/views/admin/update/updater/steps/_backup.php Diff File
mod - application/views/admin/update/updater/steps/_change_log.php Diff File
mod - application/views/admin/update/updater/steps/_check_local_errors.php Diff File
mod - application/views/admin/update/updater/steps/_fileSystem.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - application/views/admin/update/updater/welcome/_updater_update.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - application/views/survey/questions/5pointchoice/item_noanswer_row.php Diff File
mod - application/views/survey/questions/5pointchoice/item_row.php Diff File
mod - application/views/survey/questions/date/selector/selector.php Diff File
mod - application/views/survey/questions/file_upload/item.php Diff File
mod - application/views/survey/questions/gender/buttons/item.php Diff File
mod - application/views/survey/questions/list_with_comment/list/footer.php Diff File
mod - application/views/survey/questions/list_with_comment/list/header.php Diff File
mod - application/views/survey/questions/list_with_comment/list/item.php Diff File
mod - application/views/survey/questions/listradio/item_noanswer_row.php Diff File
mod - application/views/survey/questions/listradio/item_other_row.php Diff File
mod - application/views/survey/questions/listradio/item_row.php Diff File
mod - application/views/survey/questions/listradio/listradio_header.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/item.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_inputtext.php Diff File
mod - application/views/survey/questions/numerical/item.php Diff File
mod - application/views/survey/questions/shortfreetext/text/item.php Diff File
mod - application/views/survey/questions/yesno/buttons/item.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.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/et/et.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/admin/ckeditor-config.js Diff File
mod - scripts/admin/comfortupdate/comfortUpdateNextStep.js Diff File
mod - scripts/admin/comfortupdate/displayComfortStep.js Diff File
mod - scripts/admin/emailtemplates.js Diff File
mod - scripts/admin/limereplacementfields/dialogs/limereplacementfields.js Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/uploader.js Diff File
mod - styles-public/uploader.css Diff File
mod - styles/Apple_Blossom/config.xml Diff File
mod - styles/Apple_Blossom/css/adminstyle-rtl.css Diff File
add - styles/Apple_Blossom/css/attributeMap-rtl.css Diff File
add - styles/Apple_Blossom/css/attributeMap.css Diff File
add - styles/Apple_Blossom/css/attributeMapToken-rtl.css Diff File
add - styles/Apple_Blossom/css/attributeMapToken.css Diff File
add - styles/Apple_Blossom/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Apple_Blossom/css/displayParticipants-rtl.css Diff File
add - styles/Apple_Blossom/css/fonts-rtl.css Diff File
mod - styles/Apple_Blossom/css/fonts.css Diff File
add - styles/Apple_Blossom/css/jcarousel.responsive-rtl.css Diff File
add - styles/Apple_Blossom/css/jqgrid-rtl.css Diff File
add - styles/Apple_Blossom/css/jqgrid.css Diff File
add - styles/Apple_Blossom/css/jquery-ui-rtl.css Diff File
add - styles/Apple_Blossom/css/jquery-ui.css Diff File
add - styles/Apple_Blossom/css/lime-admin-common.css Diff File
add - styles/Apple_Blossom/css/lime-admin-misc-rtl.css Diff File
add - styles/Apple_Blossom/css/lime-admin-rtl.css Diff File
add - styles/Apple_Blossom/css/printablestyle-rtl.css Diff File
add - styles/Apple_Blossom/css/statistics-rtl.css Diff File
mod - styles/Apple_Blossom/css/statistics.css Diff File
mod - styles/Apple_Blossom/scripts/sidemenu.js Diff File
mod - styles/Bay_of_Many/config.xml Diff File
mod - styles/Bay_of_Many/css/adminstyle-rtl.css Diff File
add - styles/Bay_of_Many/css/attributeMap-rtl.css Diff File
add - styles/Bay_of_Many/css/attributeMap.css Diff File
add - styles/Bay_of_Many/css/attributeMapToken-rtl.css Diff File
add - styles/Bay_of_Many/css/attributeMapToken.css Diff File
add - styles/Bay_of_Many/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Bay_of_Many/css/displayParticipants-rtl.css Diff File
add - styles/Bay_of_Many/css/fonts-rtl.css Diff File
mod - styles/Bay_of_Many/css/fonts.css Diff File
add - styles/Bay_of_Many/css/jcarousel.responsive-rtl.css Diff File
add - styles/Bay_of_Many/css/jqgrid-rtl.css Diff File
add - styles/Bay_of_Many/css/jqgrid.css Diff File
add - styles/Bay_of_Many/css/jquery-ui-rtl.css Diff File
add - styles/Bay_of_Many/css/jquery-ui.css Diff File
add - styles/Bay_of_Many/css/lime-admin-common.css Diff File
add - styles/Bay_of_Many/css/lime-admin-misc-rtl.css Diff File
add - styles/Bay_of_Many/css/lime-admin-rtl.css Diff File
add - styles/Bay_of_Many/css/printablestyle-rtl.css Diff File
add - styles/Bay_of_Many/css/statistics-rtl.css Diff File
mod - styles/Bay_of_Many/css/statistics.css Diff File
mod - styles/Bay_of_Many/scripts/sidemenu.js Diff File
mod - styles/Black_Pearl/config.xml Diff File
mod - styles/Black_Pearl/css/adminstyle-rtl.css Diff File
add - styles/Black_Pearl/css/attributeMap-rtl.css Diff File
add - styles/Black_Pearl/css/attributeMap.css Diff File
add - styles/Black_Pearl/css/attributeMapToken-rtl.css Diff File
add - styles/Black_Pearl/css/attributeMapToken.css Diff File
add - styles/Black_Pearl/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Black_Pearl/css/displayParticipants-rtl.css Diff File
add - styles/Black_Pearl/css/fonts-rtl.css Diff File
mod - styles/Black_Pearl/css/fonts.css Diff File
add - styles/Black_Pearl/css/jcarousel.responsive-rtl.css Diff File
add - styles/Black_Pearl/css/jqgrid-rtl.css Diff File
add - styles/Black_Pearl/css/jqgrid.css Diff File
add - styles/Black_Pearl/css/jquery-ui-rtl.css Diff File
add - styles/Black_Pearl/css/jquery-ui.css Diff File
add - styles/Black_Pearl/css/lime-admin-colors.css Diff File
add - styles/Black_Pearl/css/lime-admin-common.css Diff File
add - styles/Black_Pearl/css/lime-admin-misc-rtl.css Diff File
add - styles/Black_Pearl/css/lime-admin-rtl.css Diff File
rm - styles/Black_Pearl/css/lime-admin.css Diff
rm - styles/Black_Pearl/css/lime-admin.css.map Diff
add - styles/Black_Pearl/css/printablestyle-rtl.css Diff File
add - styles/Black_Pearl/css/statistics-rtl.css Diff File
add - styles/Dark_Sky/css/attributeMap-rtl.css Diff File
add - styles/Dark_Sky/css/attributeMap.css Diff File
add - styles/Dark_Sky/css/attributeMapToken-rtl.css Diff File
add - styles/Dark_Sky/css/attributeMapToken.css Diff File
add - styles/Dark_Sky/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Dark_Sky/css/displayParticipants-rtl.css Diff File
add - styles/Dark_Sky/css/fonts-rtl.css Diff File
add - styles/Dark_Sky/css/jcarousel.responsive-rtl.css Diff File
add - styles/Dark_Sky/css/jqgrid-rtl.css Diff File
add - styles/Dark_Sky/css/jqgrid.css Diff File
add - styles/Dark_Sky/css/jquery-ui-rtl.css Diff File
add - styles/Dark_Sky/css/jquery-ui.css Diff File
add - styles/Dark_Sky/css/lime-admin-colors.css Diff File
add - styles/Dark_Sky/css/lime-admin-common.css Diff File
add - styles/Dark_Sky/css/lime-admin-misc-rtl.css Diff File
add - styles/Dark_Sky/css/lime-admin-rtl.css Diff File
rm - styles/Dark_Sky/css/lime-admin.css Diff
add - styles/Dark_Sky/css/printablestyle-rtl.css Diff File
add - styles/Dark_Sky/css/statistics-rtl.css Diff File
add - styles/Free_Magenta/css/attributeMap-rtl.css Diff File
add - styles/Free_Magenta/css/attributeMap.css Diff File
add - styles/Free_Magenta/css/attributeMapToken-rtl.css Diff File
add - styles/Free_Magenta/css/attributeMapToken.css Diff File
add - styles/Free_Magenta/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Free_Magenta/css/displayParticipants-rtl.css Diff File
add - styles/Free_Magenta/css/fonts-rtl.css Diff File
add - styles/Free_Magenta/css/jcarousel.responsive-rtl.css Diff File
add - styles/Free_Magenta/css/jqgrid-rtl.css Diff File
add - styles/Free_Magenta/css/jqgrid.css Diff File
add - styles/Free_Magenta/css/jquery-ui-rtl.css Diff File
add - styles/Free_Magenta/css/jquery-ui.css Diff File
add - styles/Free_Magenta/css/lime-admin-colors.css Diff File
add - styles/Free_Magenta/css/lime-admin-common.css Diff File
add - styles/Free_Magenta/css/lime-admin-misc-rtl.css Diff File
add - styles/Free_Magenta/css/lime-admin-rtl.css Diff File
rm - styles/Free_Magenta/css/lime-admin.css Diff
add - styles/Free_Magenta/css/printablestyle-rtl.css Diff File
add - styles/Free_Magenta/css/statistics-rtl.css Diff File
add - styles/Noto_All_Languages/css/lime-admin-colors.css Diff File
add - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
rm - styles/Noto_All_Languages/css/lime-admin-misc.css Diff
add - styles/Noto_All_Languages/css/lime-admin-noto.css Diff File
rm - styles/Noto_All_Languages/css/lime-admin.css Diff
add - styles/Purple_Tentacle/css/attributeMap-rtl.css Diff File
add - styles/Purple_Tentacle/css/attributeMap.css Diff File
add - styles/Purple_Tentacle/css/attributeMapToken-rtl.css Diff File
add - styles/Purple_Tentacle/css/attributeMapToken.css Diff File
add - styles/Purple_Tentacle/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Purple_Tentacle/css/displayParticipants-rtl.css Diff File
add - styles/Purple_Tentacle/css/fonts-rtl.css Diff File
add - styles/Purple_Tentacle/css/jcarousel.responsive-rtl.css Diff File
add - styles/Purple_Tentacle/css/jqgrid-rtl.css Diff File
add - styles/Purple_Tentacle/css/jqgrid.css Diff File
add - styles/Purple_Tentacle/css/jquery-ui-rtl.css Diff File
add - styles/Purple_Tentacle/css/jquery-ui.css Diff File
add - styles/Purple_Tentacle/css/lime-admin-colors.css Diff File
add - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
add - styles/Purple_Tentacle/css/lime-admin-misc-rtl.css Diff File
add - styles/Purple_Tentacle/css/lime-admin-rtl.css Diff File
rm - styles/Purple_Tentacle/css/lime-admin.css Diff
add - styles/Purple_Tentacle/css/printablestyle-rtl.css Diff File
add - styles/Purple_Tentacle/css/statistics-rtl.css Diff File
add - styles/Sea_Green/css/lime-admin-colors.css Diff File
add - styles/Sea_Green/css/lime-admin-common.css Diff File
rm - styles/Sea_Green/css/lime-admin-misc.css Diff
rm - styles/Sea_Green/css/lime-admin.css Diff
add - styles/Sunset_Orange/css/attributeMap-rtl.css Diff File
add - styles/Sunset_Orange/css/attributeMap.css Diff File
add - styles/Sunset_Orange/css/attributeMapToken-rtl.css Diff File
add - styles/Sunset_Orange/css/attributeMapToken.css Diff File
add - styles/Sunset_Orange/css/bootstrap-switch.min-rtl.css Diff File
add - styles/Sunset_Orange/css/displayParticipants-rtl.css Diff File
add - styles/Sunset_Orange/css/fonts-rtl.css Diff File
add - styles/Sunset_Orange/css/jcarousel.responsive-rtl.css Diff File
add - styles/Sunset_Orange/css/jqgrid-rtl.css Diff File
add - styles/Sunset_Orange/css/jqgrid.css Diff File
add - styles/Sunset_Orange/css/jquery-ui-rtl.css Diff File
add - styles/Sunset_Orange/css/jquery-ui.css Diff File
add - styles/Sunset_Orange/css/lime-admin-colors.css Diff File
add - styles/Sunset_Orange/css/lime-admin-common.css Diff File
add - styles/Sunset_Orange/css/lime-admin-misc-rtl.css Diff File
add - styles/Sunset_Orange/css/lime-admin-rtl.css Diff File
rm - styles/Sunset_Orange/css/lime-admin.css Diff
add - styles/Sunset_Orange/css/printablestyle-rtl.css Diff File
add - styles/Sunset_Orange/css/statistics-rtl.css Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/LICENSE Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/README.md Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/dialog.css Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/editor.css Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/icons.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/dialog_sides.gif Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/dialog_sides.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/dialog_sides_rtl.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/mini.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/noimage.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/sprites.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/sprites_ie6.png Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/images/toolbar_start.gif Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/skin.js Diff File
add - third_party/ckeditor/skins/BootstrapCK-Skin/templates.css Diff File