Changesets: LimeSurvey

Search Browse Back to Index

master 14f8ee2d

2016-04-27 12:04

ollehar


Details Diff		 Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - application/controllers/admin/dataentry.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/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File

master e8b3b0a8

2016-04-27 12:04

ollehar


Details Diff		 Fixed issue 11052: JS error with Date/Time question Affected Issues
11052
mod - application/views/survey/questions/date/selector/answer.php Diff File

master 69c06bb8

2016-04-27 11:58

c_schmitz


Details Diff		 Dev Added translations for datetimepicker popup buttons
mod - application/controllers/admin/dataentry.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/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File

2.06lts 4a282c92

2016-04-27 11:55

DenisChenu


Details Diff		 [doc] Update README
mod - README.md Diff File

2.06lts 6ef3092f

2016-04-27 11:53

DenisChenu


Details Diff		 Merge branch '2.06lts' of https://github.com/LimeSurvey/LimeSurvey.git into 2.06_SondagesPro

# Conflicts:
# application/config/version.php
# application/controllers/admin/database.php
# application/controllers/admin/surveyadmin.php
# application/libraries/Save.php
mod - application/config/version.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - scripts/admin/browse.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/darkblue/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File

master b965855d

2016-04-27 11:50

ollehar


Details Diff		 Dev: Overflow visible for panel (needed for datepicker)
mod - styles/Sea_Green/css/lime-admin-common.css Diff File

master efde12fa

2016-04-27 11:50

ollehar


Details Diff		 Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - application/controllers/admin/dataentry.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/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File

master 19c4211b

2016-04-27 11:45

c_schmitz


Details Diff		 Dev Added popup on focus and clear button to datetimepickers
mod - application/controllers/admin/dataentry.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/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File

master 422b1732

2016-04-27 11:09

ollehar


Details Diff		 Dev: Add event beforeSurveyAdminView
mod - application/controllers/admin/surveyadmin.php Diff File

master d89960f7

2016-04-27 11:08

ollehar


Details Diff		 Dev: Missing box-shadow for webkit
mod - templates/default/css/flat_and_modern.css Diff File

master ab910721

2016-04-27 10:28

DenisChenu


Details Diff		 Dev: remove last fontawesome , 84e4ac68a8c4765d83877a1b1e2cf561b6b3303b child
rm - styles-public/font-awesome-43-debugmode.min.css Diff
rm - styles-public/font-awesome-43.min.css Diff
rm - templates/default/fonts/fontawesome-webfont.woff2 Diff
rm - templates/ubuntu_orange/css/font-awesome.css Diff

master 5e12ed11

2016-04-27 10:25

DenisChenu


Details Diff		 Fixed issue : Bad link for Browse uploaded ressources if publicurl is set
Dev: publicurl must be used only for mail sending, when create absolute url
Dev: absoluteurl must be used only if we really need absoluteUrl (else $_SESSION can be broken)
mod - application/views/admin/survey/subview/accordion/_resources_panel.php Diff File

2.06lts bf8547b2

2016-04-27 09:46

DenisChenu


Details Diff		 Fixed issue : Bad link for Browse uploaded ressources if publicurl is set
Dev: publicurl must be used only for mail sending, when create absolute url
Dev: absoluteurl must be used only if we really need abosluteUrl (else $_SESSION can be broken)
Dev: @todo : fix it for 2.50 too if needed
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File

master f4d46c25

2016-04-27 09:32

c_schmitz


Details Diff		 Removed feature: Obsolete setting dropdownthreshold
mod - application/config/config-defaults.php Diff File
mod - application/extensions/questionTypes/listRadio/listRadio.php Diff File
mod - application/helpers/qanda_helper.php Diff File

master fadf2ee3

2016-04-26 21:50

c_schmitz


Details Diff		 Dev Swapped buggy datetime YiiWheels library for a working one from https://eonasdan.github.io/bootstrap-datetimepicker/
mod - application/controllers/admin/dataentry.php Diff File
mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php Diff File
add - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/bootstrap-datetimepicker.js Diff File
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/bootstrap-datetimepicker.min.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.bg.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.cs.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.da.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.de.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.es.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fa-IR.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fi.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fo.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.fr.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.hr.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.hu.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.id.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.is.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.it.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ja.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.kr.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.lt.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.lv.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ms.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.nb.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.nl.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.pl.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.pt-BR.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.pt.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ro.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.rs-latin.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.rs.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.ru.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.sk.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.sl.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.sv.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.th.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.tr.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.zh-CN.js Diff
rm - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/locales/bootstrap-datetimepicker.zh-TW.js Diff
add - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/moment-with-locales.js 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/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File

master ef2957bf

2016-04-26 21:41

ollehar1


Details Diff		 Dev: Allow plugins to set message when success is false
mod - application/controllers/admin/pluginmanager.php Diff File

master 1e547f22

2016-04-26 19:07

DenisChenu


Details Diff		 Dev: fix merge
mod - application/helpers/frontend_helper.php Diff File

master a2a7c974

2016-04-26 19:06

DenisChenu


Details Diff		 New feature 10958: Add btn-primary to next and submit Affected Issues
10958
mod - application/controllers/admin/templates.php Diff File
mod - application/helpers/frontend_helper.php Diff File

master 31590f20

2016-04-26 18:02

c_schmitz


Details Diff		 Dev More fixes to datetimepicker (reverted from commit 71168779bcb3adb29d313f1bb09e2e5e85b8be55)
add - tmp/assets/index.html Diff File

master d4547536

2016-04-26 17:48

c_schmitz


Details Diff		 Release 2.50+ Build 160426
mod - docs/release_notes.txt Diff File

master 1904fa0b

2016-04-26 17:44

c_schmitz


Details Diff		 Dev Removed obsolete jquery-ui timepicker
mod - application/helpers/qanda_helper.php Diff File

master db6044dd

2016-04-26 17:42

LimeSurvey Translations Bot


Details Diff		 Updated translation: Catalan by qualitatuvic
Updated translation: French (France) by arnaud21
Updated translation: Indonesian by radhwaw
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Norwegian (Nynorsk) by pmonstad
Updated translation: Polish by elisa
Updated translation: Latvian (Informal) by marcic
Updated translation: Polish (Informal) by elisa
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File

master 9fda76f3

2016-04-26 17:34

ollehar


Details Diff		 Dev: Add calendar icon to backend datepicker
mod - application/controllers/admin/dataentry.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/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/tokenform.php Diff File

master 41dee4df

2016-04-26 17:23

LouisGac


Details Diff		 New feature: disable comfortUpdate alerts from version.php
mod - application/config/version.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php Diff File
mod - application/views/admin/update/updater/steps/_backup.php Diff File

master 56473d22

2016-04-26 17:17

LouisGac


Details Diff		 Dev: few fixes on comfortUpdate
mod - application/config/updater_version.php Diff File
mod - application/config/version.php Diff File
rm - tmp/comfort_updater_cookie.txt Diff
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 718 719 720 721 722 723 724 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last