Changesets: LimeSurvey

Search Browse Back to Index

master 2d972bc6

2016-11-24 10:00:30

Bert Hankes


Committer: GitHub Details Diff 		Update upload.htaccess

Revoke fix 11821: error uploading images kcfinder
Security breach!		 Affected Issues
11821
mod - third_party/kcfinder/conf/upload.htaccess Diff File

master 7f7b346a

2016-11-24 09:55:21

Bert Hankes


Committer: GitHub Details Diff 		Update fonts.css

Dev: Because of revoke of jqgrid and participantdisplay.js should be done in all the templates!
Attach Issues:
mod - styles/Apple_Blossom/css/fonts.css Diff File

master 189e455e

2016-11-24 09:47:52

Bert Hankes


Committer: GitHub Details Diff 		Delete sharePanel.js

Because of revoke of jqgrid
Attach Issues:
rm - scripts/admin/sharePanel.js Diff File

develop d8f69552

2016-11-24 09:32:46

DenisChenu

Details Diff 		Dev: git add icon else ....
Attach Issues:
add - third_party/ckeditor/plugins/videodetector/icons/icon_black.png Diff File
add - third_party/ckeditor/plugins/videodetector/icons/icon_white.png Diff File
add - third_party/ckeditor/plugins/videodetector/icons/videodetector.svg Diff File

develop 49c46286

2016-11-23 18:47:48

DenisChenu

Details Diff 		Dev: ckeditor lack of icon for videodetect plugin (replace Youtube)
Dev: no update of class needed for form-control with popup		 Affected Issues
11925
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File

develop b7cd780b

2016-11-23 18:32:24

DenisChenu

