Changesets: LimeSurvey

develop 6c37f6dc

2015-06-17 16:12

sammousa


Details Diff
Dev Added elfinder / tinymce integration.
mod - application/config/third_party.php Diff File
add - application/controllers/FilesController.php Diff File
mod - composer.json Diff File
mod - composer.lock Diff File
mod - scripts/htmleditor.js Diff File

master d77319cf

2015-06-17 16:03

DenisChenu


Details Diff
Fixed issue : CSRF vulnerability in KCFinder
Dev: added controlCSRFToken function
Dev: using it for all $_POST in browser (delete/rename)
Dev: using it in upload public function in uploader
mod - third_party/kcfinder/core/class/browser.php Diff File
mod - third_party/kcfinder/core/class/uploader.php Diff File
mod - third_party/kcfinder/js/060.toolbar.js Diff File
mod - third_party/kcfinder/tpl/tpl_browser.php Diff File
mod - third_party/kcfinder/tpl/tpl_javascript.php Diff File

master 580b58d0

2015-06-17 14:48

LimeSurvey Translations Bot


Details Diff
Updated translation: Catalan by qualitatuvic
Updated translation: Danish by Tobm
Updated translation: German by c_schmitz
Updated translation: Spanish (Spain) by aesteban
Updated translation: Spanish (Argentina) by topiim
Updated translation: Basque by ikt
Updated translation: French (France) by arnaud21
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Polish by elisa, c_schmitz
Updated translation: Turkish by kayazeren
Updated translation: Polish (Informal) by elisa
Updated translation: Chinese (Simplified) by jun9, yanglaw
Updated translation: Chinese (Hong Kong) (Traditional) by wksosam
Updated translation: Chinese (Taiwan) (Traditional) by m27387, hsyin
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/da/da.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es-AR/es-AR.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/eu/eu.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File

master 694c17ff

2015-06-17 14:44

c_schmitz


Details Diff
Fixed issue: Blank survey parameters when no questions exist yet
mod - application/controllers/admin/surveyadmin.php Diff File

develop 61a48c4d

2015-06-17 14:44

c_schmitz


Details Diff
Fixed issue: Blank survey parameters when no questions exist yet
mod - application/controllers/admin/surveyadmin.php Diff File

develop eddee180

2015-06-17 12:36

sammousa


