Changesets: LimeSurvey

Search Browse Back to Index

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

answers_html edf16e14

2016-10-13 20:07

DenisChenu


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

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 18:30

ollehar


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

master 31eba5b5

2016-10-13 17:30

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 16:48

ollehar


Details Diff		 Dev: Don't store seconds in data entry token completed
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 16:28

ollehar


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

master 476e78da

2016-10-13 15:11

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

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

ollehar


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

master ee1ba72c

2016-10-13 13:20

ollehar


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

develop cb8d9908

2016-10-13 13:05

LouisGac


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

master a85300ba

2016-10-13 12:58

ollehar


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

master dff416cc

2016-10-13 12:28

c_schmitz


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

answers_html 97703ea4

2016-10-13 11:40

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
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 19:46

c_schmitz


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

master 62d2c8de

2016-10-12 19:38

LimeSurvey Translations Bot


Details Diff		 Updated translation: German by c_schmitz
Updated translation: German (Informal) by c_schmitz, actxcellence
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File

master 1a9f5610

2016-10-12 19:00

LimeSurvey Translations Bot


Details Diff		 Updated translation: German by c_schmitz, surveyunihi, ecoplan
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/de.mo Diff File

master b2d60257

2016-10-12 18:58

ollehar


Details Diff		 Dev: Correct localization for owner uid and survey name
mod - application/models/Participant.php Diff File
mod - application/models/SurveyLink.php Diff File

master a7baf9ea

2016-10-12 18:56

ollehar


Details Diff		 Dev: Correct lastname and firstname localization
mod - application/models/ParticipantShare.php Diff File

master 9c316ff4

2016-10-12 18:52

LimeSurvey Translations Bot


Details Diff		 Updated translation: Catalan by qualitatuvic
Updated translation: Spanish (Spain) by xtingray, larjona, aesteban
Updated translation: French (France) by arnaud21
Updated translation: Japanese by nomoto
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Norwegian (Nynorsk) by pmonstad
Updated translation: Polish by elisa
Updated translation: Polish (Informal) by elisa
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.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

master f9df8048

2016-10-12 18:47

ollehar


Details Diff		 Dev: Factor out shouldShowScenario()
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File

master ddb40cbb

2016-10-12 18:34

ollehar


Details Diff		 Dev: Removed unused variables and make sure all variables are defined before use
mod - application/controllers/admin/conditionsaction.php Diff File

master fe56c59d

2016-10-12 18:34

ollehar


Details Diff		 Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - scripts/star-rating.js Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 619 620 621 622 623 624 625 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last