LimeSurvey: develop ce68e629

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-11-25 18:48 develop 75e85d34
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

Conflicts:

application/config/third_party.php
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
add - application/views/admin/export/generatestats/_statisticsoutput_footer.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/statistics_subviews/_statistics_view_scripts.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - scripts/admin/statistics.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
add - third_party/dom-to-image/.gitattributes Diff File
add - third_party/dom-to-image/.gitignore Diff File
add - third_party/dom-to-image/.jsbeautifyrc Diff File
add - third_party/dom-to-image/.jshintrc Diff File
add - third_party/dom-to-image/.stylelintrc Diff File
add - third_party/dom-to-image/Gruntfile.js Diff File
add - third_party/dom-to-image/LICENSE Diff File
add - third_party/dom-to-image/README.md Diff File
add - third_party/dom-to-image/bower.json Diff File
add - third_party/dom-to-image/dist/dom-to-image.min.js Diff File
add - third_party/dom-to-image/karma.conf.js Diff File
add - third_party/dom-to-image/package.json Diff File
add - third_party/dom-to-image/spec/dom-to-image.spec.js Diff File
add - third_party/dom-to-image/spec/resources/bgcolor/control-image Diff File
add - third_party/dom-to-image/spec/resources/bgcolor/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/bgcolor/style.css Diff File
add - third_party/dom-to-image/spec/resources/big/control-image Diff File
add - third_party/dom-to-image/spec/resources/bigger/control-image Diff File
add - third_party/dom-to-image/spec/resources/bigger/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/bigger/style.css Diff File
add - third_party/dom-to-image/spec/resources/border/control-image Diff File
add - third_party/dom-to-image/spec/resources/border/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/border/style.css Diff File
add - third_party/dom-to-image/spec/resources/canvas/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/canvas/style.css Diff File
add - third_party/dom-to-image/spec/resources/css-bg/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/css-bg/style.css Diff File
add - third_party/dom-to-image/spec/resources/dimensions/control-image Diff File
add - third_party/dom-to-image/spec/resources/dimensions/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/dimensions/style.css Diff File
add - third_party/dom-to-image/spec/resources/ext-css/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/ext-css/style.css Diff File
add - third_party/dom-to-image/spec/resources/filter/control-image Diff File
add - third_party/dom-to-image/spec/resources/filter/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/filter/style.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/fonts/style.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/embedded.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/empty.html Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/remote.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/rules-relative.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/rules-relative.html Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/rules.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/with-query.css Diff File
add - third_party/dom-to-image/spec/resources/hash/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/hash/style.css Diff File
add - third_party/dom-to-image/spec/resources/images/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/images/image.jpeg Diff File
add - third_party/dom-to-image/spec/resources/images/image.png Diff File
add - third_party/dom-to-image/spec/resources/images/style.css Diff File
add - third_party/dom-to-image/spec/resources/input/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/input/style.css Diff File
add - third_party/dom-to-image/spec/resources/page.html Diff File
add - third_party/dom-to-image/spec/resources/pixeldata/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/pixeldata/style.css Diff File
add - third_party/dom-to-image/spec/resources/pseudo/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/pseudo/style.css Diff File
add - third_party/dom-to-image/spec/resources/scale/control-image Diff File
add - third_party/dom-to-image/spec/resources/scale/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/scale/style.css Diff File
add - third_party/dom-to-image/spec/resources/scroll/control-image Diff File
add - third_party/dom-to-image/spec/resources/scroll/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/scroll/style.css Diff File
add - third_party/dom-to-image/spec/resources/sheet/control-image Diff File
add - third_party/dom-to-image/spec/resources/sheet/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/sheet/sheet.css Diff File
add - third_party/dom-to-image/spec/resources/sheet/style.css Diff File
add - third_party/dom-to-image/spec/resources/small/control-image Diff File
add - third_party/dom-to-image/spec/resources/small/control-image-jpeg Diff File
add - third_party/dom-to-image/spec/resources/small/control-image-jpeg-low Diff File
add - third_party/dom-to-image/spec/resources/small/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/small/style.css Diff File
add - third_party/dom-to-image/spec/resources/style/control-image Diff File
add - third_party/dom-to-image/spec/resources/style/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/style/style.css Diff File
add - third_party/dom-to-image/spec/resources/svg-ns/control-image Diff File
add - third_party/dom-to-image/spec/resources/svg-ns/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/svg-ns/style.css Diff File
add - third_party/dom-to-image/spec/resources/svg-rect/control-image Diff File
add - third_party/dom-to-image/spec/resources/svg-rect/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/svg-rect/style.css Diff File
add - third_party/dom-to-image/spec/resources/text/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/text/style.css Diff File
add - third_party/dom-to-image/spec/resources/textarea/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/textarea/style.css Diff File
add - third_party/dom-to-image/spec/resources/util/fontawesome.base64 Diff File
add - third_party/dom-to-image/spec/resources/util/fontawesome.woff2 Diff File
add - third_party/dom-to-image/src/dom-to-image.js Diff File
add - third_party/es6promise/es6-promise.auto.min.js Diff File
add - third_party/jspdf/createpdf_worker.js Diff File
add - third_party/jspdf/jspdf.debug.js Diff File
add - third_party/jspdf/jspdf.min.js Diff File