Details Diff
Dev Removed dependencies and moved them to composer instead.
mod - application/config/third_party.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - composer.json Diff File
mod - composer.lock Diff File
mod - scripts/admin/tokens.js Diff File
rm - third_party/bootstrap-multiselect/.gitignore Diff
rm - third_party/bootstrap-multiselect/README.md Diff
rm - third_party/bootstrap-multiselect/css/bootstrap-3.0.0.min.css Diff
rm - third_party/bootstrap-multiselect/css/bootstrap-multiselect.css Diff
rm - third_party/bootstrap-multiselect/css/prettify.css Diff
rm - third_party/bootstrap-multiselect/fonts/glyphicons-halflings-regular.eot Diff
rm - third_party/bootstrap-multiselect/fonts/glyphicons-halflings-regular.svg Diff
rm - third_party/bootstrap-multiselect/fonts/glyphicons-halflings-regular.ttf Diff
rm - third_party/bootstrap-multiselect/fonts/glyphicons-halflings-regular.woff Diff
rm - third_party/bootstrap-multiselect/index.html Diff
rm - third_party/bootstrap-multiselect/js/bootstrap-3.0.0.min.js Diff
rm - third_party/bootstrap-multiselect/js/bootstrap-multiselect.js Diff
rm - third_party/bootstrap-multiselect/js/jquery-2.0.3.min.js Diff
rm - third_party/bootstrap-multiselect/js/prettify.js Diff
rm - third_party/bootstrap-multiselect/less/alerts.less Diff
rm - third_party/bootstrap-multiselect/less/badges.less Diff
rm - third_party/bootstrap-multiselect/less/bootstrap-multiselect.less Diff
rm - third_party/bootstrap-multiselect/less/bootstrap.less Diff
rm - third_party/bootstrap-multiselect/less/breadcrumbs.less Diff
rm - third_party/bootstrap-multiselect/less/button-groups.less Diff
rm - third_party/bootstrap-multiselect/less/buttons.less Diff
rm - third_party/bootstrap-multiselect/less/carousel.less Diff
rm - third_party/bootstrap-multiselect/less/close.less Diff
rm - third_party/bootstrap-multiselect/less/code.less Diff
rm - third_party/bootstrap-multiselect/less/component-animations.less Diff
rm - third_party/bootstrap-multiselect/less/dropdowns.less Diff
rm - third_party/bootstrap-multiselect/less/forms.less Diff
rm - third_party/bootstrap-multiselect/less/glyphicons.less Diff
rm - third_party/bootstrap-multiselect/less/grid.less Diff
rm - third_party/bootstrap-multiselect/less/input-groups.less Diff
rm - third_party/bootstrap-multiselect/less/jumbotron.less Diff
rm - third_party/bootstrap-multiselect/less/labels.less Diff
rm - third_party/bootstrap-multiselect/less/list-group.less Diff
rm - third_party/bootstrap-multiselect/less/media.less Diff
rm - third_party/bootstrap-multiselect/less/mixins.less Diff
rm - third_party/bootstrap-multiselect/less/modals.less Diff
rm - third_party/bootstrap-multiselect/less/navbar.less Diff
rm - third_party/bootstrap-multiselect/less/navs.less Diff
rm - third_party/bootstrap-multiselect/less/normalize.less Diff
rm - third_party/bootstrap-multiselect/less/pager.less Diff
rm - third_party/bootstrap-multiselect/less/pagination.less Diff
rm - third_party/bootstrap-multiselect/less/panels.less Diff
rm - third_party/bootstrap-multiselect/less/popovers.less Diff
rm - third_party/bootstrap-multiselect/less/print.less Diff
rm - third_party/bootstrap-multiselect/less/progress-bars.less Diff
rm - third_party/bootstrap-multiselect/less/responsive-utilities.less Diff
rm - third_party/bootstrap-multiselect/less/scaffolding.less Diff
rm - third_party/bootstrap-multiselect/less/tables.less Diff
rm - third_party/bootstrap-multiselect/less/theme.less Diff
rm - third_party/bootstrap-multiselect/less/thumbnails.less Diff
rm - third_party/bootstrap-multiselect/less/tooltip.less Diff
rm - third_party/bootstrap-multiselect/less/type.less Diff
rm - third_party/bootstrap-multiselect/less/utilities.less Diff
rm - third_party/bootstrap-multiselect/less/variables.less Diff
rm - third_party/bootstrap-multiselect/less/wells.less Diff
rm - third_party/bootstrap-multiselect/tests.html Diff
rm - third_party/jquery-actual/.gitignore Diff
rm - third_party/jquery-actual/CHANGELOG.md Diff
rm - third_party/jquery-actual/LICENSE.txt Diff
rm - third_party/jquery-actual/README.md Diff
rm - third_party/jquery-actual/demo/PIE.htc Diff
rm - third_party/jquery-actual/demo/css3pie.html Diff
rm - third_party/jquery-actual/demo/normal.html Diff
rm - third_party/jquery-actual/jquery.actual.js Diff
rm - third_party/jquery-actual/jquery.actual.min.js Diff
rm - third_party/jquery-actual/package.json Diff
rm - third_party/jquery-bindWithDelay/README Diff
rm - third_party/jquery-bindWithDelay/bind.html Diff
rm - third_party/jquery-bindWithDelay/bindWithDelay.js Diff
rm - third_party/jquery-bindWithDelay/demo/jquery-1.9.1.js Diff
rm - third_party/jquery-bindWithDelay/demo/styles.css Diff
rm - third_party/jquery-bindWithDelay/index.html Diff
rm - third_party/jquery-bindWithDelay/onDelay.js Diff
rm - third_party/jquery-bindWithDelay/test/index.html Diff
rm - third_party/jquery-bindWithDelay/test/qunit.css Diff
rm - third_party/jquery-bindWithDelay/test/qunit.js Diff
rm - third_party/jquery-bindWithDelay/test/test.js Diff
rm - third_party/jquery-blockui/jquery.blockUI.js Diff
rm - third_party/jquery-multiselect/CHANGELOG Diff
rm - third_party/jquery-multiselect/GPL-LICENSE Diff
rm - third_party/jquery-multiselect/MIT-LICENSE Diff
rm - third_party/jquery-multiselect/README.markdown Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.br.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.cs.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.de.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.es.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.br.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.cs.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.de.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.es.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.fr.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.it.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.ja.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.pl.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.ru.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.tr.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.zh-cn.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.filter.zh-tw.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.fr.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.it.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.ja.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.pl.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.ru.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.tr.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.zh-cn.js Diff
rm - third_party/jquery-multiselect/i18n/jquery.multiselect.zh-tw.js Diff
rm - third_party/jquery-multiselect/jquery.multiselect.css Diff
rm - third_party/jquery-multiselect/jquery.multiselect.filter.css Diff
rm - third_party/jquery-multiselect/screenshot.gif Diff
rm - third_party/jquery-multiselect/src/jquery.multiselect.filter.js Diff
rm - third_party/jquery-multiselect/src/jquery.multiselect.filter.min.js Diff
rm - third_party/jquery-multiselect/src/jquery.multiselect.js Diff
rm - third_party/jquery-multiselect/src/jquery.multiselect.min.js Diff
rm - third_party/jquery-nestedSortable/README.md Diff
rm - third_party/jquery-nestedSortable/jquery.mjs.nestedSortable.js Diff
rm - third_party/jquery-notify/README.markdown Diff
rm - third_party/jquery-notify/alert.png Diff
rm - third_party/jquery-notify/index.htm Diff
rm - third_party/jquery-notify/src/jquery.notify.js Diff
rm - third_party/jquery-notify/src/jquery.notify.min.js Diff
rm - third_party/jquery-notify/ui.notify.css Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-af.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-am.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-bg.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-ca.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-cs.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-da.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-de.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-el.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-es.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-et.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-eu.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-fi.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-fr.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-gl.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-he.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-hr.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-hu.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-id.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-it.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-ja.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-ko.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-lt.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-nl.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-no.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-pl.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-pt-BR.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-pt.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-ro.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-ru.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-sk.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-sr-RS.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-sr-YU.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-sv.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-th.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-tr.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-uk.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-vi.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-zh-CN.js Diff
rm - third_party/jquery-ui-timepicker-addon/i18n/jquery-ui-timepicker-zh-TW.js Diff
rm - third_party/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.css Diff
rm - third_party/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.js Diff
rm - third_party/jquery/jquery-1.11.1.js Diff
rm - third_party/jquery/jquery-1.11.1.min.js Diff
rm - third_party/jqueryui/css/smoothness/images/animated-overlay.gif Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-icons_222222_256x240.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-icons_2e83ff_256x240.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-icons_454545_256x240.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-icons_888888_256x240.png Diff
rm - third_party/jqueryui/css/smoothness/images/ui-icons_cd0a0a_256x240.png Diff
rm - third_party/jqueryui/css/smoothness/jquery-ui-1.10.3.custom.css Diff
rm - third_party/jqueryui/css/smoothness/jquery-ui-1.10.3.custom.min.css Diff
rm - third_party/jqueryui/development-bundle/AUTHORS.txt Diff
rm - third_party/jqueryui/development-bundle/Gruntfile.js Diff
rm - third_party/jqueryui/development-bundle/MIT-LICENSE.txt Diff
rm - third_party/jqueryui/development-bundle/README.md Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/collapsible.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/custom-icons.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/fillspace.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/hoverintent.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/no-auto-height.html Diff
rm - third_party/jqueryui/development-bundle/demos/accordion/sortable.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/categories.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/combobox.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/custom-data.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/folding.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/images/jquery_32x32.png Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/images/jqueryui_32x32.png Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/images/sizzlejs_32x32.png Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/images/transparent_1x1.png Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/images/ui-anim_basic_16x16.gif Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/london.xml Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/maxheight.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/multiple-remote.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/multiple.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/remote-jsonp.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/remote-with-cache.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/remote.html Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/search.php Diff
rm - third_party/jqueryui/development-bundle/demos/autocomplete/xml.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/checkbox.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/icons.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/radio.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/splitbutton.html Diff
rm - third_party/jqueryui/development-bundle/demos/button/toolbar.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/alt-field.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/animation.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/buttonbar.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/date-formats.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/date-range.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/dropdown-month-year.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/icon-trigger.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/images/calendar.gif Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/inline.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/jquery.ui.datepicker-ar.js Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/jquery.ui.datepicker-fr.js Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/jquery.ui.datepicker-he.js Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/jquery.ui.datepicker-zh-TW.js Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/localization.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/min-max.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/multiple-calendars.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/other-months.html Diff
rm - third_party/jqueryui/development-bundle/demos/datepicker/show-week.html Diff
rm - third_party/jqueryui/development-bundle/demos/demos.css Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/animated.html Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/modal-confirmation.html Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/modal-form.html Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/modal-message.html Diff
rm - third_party/jqueryui/development-bundle/demos/dialog/modal.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/constrain-movement.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/cursor-style.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/delay-start.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/events.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/handle.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/revert.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/scroll.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/snap-to.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/sortable.html Diff
rm - third_party/jqueryui/development-bundle/demos/draggable/visual-feedback.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/accepted-elements.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras2.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras2_min.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras3.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras3_min.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras4.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras4_min.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/images/high_tatras_min.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/photo-manager.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/propagation.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/revert.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/shopping-cart.html Diff
rm - third_party/jqueryui/development-bundle/demos/droppable/visual-feedback.html Diff
rm - third_party/jqueryui/development-bundle/demos/effect/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/effect/easing.html Diff
rm - third_party/jqueryui/development-bundle/demos/effect/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/images/calendar.gif Diff
rm - third_party/jqueryui/development-bundle/demos/images/demo-config-on-tile.gif Diff
rm - third_party/jqueryui/development-bundle/demos/images/demo-config-on.gif Diff
rm - third_party/jqueryui/development-bundle/demos/images/demo-spindown-closed.gif Diff
rm - third_party/jqueryui/development-bundle/demos/images/demo-spindown-open.gif Diff
rm - third_party/jqueryui/development-bundle/demos/images/icon-docs-info.gif Diff
rm - third_party/jqueryui/development-bundle/demos/images/pbar-ani.gif Diff
rm - third_party/jqueryui/development-bundle/demos/menu/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/menu/icons.html Diff
rm - third_party/jqueryui/development-bundle/demos/menu/index.html Diff
rm - third_party/jqueryui/development-bundle/demos/position/cycler.html Diff
rm - third_party/jqueryui/development-bundle/demos/position/default.html Diff
rm - third_party/jqueryui/development-bundle/demos/position/images/earth.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/position/images/flight.jpg Diff
rm - third_party/jqueryui/development-bundle/demos/position/images/rocket.jpg Diff