Details Diff 		Dev: #11925 Update CKeditor to 4.6
Dev: untouched ckeditor from http://ckeditor.com/builder/9a6b936eb278a9d99d85053ad70c1dca (see build-config)
Dev: update ckeditor-config for limesurvey
Dev: strangely, must add manually codemirror		 Affected Issues
11925
mod - scripts/admin/ckeditor-config.js Diff File
mod - third_party/ckeditor/CHANGES.md Diff File
mod - third_party/ckeditor/README.md Diff File
mod - third_party/ckeditor/build-config.js Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/config.js Diff File
mod - third_party/ckeditor/contents.css Diff File
mod - third_party/ckeditor/lang/af.js Diff File
mod - third_party/ckeditor/lang/ar.js Diff File
mod - third_party/ckeditor/lang/bg.js Diff File
mod - third_party/ckeditor/lang/bn.js Diff File
mod - third_party/ckeditor/lang/bs.js Diff File
mod - third_party/ckeditor/lang/ca.js Diff File
mod - third_party/ckeditor/lang/cs.js Diff File
mod - third_party/ckeditor/lang/cy.js Diff File
mod - third_party/ckeditor/lang/da.js Diff File
mod - third_party/ckeditor/lang/de-ch.js Diff File
mod - third_party/ckeditor/lang/de.js Diff File
mod - third_party/ckeditor/lang/el.js Diff File
mod - third_party/ckeditor/lang/en-au.js Diff File
mod - third_party/ckeditor/lang/en-ca.js Diff File
mod - third_party/ckeditor/lang/en-gb.js Diff File
mod - third_party/ckeditor/lang/en.js Diff File
mod - third_party/ckeditor/lang/eo.js Diff File
mod - third_party/ckeditor/lang/es.js Diff File
mod - third_party/ckeditor/lang/et.js Diff File
mod - third_party/ckeditor/lang/eu.js Diff File
mod - third_party/ckeditor/lang/fa.js Diff File
mod - third_party/ckeditor/lang/fi.js Diff File
mod - third_party/ckeditor/lang/fo.js Diff File
mod - third_party/ckeditor/lang/fr-ca.js Diff File
mod - third_party/ckeditor/lang/fr.js Diff File
mod - third_party/ckeditor/lang/gl.js Diff File
mod - third_party/ckeditor/lang/gu.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/CHANGES.md Diff File
add - third_party/ckeditor/plugins/a11ychecker/LICENSE.md Diff File
add - third_party/ckeditor/plugins/a11ychecker/README.md Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/guidelines/508.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/guidelines/508.tests.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/guidelines/wcag.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/guidelines/wcag.tests.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/preconditions.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/quail.jquery.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/quail.jquery.min.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/tests.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/tests.min.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/libs/quail/wcag2.json Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/AddTableCaption.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/AnchorsMerge.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/AttributeRename.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/AttributeRenameDefault.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/DateUnfold.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/ElementRemove.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/ElementReplace.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/ImgAlt.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/ImgAltNonEmpty.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/LocalizedRepository.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/ParagraphToHeader.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/QuickFix.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/de/TableHeaders.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/AddTableCaption.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/AnchorsMerge.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/AttributeRename.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/AttributeRenameDefault.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/DateUnfold.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/ElementRemove.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/ElementReplace.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/ImgAlt.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/ImgAltNonEmpty.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/LocalizedRepository.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/ParagraphToHeader.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/QuickFix.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/en/TableHeaders.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/AddTableCaption.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/AnchorsMerge.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/AttributeRename.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/AttributeRenameDefault.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/DateUnfold.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/ElementRemove.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/ElementReplace.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/ImgAlt.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/ImgAltNonEmpty.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/LocalizedRepository.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/ParagraphToHeader.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/QuickFix.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/quickfix/nl/TableHeaders.js Diff File
add - third_party/ckeditor/plugins/a11ychecker/skins/moono-lisa/a11ychecker.css Diff File
add - third_party/ckeditor/plugins/a11ychecker/skins/moono-lisa/contents.css Diff File
add - third_party/ckeditor/plugins/a11ychecker/skins/moono/a11ychecker.css Diff File
add - third_party/ckeditor/plugins/a11ychecker/skins/moono/contents.css Diff File
add - third_party/ckeditor/plugins/a11ychecker/skins/moono/images/reload.png Diff File
add - third_party/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js Diff File
rm - third_party/ckeditor/plugins/ajax/plugin.js Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/kama/balloonpanel.css Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/moono-lisa/balloonpanel.css Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/close.png Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/moono-lisa/images/hidpi/close.png Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/moono/balloonpanel.css Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/moono/images/close.png Diff File
add - third_party/ckeditor/plugins/balloonpanel/skins/moono/images/hidpi/close.png Diff File
rm - third_party/ckeditor/plugins/codemirror/LICENSE.md Diff File
rm - third_party/ckeditor/plugins/codemirror/README.md Diff File
rm - third_party/ckeditor/plugins/codemirror/icons/autocomplete.png Diff File
rm - third_party/ckeditor/plugins/codemirror/icons/autoformat.png Diff File
rm - third_party/ckeditor/plugins/codemirror/icons/commentselectedrange.png Diff File
rm - third_party/ckeditor/plugins/codemirror/icons/searchcode.png Diff File
rm - third_party/ckeditor/plugins/codemirror/icons/uncommentselectedrange.png Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/af.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ar.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/bg.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/bn.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/bs.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ca.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/cs.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/cy.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/da.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/de.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/el.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/en-au.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/en-ca.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/en-gb.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/en.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/eo.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/es.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/et.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/eu.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/fa.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/fi.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/fo.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/fr-ca.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/fr.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/gl.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/gu.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/he.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/hi.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/hr.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/hu.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/is.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/it.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ja.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ka.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/km.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ko.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ku.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/lt.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/lv.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/mk.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/mn.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ms.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/nb.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/nl.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/no.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/pl.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/pt-br.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/pt.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ro.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ru.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/sk.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/sl.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/sr-latn.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/sr.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/sv.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/th.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/tr.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/ug.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/uk.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/vi.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/zh-cn.js Diff File
rm - third_party/ckeditor/plugins/codemirror/lang/zh.js Diff File
rm - third_party/ckeditor/plugins/codemirror/plugin.js Diff File
add - third_party/ckeditor/plugins/codemirror/theme/abcdef.css Diff File
add - third_party/ckeditor/plugins/codemirror/theme/bespin.css Diff File
add - third_party/ckeditor/plugins/codemirror/theme/dracula.css Diff File
add - third_party/ckeditor/plugins/codemirror/theme/hopscotch.css Diff File
add - third_party/ckeditor/plugins/codemirror/theme/icecoder.css Diff File
add - third_party/ckeditor/plugins/codemirror/theme/isotope.css Diff File

fancytree_new d0ab18e7

2016-11-23 17:20:21

markusfluer

Details Diff 		Dev: collapsing sidebar working on rtl and normal
Attach Issues:
mod - application/views/admin/super/sidemenu.php 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/Apple_Blossom/scripts/sidemenu.js 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/Bay_of_Many/scripts/sidemenu.js 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/Black_Pearl/scripts/sidemenu.js 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/Dark_Sky/scripts/sidemenu.js 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/Free_Magenta/scripts/sidemenu.js 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/Noto_All_Languages/scripts/sidemenu.js 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/Purple_Tentacle/scripts/sidemenu.js Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sea_Green/scripts/sidemenu.js 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 - styles/Sunset_Orange/scripts/sidemenu.js Diff File

master 8165e5a2

