Changesets: LimeSurvey
fancytree_new 81d6ea8d 2016-11-30 17:48:16
|
Merged branch master into fancytree_new | ||
mod - application/controllers/admin/limereplacementfields.php | Diff File | ||
mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
mod - application/helpers/export_helper.php | Diff File | ||
mod - application/views/admin/global_settings/_general.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
master cc874399 2016-11-30 17:48:16
|
Revert "Merged branch master into fancytree_new" This reverts commit 81d6ea8db06060d3e984d5efb894cc5bb8384eb2. |
||
mod - application/controllers/admin/limereplacementfields.php | Diff File | ||
mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
mod - application/helpers/export_helper.php | Diff File | ||
mod - application/views/admin/global_settings/_general.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
master d072069f 2016-11-30 17:48:16
|
Revert "Revert "Merged branch master into fancytree_new"" This reverts commit cc8743996b93724f96cc3718f903d49bedd4bfb3. |
||
mod - application/controllers/admin/limereplacementfields.php | Diff File | ||
mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
mod - application/helpers/export_helper.php | Diff File | ||
mod - application/views/admin/global_settings/_general.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
fancytree_new a4fa1f7a 2016-11-30 17:47:54
|
Dev: optimized Methods for selecting and editing | ||
mod - scripts/admin/fancytree.surveyview.js | Diff File | ||
fancytree_new f357c1c8 2016-11-30 17:41:40
|
Dev: implemented oneclick/dblclick functionality | ||
mod - application/controllers/admin/questiongroups.php | Diff File | ||
mod - application/views/admin/super/_question_explorer.php | Diff File | ||
mod - scripts/admin/fancytree.surveyview.js | Diff File | ||
mod - scripts/admin/jquery.fancytree.bsbuttonbar.js | Diff File | ||
master 315265a1 2016-11-30 16:52:40 Details Diff |
Fixed issue 11968: Correct "Google Analytics API Key" to "Google Analytics Tracking ID" |
Affected Issues 11968 |
|
mod - application/views/admin/global_settings/_general.php | Diff File | ||
fancytree_new 31cf998f 2016-11-30 16:51:05
|
Dev: fixed colors and optimized lime-admin-colors.css.map | ||
mod - application/views/admin/super/_question_explorer.php | Diff File | ||
mod - scripts/admin/fancytree.surveyview.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/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/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/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/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/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/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/scripts/sidemenu.js | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-colors.css | Diff File | ||
add - styles/Sea_Green/css/lime-admin-colors.css.map | Diff File | ||
mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-colors.css | Diff File | ||
add - styles/Sunset_Orange/css/lime-admin-colors.css.map | Diff File | ||
mod - styles/Sunset_Orange/scripts/sidemenu.js | Diff File | ||
2.06lts 52f7df56 2016-11-30 16:26:50 Details Diff |
[feature] Order survey listing by date desc by default | ||
mod - CHANGELOG.md | Diff File | ||
mod - application/controllers/admin/index.php | Diff File | ||
mod - scripts/admin/listsurvey.js | Diff File | ||
develop 1407274a 2016-11-30 15:40:59 Details Diff |
Fixed issue 11952: Template font - language specific characters Dev: update LatoFont, add BoldItalic |
Affected Issues 11952 |
|
mod - templates/default/css/bootstrap.css | Diff File | ||
add - templates/default/fonts/Lato-Bold.eot | Diff File | ||
add - templates/default/fonts/Lato-Bold.ttf | Diff File | ||
add - templates/default/fonts/Lato-Bold.woff | Diff File | ||
add - templates/default/fonts/Lato-Bold.woff2 | Diff File | ||
add - templates/default/fonts/Lato-BoldItalic.eot | Diff File | ||
add - templates/default/fonts/Lato-BoldItalic.ttf | Diff File | ||
add - templates/default/fonts/Lato-BoldItalic.woff | Diff File | ||
add - templates/default/fonts/Lato-BoldItalic.woff2 | Diff File | ||
add - templates/default/fonts/Lato-Italic.eot | Diff File | ||
add - templates/default/fonts/Lato-Italic.ttf | Diff File | ||
add - templates/default/fonts/Lato-Italic.woff | Diff File | ||
add - templates/default/fonts/Lato-Italic.woff2 | Diff File | ||
add - templates/default/fonts/Lato-OFL.txt | Diff File | ||
add - templates/default/fonts/Lato-Regular.eot | Diff File | ||
add - templates/default/fonts/Lato-Regular.ttf | Diff File | ||
add - templates/default/fonts/Lato-Regular.woff | Diff File | ||
add - templates/default/fonts/Lato-Regular.woff2 | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-700.eot | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-700.svg | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-700.ttf | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-700.woff | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-700.woff2 | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-italic.eot | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-italic.svg | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-italic.ttf | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-italic.woff | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-italic.woff2 | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-regular.eot | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-regular.svg | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-regular.ttf | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-regular.woff | Diff File | ||
rm - templates/default/fonts/lato-v11-latin-regular.woff2 | Diff File | ||
develop 43d8a7b7 2016-11-30 15:12:53 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop | ||
mod - application/controllers/admin/limereplacementfields.php | Diff File | ||
mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
mod - application/helpers/export_helper.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
fancytree_new 5a23b30a 2016-11-30 15:10:42
|
Dev: fixed colors for the new fancytree branch | ||
mod - styles/Apple_Blossom/css/lime-admin-colors.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-colors.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-colors.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-colors.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-colors.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-colors.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-colors.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-colors.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-colors.css | Diff File | ||
master 3cf54e08 2016-11-30 14:01:38 Committer: GitHub Details Diff |
Merge pull request #604 from BertHankes/patch-26 Fixed issue 11950: Data corrupts buy copy survey. unconditional stripping of ']]>' |
Affected Issues 11950 |
|
mod - application/helpers/export_helper.php | Diff File | ||
master 6cb1d4d3 2016-11-30 13:44:44 Details Diff |
Fixed issue 11968: Correct "Google Analytics API Key" to "Google Analytics Tracking ID" |
Affected Issues 11968 |
|
mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
master f6f5ee0f 2016-11-30 13:41:21 Details Diff |
Fixed issue 11960: Cannot use the placeholder button for confirmation email templates |
Affected Issues 11960 |
|
mod - application/controllers/admin/limereplacementfields.php | Diff File | ||
mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
fancytree_new 3e0beed6 2016-11-30 13:06:54
|
Dev: updated js anc common-css for all admin styles | ||
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
mod - styles/Apple_Blossom/scripts/sidemenu.js | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
mod - styles/Bay_of_Many/scripts/sidemenu.js | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
mod - styles/Black_Pearl/scripts/sidemenu.js | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
mod - styles/Dark_Sky/scripts/sidemenu.js | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
mod - styles/Free_Magenta/scripts/sidemenu.js | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
mod - styles/Noto_All_Languages/scripts/sidemenu.js | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
mod - styles/Purple_Tentacle/scripts/sidemenu.js | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
mod - styles/Sunset_Orange/scripts/sidemenu.js | Diff File | ||
fancytree_new 7dae2060 2016-11-30 13:01:03
|
Dev: reimplemented QuickMenu working | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
cpdb_filter d7e54f25 2016-11-30 12:57:24 Details Diff |
Dev: Formating | ||
mod - application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php | Diff File | ||
fancytree_new 6750bc26 2016-11-29 18:25:44
|
Dev: added quickmenu again. NOT WORKING | ||
mod - application/views/admin/pluginmanager/index.php | Diff File | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
fancytree_new 6a538668 2016-11-29 18:24:22
|
Dev: corrected a small javascript error, that was blocking | ||
mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
develop 03b406b7 2016-11-29 16:15:15 Details Diff |
Dev: issue 11963: 404 better managed by view Dev: only 404 currently, use default template |
Affected Issues 11963 |
|
mod - application/controllers/SurveysController.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - application/views/system/error404.php | Diff File | ||
fancytree_new 4eeee616 2016-11-29 16:11:14
|
Dev: Fixed sidebar scaling on ff | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
cpdb_filter 76bab5e1 2016-11-29 13:42:59 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
mod - .gitignore | Diff File | ||
mod - application/config/third_party.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 | ||
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 - styles/Sea_Green/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 | ||
2.06lts e500aaa8 2016-11-29 09:53:11 Details Diff |
[fix] No plugin included in GIT | ||
mod - .gitignore | Diff File | ||
mod - CHANGELOG.md | Diff File | ||
fancytree_new bf1ae489 2016-11-28 18:11:23
|
Dev: moved Question/Questiongroup list buttons | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
mod - scripts/admin/jquery.fancytree.bsbuttonbar.js | Diff File | ||
fancytree_new d7a713b8 2016-11-28 15:07:28
|
Merged branch master into fancytree_new | ||
mod - .gitignore | Diff File |