master b2177c34

2015-06-17 11:53

c_schmitz


Details Diff
Merge pull request #330 from Shnoulle/master_ckeditor-kama-skin

Ckeditor skin to defaut (kama)
mod - scripts/admin/ckeditor-config.js Diff File
mod - styles/adminstyle.css Diff File
rm - third_party/ckeditor/skins/ls-office2003/dialog.css Diff
rm - third_party/ckeditor/skins/ls-office2003/editor.css Diff
rm - third_party/ckeditor/skins/ls-office2003/icons.png Diff
rm - third_party/ckeditor/skins/ls-office2003/icons_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/mini.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/noimage.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites_ie6.png Diff
rm - third_party/ckeditor/skins/ls-office2003/skin.js Diff
rm - third_party/ckeditor/skins/ls-office2003/templates.css Diff

develop 6fc3019f

2015-06-17 11:39

sammousa


Details Diff
Dev Installer fixes and added stricter constraints for dependencies.
mod - application/components/MigrationManager.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UpgradeController.php Diff File
mod - application/core/WebApplication.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/limesurvey Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/global/menu.php Diff File
mod - application/views/global/menus.php Diff File
mod - application/views/installer/optional.php Diff File
mod - application/views/installer/success.php Diff File
mod - composer.json Diff File
mod - composer.lock Diff File

