LimeSurvey: cpdb_filter f31bd2a5

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cpdb_filter 2016-12-01 11:02:42 cpdb_filter d7e54f25
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - application/config/config-defaults.php Diff File
mod - application/config/third_party.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/super/_question_explorer.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/survey/questions/language/answer.php Diff File
mod - docs/release_notes.txt Diff File
add - scripts/admin/fancytree.surveyview.js Diff File
add - scripts/admin/jquery.fancytree.bsbuttonbar.js Diff File
add - scripts/admin/jquery.fancytree.bstooltip.js Diff File
mod - scripts/admin/labels.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-colors.css Diff File
add - styles/Apple_Blossom/css/lime-admin-colors.css.map 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-colors.css Diff File
add - styles/Bay_of_Many/css/lime-admin-colors.css.map 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-colors.css Diff File
add - styles/Black_Pearl/css/lime-admin-colors.css.map 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-colors.css Diff File
add - styles/Dark_Sky/css/lime-admin-colors.css.map 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-colors.css Diff File
add - styles/Free_Magenta/css/lime-admin-colors.css.map 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-colors.css Diff File
add - styles/Noto_All_Languages/css/lime-admin-colors.css.map 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-colors.css Diff File
add - styles/Purple_Tentacle/css/lime-admin-colors.css.map Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
add - styles/Sea_Green/css/lime-admin-colors.css.map Diff File
add - styles/Sunset_Orange/css/lime-admin-colors.css.map Diff File
add - third_party/fancytree/.editorconfig Diff File
add - third_party/fancytree/.github/CONTRIBUTING.md Diff File
add - third_party/fancytree/.github/ISSUE_TEMPLATE.md Diff File
add - third_party/fancytree/.gitignore Diff File
add - third_party/fancytree/.jshintrc Diff File
add - third_party/fancytree/.travis.yml Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/contextmenu.html Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/css/jquery.contextMenu.css Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/cut.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/door.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/page_white_add.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/page_white_copy.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/page_white_delete.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/page_white_edit.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/images/page_white_paste.png Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/js/jquery.contextMenu-1.6.5.js Diff File
add - third_party/fancytree/3rd-party/extensions/contextmenu/js/jquery.fancytree.contextMenu.js Diff File
add - third_party/fancytree/3rd-party/extensions/hotkeys/hotkeys.html Diff File
add - third_party/fancytree/3rd-party/extensions/hotkeys/js/jquery.fancytree.hotkeys.js Diff File
add - third_party/fancytree/3rd-party/extensions/hotkeys/js/jquery.hotkeys.js Diff File
add - third_party/fancytree/CHANGELOG.md Diff File
add - third_party/fancytree/Gruntfile.coffee Diff File
add - third_party/fancytree/LICENSE.txt Diff File
add - third_party/fancytree/README.md Diff File
add - third_party/fancytree/bin/conf.json Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/README.md Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/publish.js Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/static/styles/jsdoc-default.css Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/static/styles/node-dark.css Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/container.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/details.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/example.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/examples.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/exceptions.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/fires.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/layout.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/mainpage.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/members.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/method.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/method_sig.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/methods.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/params.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/properties.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/returns.tmpl Diff File
add - third_party/fancytree/bin/jsdoc3-moogle/tmpl/tutorial.tmpl Diff File
add - third_party/fancytree/bin/make_doc.sh Diff File
add - third_party/fancytree/bin/release-sample.js Diff File
add - third_party/fancytree/bower.json Diff File
add - third_party/fancytree/demo/ajax-empty.json Diff File
add - third_party/fancytree/demo/ajax-parse-error.json Diff File
add - third_party/fancytree/demo/ajax-pws-error.json Diff File
add - third_party/fancytree/demo/ajax-pws-ok.json Diff File
add - third_party/fancytree/demo/ajax-sub.xml Diff File
add - third_party/fancytree/demo/ajax-sub2.json Diff File
add - third_party/fancytree/demo/ajax-tree-decide.json Diff File
add - third_party/fancytree/demo/ajax-tree-dom.json Diff File
add - third_party/fancytree/demo/ajax-tree-fs.json Diff File
add - third_party/fancytree/demo/ajax-tree-instruments.json Diff File
add - third_party/fancytree/demo/ajax-tree-local.json Diff File
add - third_party/fancytree/demo/ajax-tree-plain.json Diff File
add - third_party/fancytree/demo/ajax-tree-products.json Diff File
add - third_party/fancytree/demo/ajax-tree-taxonomy.json Diff File
add - third_party/fancytree/demo/ajax-tree.json Diff File
add - third_party/fancytree/demo/ajax-tree.xml Diff File
add - third_party/fancytree/demo/fancytree-server.js Diff File
add - third_party/fancytree/demo/index.html Diff File
add - third_party/fancytree/demo/nav.html Diff File
add - third_party/fancytree/demo/nav_bg.png Diff File
add - third_party/fancytree/demo/sample-3rd-contextmenu-abs.html Diff File
add - third_party/fancytree/demo/sample-3rd-ui-contextmenu.html Diff File
add - third_party/fancytree/demo/sample-accordion.html Diff File
add - third_party/fancytree/demo/sample-api.html Diff File
add - third_party/fancytree/demo/sample-configurator.html Diff File
add - third_party/fancytree/demo/sample-default.html Diff File
add - third_party/fancytree/demo/sample-events.html Diff File
add - third_party/fancytree/demo/sample-ext-awesome-3.html Diff File
add - third_party/fancytree/demo/sample-ext-awesome.html Diff File
add - third_party/fancytree/demo/sample-ext-bootstrap.html Diff File
add - third_party/fancytree/demo/sample-ext-childcounter.html Diff File
add - third_party/fancytree/demo/sample-ext-clones.html Diff File
add - third_party/fancytree/demo/sample-ext-columnview.html Diff File
add - third_party/fancytree/demo/sample-ext-dnd.html Diff File
add - third_party/fancytree/demo/sample-ext-edit.html Diff File
add - third_party/fancytree/demo/sample-ext-filter.html Diff File
add - third_party/fancytree/demo/sample-ext-menu-deprecated.html Diff File
add - third_party/fancytree/demo/sample-ext-menu.html Diff File
add - third_party/fancytree/demo/sample-ext-persist.html Diff File
add - third_party/fancytree/demo/sample-ext-table.html Diff File
add - third_party/fancytree/demo/sample-ext-themeroller.html Diff File
add - third_party/fancytree/demo/sample-ext-wide.html Diff File
add - third_party/fancytree/demo/sample-form.html Diff File
add - third_party/fancytree/demo/sample-iframe-1.html Diff File
add - third_party/fancytree/demo/sample-iframe.html Diff File
add - third_party/fancytree/demo/sample-json.html Diff File
add - third_party/fancytree/demo/sample-keyboard.html Diff File
add - third_party/fancytree/demo/sample-load-errors.html Diff File
add - third_party/fancytree/demo/sample-load-errors2.html Diff File
add - third_party/fancytree/demo/sample-load-xml.html Diff File
add - third_party/fancytree/demo/sample-multi-dnd.html Diff File
add - third_party/fancytree/demo/sample-multi-ext.html Diff File
add - third_party/fancytree/demo/sample-multiline.html Diff File
add - third_party/fancytree/demo/sample-rtl.html Diff File
add - third_party/fancytree/demo/sample-scroll.html Diff File
add - third_party/fancytree/demo/sample-select.html Diff File
add - third_party/fancytree/demo/sample-source.html Diff File
add - third_party/fancytree/demo/sample-theming.html Diff File
add - third_party/fancytree/demo/sample-tooltip.html Diff File
add - third_party/fancytree/demo/sample-webservice.html Diff File
add - third_party/fancytree/demo/sample-xxl.html Diff File
add - third_party/fancytree/demo/sample.css Diff File
add - third_party/fancytree/demo/sample.js Diff File
add - third_party/fancytree/demo/skin-custom/accept.png Diff File
add - third_party/fancytree/demo/skin-custom/arrow_right.png Diff File
add - third_party/fancytree/demo/skin-custom/bug.png Diff File
add - third_party/fancytree/demo/skin-custom/cancel.png Diff File
add - third_party/fancytree/demo/skin-custom/custom.css Diff File
add - third_party/fancytree/demo/skin-custom/customDoc1.gif Diff File
add - third_party/fancytree/demo/skin-custom/customDoc2.gif Diff File
add - third_party/fancytree/demo/skin-custom/customFolder1.gif Diff File
add - third_party/fancytree/demo/skin-custom/doc_with_children.gif Diff File
add - third_party/fancytree/demo/skin-custom/emoticon_smile.png Diff File
add - third_party/fancytree/demo/skin-custom/emoticon_unhappy.png Diff File
add - third_party/fancytree/demo/skin-custom/error.png Diff File
add - third_party/fancytree/demo/skin-custom/exclamation.png Diff File
add - third_party/fancytree/demo/skin-custom/eye.png Diff File
add - third_party/fancytree/demo/skin-custom/flag_red.png Diff File
add - third_party/fancytree/demo/skin-custom/folder_bug.png Diff File
add - third_party/fancytree/demo/skin-custom/folder_docs.gif Diff File
add - third_party/fancytree/demo/skin-custom/folder_images.gif Diff File
add - third_party/fancytree/demo/skin-custom/folder_page.gif Diff File
add - third_party/fancytree/demo/skin-custom/help.png Diff File
add - third_party/fancytree/demo/skin-custom/key.png Diff File
add - third_party/fancytree/demo/skin-custom/new.png Diff File
add - third_party/fancytree/demo/skin-custom/note.png Diff File
add - third_party/fancytree/demo/skin-custom/page_white_lightning.png Diff File
add - third_party/fancytree/demo/skin-custom/page_white_star.png Diff File
add - third_party/fancytree/demo/taxonomy-browser/LICENSE.txt Diff File
add - third_party/fancytree/demo/taxonomy-browser/README.md Diff File
add - third_party/fancytree/demo/taxonomy-browser/TODO.md Diff File
add - third_party/fancytree/demo/taxonomy-browser/busy_bg_eee.png Diff File
add - third_party/fancytree/demo/taxonomy-browser/busy_bg_fff.png Diff File
add - third_party/fancytree/demo/taxonomy-browser/details.tmpl.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/details_itis.tmpl Diff File
add - third_party/fancytree/demo/taxonomy-browser/header.tmpl.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/index.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/index_itis.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/info-pane.tmpl.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/media.tmpl.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/style.css Diff File
add - third_party/fancytree/demo/taxonomy-browser/taxonomy-browser-itis.js Diff File
add - third_party/fancytree/demo/taxonomy-browser/taxonomy-browser.js Diff File
add - third_party/fancytree/demo/taxonomy-browser/test_gbif_ws.html Diff File
add - third_party/fancytree/demo/taxonomy-browser/test_itis_ws.html Diff File
add - third_party/fancytree/demo/top.html Diff File
add - third_party/fancytree/demo/welcome.html Diff File
add - third_party/fancytree/dist/LICENSE.txt Diff File
add - third_party/fancytree/dist/jquery.fancytree-all.js Diff File
add - third_party/fancytree/dist/jquery.fancytree-all.min.js Diff File
add - third_party/fancytree/dist/jquery.fancytree.js Diff File
add - third_party/fancytree/dist/jquery.fancytree.min.js Diff File
add - third_party/fancytree/dist/skin-awesome/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-awesome/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-awesome/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-awesome/vline.gif Diff File
add - third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-bootstrap-ls/vline.gif Diff File
add - third_party/fancytree/dist/skin-bootstrap-n/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-bootstrap-n/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-bootstrap-n/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-bootstrap-n/vline.gif Diff File
add - third_party/fancytree/dist/skin-bootstrap/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-bootstrap/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-bootstrap/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-bootstrap/vline.gif Diff File
add - third_party/fancytree/dist/skin-common.less Diff File
add - third_party/fancytree/dist/skin-custom-1/README.md Diff File
add - third_party/fancytree/dist/skin-lion/icons.gif Diff File
add - third_party/fancytree/dist/skin-lion/loading.gif Diff File
add - third_party/fancytree/dist/skin-lion/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-lion/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-lion/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-lion/vline.gif Diff File
add - third_party/fancytree/dist/skin-themeroller/icons.gif Diff File
add - third_party/fancytree/dist/skin-themeroller/loading.gif Diff File
add - third_party/fancytree/dist/skin-themeroller/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-themeroller/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-themeroller/vline.gif Diff File
add - third_party/fancytree/dist/skin-vista/icons.gif Diff File
add - third_party/fancytree/dist/skin-vista/loading.gif Diff File
add - third_party/fancytree/dist/skin-vista/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-vista/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-vista/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-vista/vline.gif Diff File
add - third_party/fancytree/dist/skin-win7/icons.gif Diff File
add - third_party/fancytree/dist/skin-win7/loading.gif Diff File
add - third_party/fancytree/dist/skin-win7/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-win7/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-win7/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-win7/vline.gif Diff File
add - third_party/fancytree/dist/skin-win8-n/icons.gif Diff File
add - third_party/fancytree/dist/skin-win8-n/loading.gif Diff File
add - third_party/fancytree/dist/skin-win8-n/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-win8-n/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-win8-n/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-win8-n/vline.gif Diff File
add - third_party/fancytree/dist/skin-win8-xxl/icons.gif Diff File
add - third_party/fancytree/dist/skin-win8-xxl/loading.gif Diff File
add - third_party/fancytree/dist/skin-win8-xxl/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-win8-xxl/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-win8-xxl/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-win8-xxl/vline.gif Diff File
add - third_party/fancytree/dist/skin-win8/icons.gif Diff File
add - third_party/fancytree/dist/skin-win8/loading.gif Diff File
add - third_party/fancytree/dist/skin-win8/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-win8/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-win8/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-win8/vline.gif Diff File
add - third_party/fancytree/dist/skin-xp/icons-rtl.gif Diff File
add - third_party/fancytree/dist/skin-xp/icons.gif Diff File
add - third_party/fancytree/dist/skin-xp/loading.gif Diff File
add - third_party/fancytree/dist/skin-xp/ui.fancytree.css Diff File
add - third_party/fancytree/dist/skin-xp/ui.fancytree.less Diff File
add - third_party/fancytree/dist/skin-xp/ui.fancytree.min.css Diff File
add - third_party/fancytree/dist/skin-xp/vline-rtl.gif Diff File
add - third_party/fancytree/dist/skin-xp/vline.gif Diff File
add - third_party/fancytree/dist/src/jquery.fancytree.childcounter.js Diff File
add - third_party/fancytree/dist/src/jquery.fancytree.clones.js Diff File