LimeSurvey: master 4ac660a5

Author Committer Branch Timestamp Parent
ollehar1 ollehar1 master 2016-04-27 22:07:15 master 486eb54e
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

mod - application/config/config-defaults.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/updater_version.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/extensions/questionTypes/listRadio/listRadio.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_submissiondate.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_resources_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/update/_updateContainer.php Diff File
mod - application/views/admin/update/_update_notification.php Diff File
rm - application/views/admin/update/check_updates/_checkButtons.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php Diff File
mod - application/views/admin/update/updater/_progress.php Diff File
mod - application/views/admin/update/updater/_updater.php Diff File
mod - application/views/admin/update/updater/steps/_backup.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/steps/_final.php Diff File
mod - application/views/admin/update/updater/steps/_old_step4b.php Diff File
mod - application/views/admin/update/updater/steps/_updater_updated.php Diff File
mod - application/views/admin/update/updater/steps/textaeras/_readonlyfiles.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/date/selector/answer.php 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/id/id.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
rm - styles-public/font-awesome-43-debugmode.min.css Diff File
rm - styles-public/font-awesome-43.min.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-colors.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-colors.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.css Diff File
mod - styles/Black_Pearl/css/lime-admin-colors.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common.css Diff File
mod - styles/Dark_Sky/css/lime-admin-colors.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.css Diff File
mod - styles/Free_Magenta/css/lime-admin-colors.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-colors.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-colors.css Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-colors.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
mod - templates/default/css/flat_and_modern.css Diff File
rm - templates/default/fonts/fontawesome-webfont.woff2 Diff File
rm - templates/ubuntu_orange/css/font-awesome.css Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery-ui-i18n.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-af.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ar-DZ.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ar.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-az.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-be.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-bg.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-bs.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ca.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-cs.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-cy-GB.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-da.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-de.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-el.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-en-AU.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-en-GB.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-en-NZ.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-eo.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-es.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-et.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-eu.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-fa.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-fi.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-fo.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-fr-CA.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-fr-CH.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-fr.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-gl.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-he.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-hi.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-hr.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-hu.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-hy.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-id.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-is.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-it.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ja.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ka.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-kk.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-km.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ko.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ky.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-lb.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-lt.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-lv.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-mk.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ml.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ms.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-nb.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-nl-BE.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-nl.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-nn.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-no.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-pl.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-pt-BR.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-pt.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-rm.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ro.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ru.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-sk.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-sl.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-sq.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-sr-SR.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-sr.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-sv.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-ta.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-th.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-tj.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-tr.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-uk.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-vi.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-CN.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-HK.js Diff File
rm - third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-TW.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery-ui-i18n.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-af.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ar-DZ.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ar.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-az.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-be.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-bg.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-bs.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ca.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-cs.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-cy-GB.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-da.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-de.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-el.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-en-AU.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-en-GB.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-en-NZ.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-eo.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-es.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-et.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-eu.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-fa.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-fi.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-fo.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-fr-CA.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-fr-CH.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-fr.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-gl.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-he.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-hi.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-hr.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-hu.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-hy.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-id.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-is.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-it.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ja.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ka.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-kk.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-km.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ko.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ky.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-lb.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-lt.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-lv.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-mk.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ml.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ms.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-nb.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-nl-BE.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-nl.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-nn.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-no.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-pl.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-pt-BR.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-pt.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-rm.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ro.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ru.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-sk.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-sl.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-sq.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-sr-SR.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-sr.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-sv.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-ta.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-th.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-tj.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-tr.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-uk.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-vi.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-zh-CN.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-zh-HK.min.js Diff File
rm - third_party/jqueryui/development-bundle/ui/minified/i18n/jquery.ui.datepicker-zh-TW.min.js Diff File
rm - tmp/comfort_updater_cookie.txt Diff File