master 7015d59b

2015-06-17 11:24

DenisChenu


Details Diff
Dev: ckeditor skin to defaut (kama)
Dev: look better than office2003, but some ugly popup
mod - scripts/admin/ckeditor-config.js Diff File
mod - styles/adminstyle.css Diff File
rm - third_party/ckeditor/skins/ls-office2003/dialog.css Diff
rm - third_party/ckeditor/skins/ls-office2003/editor.css Diff
rm - third_party/ckeditor/skins/ls-office2003/icons.png Diff
rm - third_party/ckeditor/skins/ls-office2003/icons_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/mini.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/noimage.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites_ie6.png Diff
rm - third_party/ckeditor/skins/ls-office2003/skin.js Diff
rm - third_party/ckeditor/skins/ls-office2003/templates.css Diff

master_ckeditor-default-skin d8ab9f07

2015-06-17 10:36

DenisChenu


Details Diff
Dev: Use ckeditor default skin (kama)
Dev: Look is OK for CKeditor, but some issue in img/files popup (ugly but working)
mod - scripts/admin/ckeditor-config.js Diff File
mod - styles/adminstyle.css Diff File
rm - third_party/ckeditor/skins/ls-office2003/dialog.css Diff
rm - third_party/ckeditor/skins/ls-office2003/editor.css Diff
rm - third_party/ckeditor/skins/ls-office2003/icons.png Diff
rm - third_party/ckeditor/skins/ls-office2003/icons_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/mini.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/noimage.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites_ie6.png Diff
rm - third_party/ckeditor/skins/ls-office2003/skin.js Diff
rm - third_party/ckeditor/skins/ls-office2003/templates.css Diff

master 6b658748

2015-06-17 05:59

adamzammit


Details Diff
Merge remote-tracking branch 'upstream/master'

Conflicts:
application/libraries/admin/quexmlpdf.php
application/views/admin/survey/editSurvey_view.php
application/views/admin/survey/subview/tab_view.php
mod - .gitignore Diff File
mod - .scrutinizer.yml Diff File
add - application/Psr4AutoloaderClass.php Diff File
mod - application/commands/InstallCommand.php Diff File
add - application/commands/PluginCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/routes.php Diff File
mod - application/config/tcpdf.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveyController.php Diff File
add - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
add - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/htmleditor_pop.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/AuthPluginBase.php Diff File
mod - application/core/ConsoleApplication.php Diff File
mod - application/core/LSBootstrap.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Application.php Diff File
add - application/core/LSYii_CaseValidator.php Diff File
mod - application/core/LSYii_Controller.php Diff File
add - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/core/LSYii_Validators.php Diff File
add - application/core/PluginBase.php Diff File
add - application/core/PluginEvent.php Diff File
add - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
add - application/core/db/DbConnection.php Diff File
add - application/core/db/MssqlSchema.php Diff File
add - application/core/db/MysqlSchema.php Diff File
add - application/core/db/PgsqlSchema.php Diff File
add - application/core/db/SmartColumnTypeTrait.php Diff File
add - application/extensions/AdminFooter/AdminFooter.php Diff File
add - application/extensions/AdminFooter/views/footer.php Diff File
add - application/extensions/ExtendedClientScript/ExtendedClientScript.php Diff File
add - application/extensions/ExtendedClientScript/cssmin/cssmin.php Diff File
add - application/extensions/ExtendedClientScript/jsmin/JSMin.php Diff File
add - application/extensions/yii-jsoneditor/JsonEditor.php Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/HISTORY.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/LICENSE Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/NOTICE Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/README.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/docs/api.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/docs/usage.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/01_basic_usage.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/02_viewer.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/03_switch_mode.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/requirejs_demo/requirejs_demo.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/requirejs_demo/scripts/main.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/requirejs_demo/scripts/require.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/img/jsoneditor-icons.png Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor-min.css Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor-min.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor.css Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/ace.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/ext-searchbox.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/mode-json.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/theme-jsoneditor.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/theme-textmate.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/worker-json.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/jsonlint/README.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/jsonlint/jsonlint.js Diff File
add - application/extensions/yii-jsoneditor/widget.js Diff File
rm - application/helpers/PluginSettingsHelper.php Diff
rm - application/language/english/index.html Diff
rm - application/libraries/ExpressionManager/js/em_javascript.js Diff
rm - application/libraries/Limesurvey_lang.php Diff
rm - application/libraries/admin/gtranslate/COPYING Diff
rm - application/libraries/admin/gtranslate/GTranslate.php Diff
rm - application/libraries/admin/gtranslate/languages.ini Diff
add - application/libraries/admin/pclzip.php Diff File
rm - application/libraries/admin/pclzip/gnu-lgpl.txt Diff
rm - application/libraries/admin/pclzip/pclerror.lib.php Diff
rm - application/libraries/admin/pclzip/pcltrace.lib.php Diff
rm - application/libraries/admin/pclzip/pclzip-trace.lib.php Diff
rm - application/libraries/admin/pclzip/readme.txt Diff
rm - application/libraries/admin/pear/OLE/OLE.php Diff
rm - application/libraries/admin/pear/OLE/PPS.php Diff
rm - application/libraries/admin/pear/OLE/PPS/File.php Diff
rm - application/libraries/admin/pear/OLE/PPS/Root.php Diff
rm - application/libraries/admin/pear/PEAR.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Format.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Parser.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Validator.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Xlswriter.php Diff
rm - application/models/Dynamic_old.php Diff
rm - application/third_party/ar-php/Arabic/Data.php Diff
add - application/third_party/ar-php/Arabic/images.zip Diff File
add - application/third_party/gtranslate-api/COPYING Diff File
add - application/third_party/gtranslate-api/ChangeLog Diff File
add - application/third_party/gtranslate-api/GTranslate.php Diff File
add - application/third_party/gtranslate-api/languages.ini Diff File
add - application/third_party/gtranslate-api/languages.v2.ini Diff File
add - application/third_party/http/LICENSE.txt Diff File
add - application/third_party/http/http.php Diff File
add - application/third_party/idna-convert/LICENCE Diff File
add - application/third_party/idna-convert/ReadMe.txt Diff File
add - application/third_party/idna-convert/idna_convert.class.php Diff File
add - application/third_party/idna-convert/transcode_wrapper.php Diff File
add - application/third_party/idna-convert/uctc.php Diff File
add - application/third_party/pclzip/gnu-lgpl.txt Diff File
add - application/third_party/pclzip/pclzip.lib.php Diff File
add - application/third_party/pclzip/readme.txt Diff File
add - application/third_party/pear/OLE/OLE.php Diff File
add - application/third_party/pear/OLE/PPS.php Diff File
add - application/third_party/pear/OLE/PPS/File.php Diff File
add - application/third_party/pear/OLE/PPS/Root.php Diff File
add - application/third_party/pear/PEAR.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Format.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Validator.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Xlswriter.php Diff File
rm - application/third_party/php-gettext/AUTHORS Diff
rm - application/third_party/php-gettext/COPYING Diff
rm - application/third_party/php-gettext/README Diff
rm - application/third_party/php-gettext/gettext.inc Diff
rm - application/third_party/php-gettext/gettext.php Diff
rm - application/third_party/php-gettext/streams.php Diff
add - application/third_party/phpmailer/PHPMailerAutoload.php Diff File
add - application/third_party/phpmailer/README.md Diff File
rm - application/third_party/phpmailer/README.php Diff