2016-11-23 15:31:48

c_schmitz

Details Diff 		Fixed issue: Token bounce processing skipping messages
Dev Bouncetime field in survey table is now not used anymore because it would not reliably determine the last message
Dev No only message marked as unread are processed and marked as read afterwards
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File

fancytree_new d8e8749a

2016-11-23 15:28:52

markusfluer

Details Diff 		Dev: now it is working again
Attach Issues:
mod - styles/Sea_Green/scripts/sidemenu.js Diff File

fancytree_new 2b214e27

2016-11-23 15:27:20

markusfluer

Details Diff 		DEv: another fix for the moveable sidemenu
Attach Issues:
mod - styles/Sea_Green/scripts/sidemenu.js Diff File

fancytree_new 54571757

2016-11-23 15:23:59

markusfluer

Details Diff 		Dev: removed collapsing for now
Attach Issues:
mod - styles/Sea_Green/scripts/sidemenu.js Diff File

fancytree_new 1ff521fb

2016-11-23 15:14:14

markusfluer

Details Diff 		Merge branch 'master'

Conflicts:
application/config/third_party.php
application/views/admin/super/_question_explorer.php
styles/Sea_Green/scripts/sidemenu.js
Attach Issues:
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/extensions/PannelBoxWidget/views/box.php Diff File
mod - application/extensions/PannelBoxWidget/views/row_header.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/SurveyURLParameter.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/statistics_subviews/_dataselection.php Diff File
mod - application/views/admin/export/statistics_subviews/_outputoptions.php Diff File
mod - application/views/admin/export/statistics_subviews/_response_filter_choice.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/quotas/viewquotasrowsub_view.php Diff File
mod - application/views/admin/responses/browseidrow_view.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_question_group_position.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/token/browse.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/el/el.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - scripts/admin/attributeControl.js Diff File
mod - scripts/admin/participantdisplay.js Diff File
mod - scripts/admin/sharePanel.js Diff File
mod - scripts/admin/statistics.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/survey_runtime.js 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/Apple_Blossom/scripts/sidemenu.js 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/Bay_of_Many/scripts/sidemenu.js 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/Black_Pearl/scripts/sidemenu.js 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/Dark_Sky/scripts/sidemenu.js 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/Free_Magenta/scripts/sidemenu.js 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/Noto_All_Languages/scripts/sidemenu.js 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/Purple_Tentacle/scripts/sidemenu.js Diff File
mod - styles/Sea_Green/config.xml 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-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
mod - styles/Sunset_Orange/scripts/sidemenu.js Diff File
rm - third_party/jqgrid/css/ellipsis-xbl.xml Diff File
rm - third_party/jqgrid/css/ui.jqgrid.css Diff File
rm - third_party/jqgrid/js/Changes.txt Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-ar.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-bg.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-bg1251.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-cat.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-cn.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-cs.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-da.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-de.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-dk.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-el.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-en.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-es.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-fa.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-fi.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-fr.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-gl.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-he.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-hr.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-hr1250.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-hu.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-id.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-is.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-it.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-ja.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-kr.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-lt.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-mne.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-nl.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-no.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-pl.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-pt-br.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-pt.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-ro.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-ru.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-sk.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-sr-latin.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-sr.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-sv.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-th.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-tr.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-tw.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-ua.js Diff File
rm - third_party/jqgrid/js/i18n/grid.locale-vi.js Diff File
rm - third_party/jqgrid/js/install.txt Diff File
rm - third_party/jqgrid/js/jquery-1.9.0.min.js Diff File
rm - third_party/jqgrid/js/jquery.jqGrid.min.js Diff File
rm - third_party/jqgrid/js/jquery.jqGrid.src.js Diff File
rm - third_party/jqgrid/plugins/grid.addons.js Diff File
rm - third_party/jqgrid/plugins/grid.postext.js Diff File
rm - third_party/jqgrid/plugins/grid.setcolumns.js Diff File
rm - third_party/jqgrid/plugins/jquery.contextmenu.js Diff File
rm - third_party/jqgrid/plugins/jquery.searchFilter.js Diff File
rm - third_party/jqgrid/plugins/jquery.tablednd.js Diff File
rm - third_party/jqgrid/plugins/searchFilter.css Diff File
rm - third_party/jqgrid/plugins/ui.multiselect.css Diff File
rm - third_party/jqgrid/plugins/ui.multiselect.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.bootstrap.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.bootstrap.min.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.foundation.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.foundation.min.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.jqueryui.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.jqueryui.min.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables.min.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables_themeroller.css Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_asc.png Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_asc_disabled.png Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_both.png Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_desc.png Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_desc_disabled.png Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.bootstrap.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.bootstrap.min.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.foundation.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.foundation.min.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.jqueryui.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.jqueryui.min.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/jquery.dataTables.js Diff File
add - third_party/jquery-datatable/DataTables-1.10.12/js/jquery.dataTables.min.js Diff File
add - third_party/jquery-datatable/datatables.css Diff File
add - third_party/jquery-datatable/datatables.js Diff File
add - third_party/jquery-datatable/datatables.min.css Diff File
add - third_party/jquery-datatable/datatables.min.js Diff File

