Changesets: LimeSurvey

Search Browse Back to Index

master 646ecdac

2016-10-15 16:07:38

DenisChenu

Details Diff 		Fixed issue 11702: Dropdown question : 2 'no answer' if value selected is 0

# Conflicts:
# application/views/survey/questions/list_dropdown/answer.php		 Affected Issues
11702
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html a027f11a

2016-10-15 16:00:16

DenisChenu

Details Diff 		Fixed issue 11702: Dropdown question : 2 'no answer' if value selected is 0 Affected Issues
11702
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html c6ccf7b5

2016-10-15 15:38:03

DenisChenu

Details Diff 		Fixed issue 11779: Ranking question different styling
Dev: height are really hard to fix : We need a margin bottom
Dev: set the height fix the issue with border-box
Dev: BUT border-box is not apply when using min-height
Dec: We CAN NOT use height : some element can be hidden : then the list can be bigger with array filtering after		 Affected Issues
11779
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/ranking/answer.php Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File

answers_html 2879302c

2016-10-15 14:49:22

DenisChenu

Details Diff 		New feature 11798: Wrapper to end url and othe url (then can add it directly) Affected Issues
11798
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File

answers_html 1ea9bac8

2016-10-15 14:22:40

DenisChenu

Details Diff 		Dev: #11801: Move views/survey/system/display.php to layout
Dev: remove usage of common_helper
Dev: remove Basic CMS Integration support (depecated : see https://manual.limesurvey.org/The_template_editor#Basic_CMS_Integration_support)		 Affected Issues
11801
mod - application/controllers/SurveyController.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/views/layouts/survey.php Diff File
mod - application/views/survey/system/display.php Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - templates/basic/config.xml Diff File
mod - templates/test/config.xml Diff File

answers_html 4d0107e8

2016-10-15 11:07:08

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html
Attach Issues:
mod - scripts/array-totalsum.js Diff File
mod - scripts/expressions/em_javascript.js Diff File

master 56dc3fe9

2016-10-15 11:06:40

DenisChenu

Details Diff 		Fixed issue 11740: Decimal throwerreor with negative value
Dev: Put a try everywhere using Decimal(value), unsure we need it everywhere, but don't seem to be an issue
Dev: Didn't update anything else		 Affected Issues
11740
mod - scripts/array-totalsum.js Diff File
mod - scripts/expressions/em_javascript.js Diff File

answers_html 33a1dd42

2016-10-15 11:00:42

DenisChenu

Details Diff 		Fixed issue 11740: Decimal throwerreor with negative value
Dev: Put a try everywhere using Decimal(value), unsure we need it everywhere		 Affected Issues
11740
mod - scripts/array-totalsum.js Diff File
mod - scripts/expressions/em_javascript.js Diff File

answers_html 84c13e7e

2016-10-15 10:44:24

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html

# Conflicts:
# scripts/expressions/em_javascript.js
Attach Issues:
mod - application/controllers/InstallerController.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - scripts/expressions/em_javascript.js Diff File

master 8341e9fe

2016-10-14 17:17:55

ollehar1


Committer: GitHub Details Diff 		Merge pull request #440 from BertHankes/patch-5

Update Token.php
Attach Issues:
mod - application/models/Token.php Diff File

master 2748c259

2016-10-14 16:38:38

ollehar

Details Diff 		Fixed issue 11731: Regexp validation for short-text question Affected Issues
11731
mod - scripts/expressions/em_javascript.js Diff File

master 9d18c35f

2016-10-14 15:05:37

ollehar

Details Diff 		Dev: Silently check some default PHP extensions at install
Attach Issues:
mod - application/controllers/InstallerController.php Diff File

master f694f914

2016-10-14 13:00:00

ollehar

Details Diff 		Fixed issue 11768: Window for old token tables too small Affected Issues
11768
mod - application/views/admin/token/tokenwarning.php Diff File

answers_html 5b45926c

2016-10-14 12:34:42

DenisChenu

Details Diff 		Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey into answers_html
Attach Issues:
mod - application/config/version.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File

answers_html 34e234a4

2016-10-14 12:33:40

DenisChenu

Details Diff 		Dev: remove error/success class for emtip
Dev: new class : le-em-tip + use event in core/survey.js
Attach Issues:
mod - application/core/packages/limesurvey/survey.js Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/views/survey/questions/multiplenumeric/answer_input.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/dynamic.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
mod - templates/basic/pstpl/endpage.pstpl Diff File
mod - templates/basic/pstpl/startpage.pstpl Diff File
mod - templates/default/scripts/template.js Diff File

master 0ef881cf

2016-10-14 11:41:50

ollehar

Details Diff 		Fixed issue 11753: Date validation issues Affected Issues
11753
mod - scripts/expressions/em_javascript.js Diff File

answers_html eb89ed22

2016-10-14 10:56:56

DenisChenu

Details Diff 		Dev : add (answers_html) to version number (more clear in admin GUI)
Attach Issues:
mod - application/config/version.php Diff File

answers_html ada5d2f8

2016-10-14 10:55:08

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html

# Conflicts:
# application/config/version.php
Attach Issues:
mod - application/config/version.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File

answers_html cc3775f1

2016-10-14 10:51:19

DenisChenu

Details Diff 		Dev: readd border in default
Attach Issues:
mod - templates/default/css/template.css Diff File

answers_html 931574b9

2016-10-14 10:46:43

DenisChenu

Details Diff 		Dev: rename base_awesome to basic
Dev: rm tfr, rename base to test
Attach Issues:
mod - application/models/Template.php Diff File
rm - templates/base_awesome/js/template.js Diff File
add - templates/basic/js/template.js Diff File
rm - templates/tfr-base/LICENSE.txt Diff File
rm - templates/tfr-base/README.md Diff File
rm - templates/tfr-base/config.xml Diff File
rm - templates/tfr-base/css/template.css Diff File
rm - templates/tfr-base/css/template.css.map Diff File
rm - templates/tfr-base/css/template_ie8.css Diff File
rm - templates/tfr-base/css/template_ie8.css.map Diff File
rm - templates/tfr-base/css/vendor/bootstrap-slider/bootstrap-slider.css Diff File
rm - templates/tfr-base/css/vendor/bootstrap-slider/bootstrap-slider.min.css Diff File
rm - templates/tfr-base/css/vendor/bootstrap/bootstrap.min.css Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_flat_75_ffffff_40x100.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_glass_65_ffffff_1x400.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_glass_75_dadada_1x400.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_glass_95_fef1ec_1x400.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-icons_222222_256x240.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-icons_2e83ff_256x240.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-icons_454545_256x240.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-icons_888888_256x240.png Diff File
rm - templates/tfr-base/css/vendor/jquery/images/ui-icons_cd0a0a_256x240.png Diff File
rm - templates/tfr-base/css/vendor/jquery/jquery-ui-custom.css Diff File
rm - templates/tfr-base/favicon.ico Diff File
rm - templates/tfr-base/fonts/entypo/entypo-webfont.woff Diff File
rm - templates/tfr-base/fonts/entypo/entypo-webfont.woff2 Diff File
rm - templates/tfr-base/fonts/survicon/selection.json Diff File
rm - templates/tfr-base/fonts/survicon/surv.eot Diff File
rm - templates/tfr-base/fonts/survicon/surv.svg Diff File
rm - templates/tfr-base/fonts/survicon/surv.ttf Diff File
rm - templates/tfr-base/fonts/survicon/surv.woff Diff File
rm - templates/tfr-base/images/dot-1x2.png Diff File
rm - templates/tfr-base/images/dot-1x3.png Diff File
rm - templates/tfr-base/images/dot-3x1.png Diff File
rm - templates/tfr-base/images/logo-tfr.png Diff File
rm - templates/tfr-base/images/logo.png Diff File
rm - templates/tfr-base/images/logo@2x.png Diff File
rm - templates/tfr-base/images/logo@3x.png Diff File
rm - templates/tfr-base/images/print_img_checkbox.png Diff File
rm - templates/tfr-base/images/print_img_radio.png Diff File
rm - templates/tfr-base/images/squaregrid.gif Diff File
rm - templates/tfr-base/images/tfr-small.png Diff File
rm - templates/tfr-base/images/tfr-small@2x.png Diff File
rm - templates/tfr-base/images/tfr-small@3x.png Diff File
rm - templates/tfr-base/js/template.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/affix.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/alert.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/bootstrap.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/bootstrap.min.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/button.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/carousel.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/collapse.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/dropdown.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/modal.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/popover.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/scrollspy.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/tab.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/tooltip.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-sass/js/transition.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-slider/bootstrap-slider.js Diff File
rm - templates/tfr-base/js/vendor/bootstrap-slider/bootstrap-slider.min.js Diff File
rm - templates/tfr-base/js/vendor/jquery/jquery.js Diff File
rm - templates/tfr-base/js/vendor/retina/retina.js Diff File
rm - templates/tfr-base/js/vendor/retina/retina.min.js Diff File
rm - templates/tfr-base/preview.png Diff File
rm - templates/tfr-base/print_template.css Diff File
rm - templates/tfr-base/template.css Diff File
rm - templates/tfr-base/template.js Diff File
rm - templates/tfr-base/template_ie8.css Diff File
rm - templates/tfr-base/test/templatedemo.lss Diff File
rm - templates/tfr-base/test/templatestore.lss Diff File
rm - templates/tfr-base/test/templatetest.lss Diff File
rm - templates/tfr-base/tfr-base.png Diff File
rm - templates/tfr-base/tfr.png Diff File
rm - templates/tfr-base/views/assessment.pstpl Diff File
rm - templates/tfr-base/views/clearall.pstpl Diff File
rm - templates/tfr-base/views/completed.pstpl Diff File
rm - templates/tfr-base/views/endgroup.pstpl Diff File
rm - templates/tfr-base/views/endpage.pstpl Diff File
rm - templates/tfr-base/views/groupdescription.pstpl Diff File
rm - templates/tfr-base/views/load.pstpl Diff File
rm - templates/tfr-base/views/navigator.pstpl Diff File
rm - templates/tfr-base/views/print_group.pstpl Diff File
rm - templates/tfr-base/views/print_question.pstpl Diff File
rm - templates/tfr-base/views/print_survey.pstpl Diff File
rm - templates/tfr-base/views/printanswers.pstpl Diff File
rm - templates/tfr-base/views/privacy.pstpl Diff File
rm - templates/tfr-base/views/question.pstpl Diff File
rm - templates/tfr-base/views/register.pstpl Diff File
rm - templates/tfr-base/views/save.pstpl Diff File
rm - templates/tfr-base/views/startgroup.pstpl Diff File
rm - templates/tfr-base/views/startpage.pstpl Diff File
rm - templates/tfr-base/views/survey.pstpl Diff File
rm - templates/tfr-base/views/survey/system/questionhelp/mandatory_tip.php Diff File
rm - templates/tfr-base/views/survey/system/questionhelp/questionhelp.php Diff File
rm - templates/tfr-base/views/survey/system/questionhelp/tips.php Diff File
rm - templates/tfr-base/views/surveylist.pstpl Diff File
rm - templates/tfr-base/views/welcome.pstpl Diff File

answers_html 4fb88ed6

2016-10-14 10:33:50

DenisChenu

Details Diff 		Fixed issue 11781 : default template save.pstpl load.pstpl completed.pstpl
Dev: Fixed some row issue (col-sm-X > ls-input-group seems to be the good way)
Dev: preparing basic (base_awesome)		 Affected Issues
11781
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/core/packages/limesurvey/survey.js Diff File
mod - application/views/survey/questions/arrays/dualscale/answer_dropdown.php Diff File
mod - application/views/survey/questions/date/dropdown/answer.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
add - application/views/survey/system/actionButton/clearAll.php Diff File
add - application/views/survey/system/actionLink/clearAll.php Diff File
mod - application/views/survey/system/saveForm/anonymized.php Diff File
mod - templates/base_awesome/css/template-core.css Diff File
mod - templates/base_awesome/css/template.css Diff File
mod - templates/base_awesome/pstpl/completed.pstpl Diff File
mod - templates/base_awesome/pstpl/endpage.pstpl Diff File
mod - templates/base_awesome/pstpl/navigator.pstpl Diff File
mod - templates/base_awesome/pstpl/question.pstpl Diff File
mod - templates/base_awesome/pstpl/save.pstpl Diff File
mod - templates/default/views/completed.pstpl Diff File
mod - templates/default/views/load.pstpl Diff File
mod - templates/default/views/register.pstpl Diff File
mod - templates/default/views/save.pstpl Diff File

master 1602b3ff

2016-10-14 10:14:00

c_schmitz

Details Diff 		Release 2.54.3 Build 161014
Attach Issues:
mod - application/config/version.php Diff File
mod - docs/release_notes.txt Diff File

master 0b035ef5

2016-10-14 10:10:46

LimeSurvey Translations Bot

Details Diff 		Updated translation: Catalan by qualitatuvic
Updated translation: Spanish (Spain) by aesteban
Updated translation: French (France) by arnaud21, DenisChenu
Updated translation: German (Informal) by c_schmitz
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File

answers_html e66a2d79

2016-10-14 08:52:00

DenisChenu

Details Diff 		Merge branch 'answers_html' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html-mergedMaster
Attach Issues:
mod - application/core/packages/limesurvey/survey.js Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/views/survey/frontpage/enterToken.php Diff File
mod - scripts/survey_runtime.js Diff File

questionobject_prototype1 6142e67e

2016-10-14 01:15:25

ollehar1

Details Diff 		Dev: Define question object as a module, first try with render view from question module controller
Attach Issues:
mod - application/config/internal.php Diff File
rm - application/core/questions/ArrayQuestionObject/ArrayQuestionObjectAdminController.php Diff File
add - application/core/questions/ArrayQuestionObject/ArrayQuestionObjectModule.php Diff File
add - application/core/questions/ArrayQuestionObject/controllers/AdminController.php Diff File
add - application/core/questions/ArrayQuestionObject/views/admin/view.php Diff File
mod - application/helpers/QuestionObjectHelper.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 603 604 605 606 607 608 609 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1450 1451 1452  Next  Last