master dc3460a1

2015-06-17 05:35

adamzammit


Details Diff
Added queXML settings tab
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/views/admin/survey/editSurvey_view.php Diff File
add - application/views/admin/survey/subview/tabQuexml_view.php Diff File
mod - application/views/admin/survey/subview/tab_view.php Diff File

master d32f43b9

2015-06-16 18:34

DenisChenu


Details Diff
Dev: adding ls-office2003 skins for ckeditor
add - third_party/ckeditor/skins/ls-office2003/dialog.css Diff File
add - third_party/ckeditor/skins/ls-office2003/editor.css Diff File
add - third_party/ckeditor/skins/ls-office2003/icons.png Diff File
add - third_party/ckeditor/skins/ls-office2003/icons_rtl.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.gif Diff File
add - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/dialog_sides_rtl.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/mini.gif Diff File
add - third_party/ckeditor/skins/ls-office2003/images/noimage.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/sprites.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/sprites_ie6.png Diff File
add - third_party/ckeditor/skins/ls-office2003/skin.js Diff File
add - third_party/ckeditor/skins/ls-office2003/templates.css Diff File

master daad04d1

2015-06-16 18:33

DenisChenu


Details Diff
Fixed issue #09689: Update CKEditor to 3.6.6.2
mod - third_party/ckeditor/CHANGES.html Diff File
mod - third_party/ckeditor/_source/core/dtd.js Diff File
mod - third_party/ckeditor/_source/plugins/preview/preview.html Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/plugins/preview/preview.html Diff File
rm - third_party/ckeditor/plugins/toolbar/plugin.js Diff
rm - third_party/ckeditor/skins/ls-office2003/dialog.css Diff
rm - third_party/ckeditor/skins/ls-office2003/editor.css Diff
rm - third_party/ckeditor/skins/ls-office2003/icons.png Diff
rm - third_party/ckeditor/skins/ls-office2003/icons_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/dialog_sides_rtl.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/mini.gif Diff
rm - third_party/ckeditor/skins/ls-office2003/images/noimage.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites.png Diff
rm - third_party/ckeditor/skins/ls-office2003/images/sprites_ie6.png Diff
rm - third_party/ckeditor/skins/ls-office2003/skin.js Diff
rm - third_party/ckeditor/skins/ls-office2003/templates.css Diff

master 0b07bfee

2015-06-16 18:00

DenisChenu


Details Diff
Fixed issue :can force Show both for group and question code in Global settings
Dev: both, not show
mod - application/views/admin/globalSettings_view.php Diff File

master a6fa9a84

2015-06-16 17:32

DenisChenu


