Changesets: LimeSurvey

Search Browse Back to Index

answers_html 4d0107e8

2016-10-15 13:07

DenisChenu


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

master 56dc3fe9

2016-10-15 13:06

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 13:00

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 12:44

DenisChenu


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

# Conflicts:
# scripts/expressions/em_javascript.js
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 19:17

ollehar1

Committer: GitHub


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

Update Token.php
mod - application/models/Token.php Diff File

master 2748c259

2016-10-14 18: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 17:05

ollehar


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

master f694f914

2016-10-14 15: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 14:34

DenisChenu


Details Diff		 Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey into answers_html
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 14:33

DenisChenu


Details Diff		 Dev: remove error/success class for emtip
Dev: new class : le-em-tip + use event in core/survey.js
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 13:41

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 12:56

DenisChenu


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

answers_html ada5d2f8

2016-10-14 12:55

DenisChenu


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

# Conflicts:
# application/config/version.php
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 12:51

DenisChenu


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

answers_html 931574b9

2016-10-14 12:46

DenisChenu


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

answers_html 4fb88ed6

2016-10-14 12:33

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 12:14

c_schmitz


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

master 0b035ef5

2016-10-14 12:10

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
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 10:52

DenisChenu


Details Diff		 Merge branch 'answers_html' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html-mergedMaster
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 03:15

ollehar1


Details Diff		 Dev: Define question object as a module, first try with render view from question module controller
mod - application/config/internal.php Diff File
rm - application/core/questions/ArrayQuestionObject/ArrayQuestionObjectAdminController.php Diff
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

questionobject_prototype1 1077cf47

2016-10-14 01:20

ollehar1


Details Diff		 Merge remote-tracking branch 'origin/master' into questionobject_prototype1
mod - application/config/version.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
add - application/views/admin/conditions/deleteAllConditions.php Diff File
add - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
add - application/views/admin/conditions/includes/copyform.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
add - application/views/admin/conditions/includes/navigator.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/dataentry/includes/editdata/editdata.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/questions/gender/buttons/answer.php Diff File
mod - application/views/survey/questions/gender/radio/answer.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/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/conditions.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/star-rating.js Diff File
mod - styles-public/star-rating.css 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/Sea_Green/css/lime-admin-common.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

answers_html a3c07e9a

2016-10-13 21:42

DenisChenu


Details Diff		 Fixed issue 11755: default action for save/load/clear all. Teplate can update it
Dev: add some language var for template		 Affected Issues
11755
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

answers_html-mergedMaster e17f6978

2016-10-13 20:27

DenisChenu


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

# Conflicts:
# application/config/version.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
add - application/views/admin/conditions/deleteAllConditions.php Diff File
add - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
add - application/views/admin/conditions/includes/copyform.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
add - application/views/admin/conditions/includes/navigator.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/dataentry/includes/editdata/editdata.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/survey/questions/date/selector/answer.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/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/conditions.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/star-rating.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/Sea_Green/css/lime-admin-common.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

answers_html-mergedMaster 16a4c8a7

2016-10-13 20:26

DenisChenu


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

# Conflicts:
# application/controllers/survey/index.php
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.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/questions/multiplechoice_with_comments/answer.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - application/views/survey/questions/multiplenumeric/answer.php Diff File
mod - application/views/survey/questions/multiplenumeric/answer_input.php Diff File
add - application/views/survey/questions/multiplenumeric/rows/dynamic.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
mod - application/views/survey/questions/multipleshorttext/answer.php Diff File
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_inputtext.php Diff File
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_textarea.php Diff File
add - application/views/survey/system/display.php Diff File
add - application/views/survey/system/loadForm/error.php Diff File
add - application/views/survey/system/loadForm/form.php Diff File
add - application/views/survey/system/loadForm/heading.php Diff File
add - application/views/survey/system/loadForm/message.php Diff File
add - application/views/survey/system/saveForm/anonymized.php Diff File
add - application/views/survey/system/saveForm/error.php Diff File
add - application/views/survey/system/saveForm/form.php Diff File
add - application/views/survey/system/saveForm/heading.php Diff File
add - application/views/survey/system/saveForm/message.php Diff File
mod - styles-public/numeric-slider.css Diff File
mod - templates/base/pstpl/load.pstpl Diff File
mod - templates/base/pstpl/save.pstpl Diff File
mod - templates/base_awesome/css/template.css Diff File
mod - templates/base_awesome/pstpl/load.pstpl Diff File
mod - templates/base_awesome/pstpl/save.pstpl Diff File
mod - templates/default/css/template.css Diff File

answers_html 5c550999

2016-10-13 20:18

DenisChenu


Details Diff		 Dev: fix labelledby + other row
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - templates/default/css/template.css Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 618 619 620 621 622 623 624 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last