master 2e52c896

2016-11-23 15:12:00

markusfluer

Details Diff 		Dev: undid worker did not work with html2canvas
Attach Issues:
mod - application/config/third_party.php Diff File
mod - scripts/admin/statistics.js Diff File
mod - third_party/jspdf/createpdf_worker.js Diff File
mod - third_party/jspdf/jspdf.debug.js Diff File

cpdb_filter 2bd169b3

2016-11-23 10:23:29

ollehar

Details Diff 		Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php 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-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.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-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.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-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.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-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.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

master 3138e673

2016-11-23 10:08:20

markusfluer

Details Diff 		Dev: updated @media print styling
Attach Issues:
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php 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-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.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-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.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-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.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-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.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

master 5e75543f

2016-11-23 09:21:29

markusfluer

Details Diff 		Dev: closer to creating pdfs purely jsbased
Attach Issues:
mod - application/views/admin/export/statistics_view.php Diff File
mod - scripts/admin/statistics.js Diff File
mod - third_party/jspdf/createpdf_worker.js Diff File

develop db0dc89d

2016-11-23 01:50:20

DenisChenu

Details Diff 		New feature : add a jquery event after html is updated by expression : html:updated
Dev: Fixed issue 11937: Help question start empty, updated after : not shown		 Affected Issues
11937
mod - application/config/packages.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/scripts/template.js Diff File
mod - templates/default/views/endpage.pstpl Diff File

develop 8076be39

2016-11-23 00:51:07

DenisChenu

Details Diff 		New feature 11945: no-js ability updated by external file
Dev: this fix external js security level in IE
Dev: @LouisGac : i touch to SurveyRunTime (new function)
Dev: js.js can be moved to start of survey.js, didn't change a lot		 Affected Issues
11945
mod - application/config/packages.php Diff File
add - application/core/packages/limesurvey/js.js Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/layouts/public.php Diff File
mod - application/views/survey/system/errorAlert.php Diff File
mod - application/views/survey/system/errorWarning.php Diff File
mod - application/views/survey/system/no-javascript.php Diff File
mod - templates/default/config.xml Diff File

develop 14867890

2016-11-22 19:18:00

DenisChenu

Details Diff 		Dev: include global part in view directly : all answer must be complete
Dev; use _ like other files
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File
add - application/views/survey/questions/answer/arrays/10point/rows/cells/header_answer.php Diff File
add - application/views/survey/questions/answer/arrays/10point/rows/cells/header_information.php Diff File
rm - application/views/survey/questions/answer/arrays/10point/rows/cells/thead.php Diff File
add - application/views/survey/questions/answer/arrays/5point/rows/cells/header_answer.php Diff File
add - application/views/survey/questions/answer/arrays/5point/rows/cells/header_information.php Diff File
add - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/header_answer.php Diff File
add - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/header_information.php Diff File

develop e80c7ff1

2016-11-22 18:51:34

DenisChenu

Details Diff 		Dev: Better organization of views part7 question timer script
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File

develop 6a594d66

2016-11-22 18:48:28

DenisChenu

Details Diff 		Dev : Better organization of views part 5 : get good view for helps
Attach Issues:
mod - application/controllers/admin/templates.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File

develop 717c710a

2016-11-22 18:38:12

DenisChenu

Details Diff 		Dev : Better organization of views part 4 : question helps mv
Attach Issues:

develop 361c3f72

2016-11-22 18:35:22

DenisChenu

Details Diff 		Dev: Better organization of views part3 other files
Attach Issues:
mod - application/views/admin/templates/templateeditor_question_answerlist_view.php Diff File
mod - application/views/survey/questions/answer/arrays/dualscale/answer.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/answer.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/answer_input.php Diff File

develop 960b4497

2016-11-22 18:30:07

DenisChenu

Details Diff 		Dev: Better organization of views step 2: qanda
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File

develop 3e86377c

2016-11-22 18:24:34

DenisChenu

Details Diff 		Dev: Better organization of views step 1 : rename answer files
Attach Issues:
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 581 582 583 584 585 586 587 ... 600 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1450 1451 1452  Next  Last