Details Diff
Fixed issue #09688: Update KCFinder to last stable (3.12)
add - third_party/kcfinder/.gitignore Diff File
add - third_party/kcfinder/README.md Diff File
mod - third_party/kcfinder/browse.php Diff File
add - third_party/kcfinder/cache/.htaccess Diff File
add - third_party/kcfinder/cache/base.css Diff File
add - third_party/kcfinder/cache/base.js Diff File
add - third_party/kcfinder/cache/theme_dark.css Diff File
add - third_party/kcfinder/cache/theme_dark.js Diff File
add - third_party/kcfinder/cache/theme_default.css Diff File
add - third_party/kcfinder/cache/theme_default.js Diff File
add - third_party/kcfinder/conf/.htaccess Diff File
add - third_party/kcfinder/conf/upload.htaccess Diff File
mod - third_party/kcfinder/core/autoload.php Diff File
add - third_party/kcfinder/core/bootstrap.php Diff File
add - third_party/kcfinder/core/class/minifier.php Diff File
mod - third_party/kcfinder/core/types/type_img.php Diff File
mod - third_party/kcfinder/core/types/type_mime.php Diff File
add - third_party/kcfinder/css/999.agent.css Diff File
add - third_party/kcfinder/css/index.php Diff File
mod - third_party/kcfinder/doc/Changelog Diff File
mod - third_party/kcfinder/doc/LICENSE.GPL Diff File
mod - third_party/kcfinder/doc/LICENSE.LGPL Diff File
rm - third_party/kcfinder/doc/README Diff
add - third_party/kcfinder/favicon.ico Diff File
add - third_party/kcfinder/index.php Diff File
add - third_party/kcfinder/integration/BolmerCMS.php Diff File
mod - third_party/kcfinder/integration/drupal.php Diff File
add - third_party/kcfinder/js/000._jquery.js Diff File
add - third_party/kcfinder/js/002._jqueryui.js Diff File
add - third_party/kcfinder/js/006.jquery.uniform.js Diff File
add - third_party/kcfinder/js/010.jquery.fixes.js Diff File
add - third_party/kcfinder/js/020.jquery.rightClick.js Diff File
add - third_party/kcfinder/js/021.jquery.taphold.js Diff File
add - third_party/kcfinder/js/029.jquery.agent.js Diff File
add - third_party/kcfinder/js/030.jquery.helper.js Diff File
add - third_party/kcfinder/js/031.jquery.md5.js Diff File
add - third_party/kcfinder/js/040.object.js Diff File
add - third_party/kcfinder/js/041.dialogs.js Diff File
add - third_party/kcfinder/js/050.init.js Diff File
add - third_party/kcfinder/js/060.toolbar.js Diff File
add - third_party/kcfinder/js/070.settings.js Diff File
add - third_party/kcfinder/js/080.files.js Diff File
add - third_party/kcfinder/js/090.folders.js Diff File
add - third_party/kcfinder/js/091.menus.js Diff File
add - third_party/kcfinder/js/091.viewImage.js Diff File
add - third_party/kcfinder/js/100.clipboard.js Diff File
add - third_party/kcfinder/js/120.misc.js Diff File
rm - third_party/kcfinder/js/browser/0bject.js Diff
rm - third_party/kcfinder/js/browser/clipboard.js Diff
rm - third_party/kcfinder/js/browser/files.js Diff
rm - third_party/kcfinder/js/browser/folders.js Diff
rm - third_party/kcfinder/js/browser/init.js Diff
rm - third_party/kcfinder/js/browser/joiner.php Diff
rm - third_party/kcfinder/js/browser/misc.js Diff
rm - third_party/kcfinder/js/browser/settings.js Diff
rm - third_party/kcfinder/js/browser/toolbar.js Diff
rm - third_party/kcfinder/js/helper.js Diff
add - third_party/kcfinder/js/index.php Diff File
rm - third_party/kcfinder/js/jquery.drag.js Diff
rm - third_party/kcfinder/js/jquery.js Diff
rm - third_party/kcfinder/js/jquery.rightClick.js Diff
mod - third_party/kcfinder/js_localize.php Diff File
add - third_party/kcfinder/lang/af.php Diff File
mod - third_party/kcfinder/lang/bg.php Diff File
mod - third_party/kcfinder/lang/ca.php Diff File
mod - third_party/kcfinder/lang/cs.php Diff File
mod - third_party/kcfinder/lang/da.php Diff File
mod - third_party/kcfinder/lang/de.php Diff File
mod - third_party/kcfinder/lang/el.php Diff File
mod - third_party/kcfinder/lang/en.php Diff File
mod - third_party/kcfinder/lang/es.php Diff File
add - third_party/kcfinder/lang/et.php Diff File
mod - third_party/kcfinder/lang/fa.php Diff File
add - third_party/kcfinder/lang/fi.php Diff File
mod - third_party/kcfinder/lang/fr.php Diff File
add - third_party/kcfinder/lang/he.php Diff File
mod - third_party/kcfinder/lang/hu.php Diff File
add - third_party/kcfinder/lang/id.php Diff File
mod - third_party/kcfinder/lang/it.php Diff File
mod - third_party/kcfinder/lang/ja.php Diff File
mod - third_party/kcfinder/lang/lt.php Diff File
add - third_party/kcfinder/lang/lv.php Diff File
mod - third_party/kcfinder/lang/nl.php Diff File
mod - third_party/kcfinder/lang/pl.php Diff File
mod - third_party/kcfinder/lang/pt-br.php Diff File
mod - third_party/kcfinder/lang/pt.php Diff File
add - third_party/kcfinder/lang/ro.php Diff File
mod - third_party/kcfinder/lang/ru.php Diff File
mod - third_party/kcfinder/lang/sk.php Diff File
add - third_party/kcfinder/lang/sv.php Diff File
mod - third_party/kcfinder/lang/tr.php Diff File
add - third_party/kcfinder/lang/uk.php Diff File
add - third_party/kcfinder/lib/class_fastImage.php Diff File
rm - third_party/kcfinder/lib/class_gd.php Diff
add - third_party/kcfinder/lib/class_image.php Diff File
add - third_party/kcfinder/lib/class_image_gd.php Diff File
add - third_party/kcfinder/lib/class_image_gmagick.php Diff File
add - third_party/kcfinder/lib/class_image_imagick.php Diff File
rm - third_party/kcfinder/lib/class_input.php Diff
add - third_party/kcfinder/themes/dark/01.ui.css Diff File
add - third_party/kcfinder/themes/dark/02.misc.css Diff File
add - third_party/kcfinder/themes/dark/README Diff File
rm - third_party/kcfinder/themes/dark/about.txt Diff
add - third_party/kcfinder/themes/dark/css.php Diff File
rm - third_party/kcfinder/themes/dark/img/cross.png Diff
add - third_party/kcfinder/themes/dark/img/files/big/mp4.png Diff File
add - third_party/kcfinder/themes/dark/img/files/big/psd.png Diff File
add - third_party/kcfinder/themes/dark/img/files/big/rar.png Diff File
add - third_party/kcfinder/themes/dark/img/files/big/sql.png Diff File
add - third_party/kcfinder/themes/dark/img/files/small/mp4.png Diff File
add - third_party/kcfinder/themes/dark/img/files/small/psd.png Diff File
add - third_party/kcfinder/themes/dark/img/files/small/rar.png Diff File
add - third_party/kcfinder/themes/dark/img/files/small/sql.png Diff File
rm - third_party/kcfinder/themes/dark/img/icons/close-clicked.png Diff
rm - third_party/kcfinder/themes/dark/img/icons/close-hover.png Diff
rm - third_party/kcfinder/themes/dark/img/icons/close.png Diff
rm - third_party/kcfinder/themes/dark/img/question.png Diff
rm - third_party/kcfinder/themes/dark/img/tree/folder_current.png Diff
add - third_party/kcfinder/themes/dark/img/ui-icons_black.png Diff File
add - third_party/kcfinder/themes/dark/img/ui-icons_grey.png Diff File
add - third_party/kcfinder/themes/dark/img/ui-icons_white.png Diff File
add - third_party/kcfinder/themes/dark/js.php Diff File
rm - third_party/kcfinder/themes/dark/style.css Diff
add - third_party/kcfinder/themes/default/01.ui.css Diff File
add - third_party/kcfinder/themes/default/02.misc.css Diff File
add - third_party/kcfinder/themes/default/README Diff File
add - third_party/kcfinder/themes/default/css.php Diff File
add - third_party/kcfinder/themes/default/img/bg_transparent.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/..png Diff File
add - third_party/kcfinder/themes/default/img/files/big/.image.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/avi.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/bat.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/bmp.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/bz2.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/ccd.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/cgi.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/com.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/csh.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/cue.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/deb.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/dll.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/doc.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/docx.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/exe.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/fla.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/flv.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/fon.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/gif.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/gz.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/htm.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/html.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/ini.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/iso.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/jar.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/java.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/jpeg.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/jpg.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/js.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mds.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mdx.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mid.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/midi.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mkv.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mov.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mp3.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mp4.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mpeg.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/mpg.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/nfo.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/nrg.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/ogg.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/pdf.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/php.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/phps.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/pl.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/pm.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/png.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/ppt.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/pptx.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/psd.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/qt.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/rar.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/rpm.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/rtf.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/sh.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/sql.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/srt.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/sub.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/swf.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/tgz.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/tif.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/tiff.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/torrent.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/ttf.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/txt.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/wav.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/wma.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/xls.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/xlsx.png Diff File
add - third_party/kcfinder/themes/default/img/files/big/zip.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/..png Diff File
add - third_party/kcfinder/themes/default/img/files/small/.image.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/avi.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/bat.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/bmp.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/bz2.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/ccd.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/cgi.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/com.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/csh.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/cue.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/deb.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/dll.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/doc.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/docx.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/exe.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/fla.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/flv.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/fon.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/gif.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/gz.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/htm.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/html.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/ini.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/iso.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/jar.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/java.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/jpeg.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/jpg.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/js.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mds.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mdx.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mid.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/midi.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mkv.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mov.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mp3.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mp4.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mpeg.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/mpg.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/nfo.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/nrg.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/ogg.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/pdf.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/php.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/phps.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/pl.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/pm.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/png.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/ppt.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/pptx.png Diff File
add - third_party/kcfinder/themes/default/img/files/small/psd.png Diff File

