Changesets: LimeSurvey

Search Browse Back to Index

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

questionobject_prototype1 1077cf47

2016-10-13 23:20:51

ollehar1

Details Diff 		Merge remote-tracking branch 'origin/master' into questionobject_prototype1
Attach Issues:
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 19:42:08

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 18:27:29

DenisChenu

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

# Conflicts:
# application/config/version.php
Attach Issues:
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 18:26:35

DenisChenu

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

# Conflicts:
# application/controllers/survey/index.php
Attach Issues:
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 18:18:30

DenisChenu

Details Diff 		Dev: fix labelledby + other row
Attach Issues:
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - templates/default/css/template.css Diff File

answers_html edf16e14

2016-10-13 18:07:54

DenisChenu

Details Diff 		Dev: no form-inline in multiple choice with comment
Attach Issues:
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

answers_html fb8dca28

2016-10-13 17:46:58

DenisChenu

Details Diff 		Fixed issue 11776: differing border radius styles (:text and texarea)
Dev: remove input(group, replace by ls-input-group		 Affected Issues
11776
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/answer.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
mod - styles-public/numeric-slider.css Diff File
mod - templates/base_awesome/css/template.css Diff File

master 09acaf50

2016-10-13 16:30:51

ollehar

Details Diff 		Dev: Don't set datetimepicker min/max date to EM expression
Attach Issues:
mod - application/views/survey/questions/date/selector/answer.php Diff File

master 31eba5b5

2016-10-13 15:30:46

c_schmitz

Details Diff 		Fixed issue 11746: Notice when previewing a hidden question and debug mode activated Affected Issues
11746
mod - application/helpers/SurveyRuntimeHelper.php Diff File

master 6b9fc604

2016-10-13 14:48:30

ollehar

Details Diff 		Dev: Don't store seconds in data entry token completed
Attach Issues:
mod - application/controllers/admin/dataentry.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/includes/editdata/editdata.php Diff File

master e33e1539

2016-10-13 14:28:09

ollehar

Details Diff 		Dev: Remove unused form in data entry error message
Attach Issues:
mod - application/controllers/admin/dataentry.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File

master 476e78da

2016-10-13 13:11:05

ollehar

Details Diff 		Fixed issue 11765: Admin data entry doesn't work if survey has restricted access Affected Issues
11765
mod - application/controllers/admin/dataentry.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File

master a7e0537b

2016-10-13 12:58:59

ollehar

Details Diff 		Fixed issue 11765: Admin data entry doesn't work if survey has restricted access Affected Issues
11765
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/includes/editdata/editdata.php Diff File

master 581c285b

2016-10-13 12:13:03

ollehar

Details Diff 		Dev: Space between {} to avoid EM
Attach Issues:
mod - application/views/admin/dataentry/content_view.php Diff File

master ee1ba72c

2016-10-13 11:20:29

ollehar

Details Diff 		Dev: Remove two unused functions
Attach Issues:
mod - application/controllers/admin/surveyadmin.php Diff File

develop cb8d9908

2016-10-13 11:05:03

LouisGac

Details Diff 		Dev: removed double session init
Attach Issues:
mod - application/core/LSYii_Controller.php Diff File

master a85300ba

2016-10-13 10:58:57

ollehar

Details Diff 		Fixed issue: Remove session warning message from question organizer
Attach Issues:
mod - application/controllers/admin/surveyadmin.php Diff File

master dff416cc

2016-10-13 10:28:58

c_schmitz

Details Diff 		Fixed issue: Mass-exporting survey archives shows error
Attach Issues:
mod - application/controllers/admin/export.php Diff File

answers_html 97703ea4

2016-10-13 09:40:02

DenisChenu

Details Diff 		Dev: #11771: Review HTML produced for save/reload : do views
Dev: Add a display.php view for all of this message (this fix a js out of body in save/load)
Dev: Move some core replacement to "where used" replacement		 Affected Issues
11771, 11781, 11790
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/survey/index.php 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/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
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 - templates/base/pstpl/load.pstpl Diff File
mod - templates/base/pstpl/save.pstpl Diff File
mod - templates/base_awesome/pstpl/load.pstpl Diff File
mod - templates/base_awesome/pstpl/save.pstpl Diff File

master b39db4f5

2016-10-12 17:46:13

c_schmitz

Details Diff 		Release 2.54.2 Build 161012
Attach Issues:
mod - application/config/version.php Diff File
mod - docs/release_notes.txt Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 607 608 609 610 611 612 613 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1453 1454 1455  Next  Last