develop aa9420f5

2015-06-16 16:13

sammousa


Details Diff
Dev Added support for bootbox confirmations via data-confirm and post / delete links via data-method.
mod - application/controllers/SurveysController.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/global/surveyMenu.php Diff File
mod - application/views/layouts/main.php Diff File
mod - application/views/layouts/survey.php Diff File
mod - composer.json Diff File
mod - composer.lock Diff File
add - scripts/unobtrusive.js Diff File

develop 5e0b0804

2015-06-16 14:18

sammousa


Details Diff
Dev Implemented survey removal.
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/global/groupMenu.php Diff File
mod - application/views/global/surveyMenu.php Diff File
mod - application/views/groups/create.php Diff File
mod - application/views/layouts/main.php Diff File
mod - application/views/layouts/survey.php Diff File
mod - application/views/surveys/index.php Diff File
mod - composer.json Diff File
mod - composer.lock Diff File

develop 4978c6e9

2015-06-16 11:06

sammousa


Details Diff
Fixed issue 06984 Affected Issues
06984
mod - application/controllers/GroupsController.php Diff File
mod - application/helpers/globals.php Diff File
mod - application/models/QuestionGroup.php Diff File

develop 4b139bb1

2015-06-16 10:35

sammousa


Details Diff
Merge branch 'feature-test-merge' into develop
mod - .scrutinizer.yml Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/labels.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
rm - application/controllers/admin/responses.php Diff
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
add - application/core/AuthPluginBase.php Diff File
mod - application/core/LSYii_Validators.php Diff File
add - application/core/PluginBase.php Diff File
add - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/WebApplication.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/core/db/SmartColumnTypeTrait.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/Authwebserver/AuthWebServer.php Diff File
mod - application/core/plugins/ExportR/ExportR.php Diff File
mod - application/core/plugins/ExportR/RDataWriter.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
mod - application/extensions/LimeScript/assets/script.js Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.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/frontend_helper.php Diff File
mod - application/helpers/globals.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantAttributeNameLang.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/Token.php Diff File
mod - application/tests/bootstrap.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/responses/browseidheader_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/Question/yesNo_defaultvalue_widget.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/survey/subview/tabTokens_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/emailpost.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/usergroup/editUserGroup_view.php Diff File
mod - application/views/register/registerForm.php Diff File
mod - docs/release_notes.txt Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
add - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo 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/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
rm - locale/kk/LC_MESSAGES/kk.mo Diff
add - locale/ky/index.html Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
add - locale/pl-informal/index.html Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
rm - plugins/AuditLog/config.php Diff
add - plugins/ModulePlugin/ModulePlugin.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/expression.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/questions.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/surveypermissions.js Diff File
mod - scripts/admin/surveysettings.js Diff File
add - scripts/admin/tokenbounce.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/admin/users.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - scripts/uploader.js Diff File
add - styles-public/uploader-files.css Diff File
mod - styles-public/uploader.css Diff File
mod - styles/blobblueish/adminstyle-rtl.css Diff File
mod - styles/darkblue/adminstyle-rtl.css Diff File
mod - styles/darkblue/displayParticipants.css Diff File
mod - styles/expressions.css Diff File
mod - styles/gringegreen/adminstyle-rtl.css Diff File
mod - templates/limespired/template.css Diff File

develop 0c168d8c

2015-06-16 10:34

sammousa


Details Diff
Dev Merge related fixes.
mod - application/helpers/common_helper.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/models/Response.php Diff File

master f91da49f

2015-06-15 22:12

c_schmitz


Details Diff
Fixed issue #9680: Database update error when updating and having very old token tables
mod - application/helpers/update/updatedb_helper.php Diff File

master 40a8547a

2015-06-15 17:50

DenisChenu


Details Diff
Fixed issue 09685: Simple quote are double encoded in dropdown
Dev: gt(string,'unescaped') because Yii does the job
Dev: "Save and return to plugins list" don't return to plugin list
Affected Issues
09685
mod - application/controllers/PluginsController.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/plugins/configure.php Diff File

develop 0a600984

2015-06-15 17:12

sammousa


Details Diff
Merge remote-tracking branch 'upstream/master' into feature-test-merge
mod - .scrutinizer.yml Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/labels.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
rm - application/controllers/admin/responses.php Diff
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
add - application/core/AuthPluginBase.php Diff File
mod - application/core/LSYii_Validators.php Diff File
add - application/core/PluginBase.php Diff File
add - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/core/db/SmartColumnTypeTrait.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/Authwebserver/AuthWebServer.php Diff File
mod - application/core/plugins/ExportR/ExportR.php Diff File
mod - application/core/plugins/ExportR/RDataWriter.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
mod - application/extensions/LimeScript/assets/script.js Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.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/frontend_helper.php Diff File
mod - application/helpers/globals.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantAttributeNameLang.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/Token.php Diff File
mod - application/tests/bootstrap.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/responses/browseidheader_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/Question/yesNo_defaultvalue_widget.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/survey/subview/tabTokens_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/emailpost.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/usergroup/editUserGroup_view.php Diff File
mod - application/views/register/registerForm.php Diff File
mod - docs/release_notes.txt Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
add - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo 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/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
rm - locale/kk/LC_MESSAGES/kk.mo Diff
add - locale/ky/index.html Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
add - locale/pl-informal/index.html Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
rm - plugins/AuditLog/config.php Diff
add - plugins/ModulePlugin/ModulePlugin.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/expression.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/questions.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/surveypermissions.js Diff File
mod - scripts/admin/surveysettings.js Diff File
add - scripts/admin/tokenbounce.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/admin/users.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - scripts/uploader.js Diff File
add - styles-public/uploader-files.css Diff File
mod - styles-public/uploader.css Diff File
mod - styles/blobblueish/adminstyle-rtl.css Diff File
mod - styles/darkblue/adminstyle-rtl.css Diff File
mod - styles/darkblue/displayParticipants.css Diff File
mod - styles/expressions.css Diff File
mod - styles/gringegreen/adminstyle-rtl.css Diff File
mod - templates/limespired/template.css Diff File

develop 653f7017

2015-06-15 16:03

sammousa


Details Diff
Dev Refactored common_helper functions.
mod - application/config/internal.php Diff File
mod - application/controllers/DevController.php Diff File
mod - application/controllers/QuestionsController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/export/DocWriter.php Diff File
mod - application/helpers/admin/export/PdfWriter.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/label_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/SavedControl.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/saved/savedbar_view.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 852 853 854 855 856 857 858 ... 900 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last