Changesets: LimeSurvey

Search Browse Back to Index

cint 42158d79

2016-09-15 11:12:28

ollehar

Details Diff 		Dev: Rename key to stg_name in index constraint
Attach Issues:
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

cint 8ce461ae

2016-09-15 11:10:51

ollehar

Details Diff 		Merge branch 'master' into cint

Conflicts:
application/config/version.php
application/models/QuestionGroup.php
Attach Issues:
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/LSDbCriteria.php Diff File
mod - application/core/LSYii_CompareInsensitiveValidator.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_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/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
add - application/libraries/MersenneTwister.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/third_party/xlsx_writer/xlsxwriter.class.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - application/views/survey/frontpage/enterCaptcha.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/answer.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/column/answer.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/af.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.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/he/he.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sr/sr.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/array-totalsum.js Diff File
mod - templates/default/css/flat_and_modern.css Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/views/survey.pstpl Diff File
mod - templates/default/views/surveylist.pstpl Diff File
mod - templates/news_paper/css/news_paper.css Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/news_paper/views/survey.pstpl Diff File
mod - templates/news_paper/views/surveylist.pstpl Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
mod - templates/ubuntu_orange/css/ubuntu_orange.css Diff File
mod - templates/ubuntu_orange/views/survey.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File
mod - third_party/ckeditor/CHANGES.md Diff File
mod - third_party/ckeditor/README.md Diff File
mod - third_party/ckeditor/build-config.js Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/lang/af.js Diff File
mod - third_party/ckeditor/lang/ar.js Diff File
mod - third_party/ckeditor/lang/bg.js Diff File
mod - third_party/ckeditor/lang/bn.js Diff File
mod - third_party/ckeditor/lang/bs.js Diff File
mod - third_party/ckeditor/lang/ca.js Diff File
mod - third_party/ckeditor/lang/cs.js Diff File
mod - third_party/ckeditor/lang/cy.js Diff File
mod - third_party/ckeditor/lang/da.js Diff File
mod - third_party/ckeditor/lang/de-ch.js Diff File
mod - third_party/ckeditor/lang/de.js Diff File
mod - third_party/ckeditor/lang/el.js Diff File
mod - third_party/ckeditor/lang/en-au.js Diff File
mod - third_party/ckeditor/lang/en-ca.js Diff File
mod - third_party/ckeditor/lang/en-gb.js Diff File
mod - third_party/ckeditor/lang/en.js Diff File
mod - third_party/ckeditor/lang/eo.js Diff File
mod - third_party/ckeditor/lang/es.js Diff File
mod - third_party/ckeditor/lang/et.js Diff File
mod - third_party/ckeditor/lang/eu.js Diff File
mod - third_party/ckeditor/lang/fa.js Diff File
mod - third_party/ckeditor/lang/fi.js Diff File
mod - third_party/ckeditor/lang/fo.js Diff File
mod - third_party/ckeditor/lang/fr-ca.js Diff File
mod - third_party/ckeditor/lang/fr.js Diff File
mod - third_party/ckeditor/lang/gl.js Diff File
mod - third_party/ckeditor/lang/gu.js Diff File

master b3cdd00f

2016-09-15 10:57:33

ollehar

Details Diff 		Fixed issue 11645: Problem with mandatory array question styling

Dev: Replace label class with text-danger (no nowrap whitespace)		 Affected Issues
11645
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php Diff File

master ddf1213d

2016-09-14 15:55:02

DenisChenu

Details Diff 		Fixed issue 11650: Array dropdown : answer_width don't set answer column width
Dev: add the col with the width
Dev: fix alternation of col in array
Dev: Fix answerwidth (don't divide 2 times by 2) : tested		 Affected Issues
11650
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/answer.php Diff File

master 771c5027

2016-09-14 14:03:38

c_schmitz

Details Diff 		Merge pull request #535 from Aestu/case-insensitive-search-for-postgresql-2

Fixed issue 11574: Search box in main survey list is case sensitive		 Affected Issues
11574
add - application/core/LSDbCriteria.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TokenDynamic.php Diff File

2.06lts a2def0b8

2016-09-14 11:34:22

DenisChenu

Details Diff 		[fix] The variable $tokenlength does not exist : tokenLength
Attach Issues:
mod - application/models/Token.php Diff File

cint dac69553

2016-09-14 11:30:40

c_schmitz

Details Diff 		Dev: New table user_settings
Attach Issues:
mod - application/helpers/update/updatedb_helper.php Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

2.06lts 9d922b60

2016-09-14 11:02:59

DenisChenu

Details Diff 		Fixed issue: ~ and _ in tokens hard to manually enter
# Conflicts:
# application/controllers/admin/tokens.php
Attach Issues:
mod - CHANGELOG.md Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/models/Token.php Diff File

answers_html d57fce21

2016-09-14 10:31:46

DenisChenu

Details Diff 		Dev: Array text + number
Dev: review grandtotal system (not tested)
Dev: review checkbox-awesome in base_awesome
Attach Issues:
mod - application/views/survey/questions/arrays/multiflexi/answer.php Diff File
mod - application/views/survey/questions/arrays/multiflexi/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/multiflexi/rows/cells/answer_td.php Diff File
mod - application/views/survey/questions/arrays/multiflexi/rows/cells/answer_td_checkboxes.php Diff File
mod - application/views/survey/questions/arrays/multiflexi/rows/repeat_header.php Diff File
mod - application/views/survey/questions/arrays/texts/answer.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/answer_td.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/td_total.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/repeat_header.php Diff File
mod - templates/base_awesome/css/template-core.css Diff File

answers_html 7fb9ab5c

2016-09-14 09:51:29

DenisChenu

Details Diff 		Dev: fix no answer on yes/no/uncertain array
Attach Issues:
mod - application/views/survey/questions/arrays/yesnouncertain/rows/answer_row.php Diff File

answers_html 61232d11

2016-09-14 09:45:44

DenisChenu

Details Diff 		Dev: end of simple radio array
Attach Issues:
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/cells/answer_td.php Diff File
mod - application/views/survey/questions/arrays/dualscale/answer.php Diff File
mod - application/views/survey/questions/arrays/dualscale/answer_header.php Diff File
mod - application/views/survey/questions/arrays/increasesamedecrease/answer.php Diff File
mod - application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/yesnouncertain/answer.php Diff File
mod - application/views/survey/questions/arrays/yesnouncertain/rows/answer_row.php Diff File
mod - templates/base_awesome/css/template.css Diff File

answers_html 1473b9bd

2016-09-14 09:14:20

DenisChenu

Details Diff 		Dev: just some test without no-more-table for base. Using no-more-table at end
Attach Issues:
mod - templates/base/css/template.css Diff File

answers_html 2d0c0d26

2016-09-14 09:06:49

DenisChenu

Details Diff 		Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into answers_html
Dev: i do not control merging : this one seems OK
Attach Issues:
mod - application/config/version.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/views/survey/frontpage/enterCaptcha.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/he/he.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - third_party/ckeditor/CHANGES.md Diff File
mod - third_party/ckeditor/README.md Diff File
mod - third_party/ckeditor/build-config.js Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/lang/af.js Diff File
mod - third_party/ckeditor/lang/ar.js Diff File
mod - third_party/ckeditor/lang/bg.js Diff File
mod - third_party/ckeditor/lang/bn.js Diff File
mod - third_party/ckeditor/lang/bs.js Diff File
mod - third_party/ckeditor/lang/ca.js Diff File
mod - third_party/ckeditor/lang/cs.js Diff File
mod - third_party/ckeditor/lang/cy.js Diff File
mod - third_party/ckeditor/lang/da.js Diff File
mod - third_party/ckeditor/lang/de-ch.js Diff File
mod - third_party/ckeditor/lang/de.js Diff File
mod - third_party/ckeditor/lang/el.js Diff File
mod - third_party/ckeditor/lang/en-au.js Diff File
mod - third_party/ckeditor/lang/en-ca.js Diff File
mod - third_party/ckeditor/lang/en-gb.js Diff File
mod - third_party/ckeditor/lang/en.js Diff File
mod - third_party/ckeditor/lang/eo.js Diff File
mod - third_party/ckeditor/lang/es.js Diff File
mod - third_party/ckeditor/lang/et.js Diff File
mod - third_party/ckeditor/lang/eu.js Diff File
mod - third_party/ckeditor/lang/fa.js Diff File
mod - third_party/ckeditor/lang/fi.js Diff File
mod - third_party/ckeditor/lang/fo.js Diff File
mod - third_party/ckeditor/lang/fr-ca.js Diff File
mod - third_party/ckeditor/lang/fr.js Diff File
mod - third_party/ckeditor/lang/gl.js Diff File
mod - third_party/ckeditor/lang/gu.js Diff File
mod - third_party/ckeditor/lang/he.js Diff File
mod - third_party/ckeditor/lang/hi.js Diff File
mod - third_party/ckeditor/lang/hr.js Diff File
mod - third_party/ckeditor/lang/hu.js Diff File

answers_html 68652b50

2016-09-14 09:01:57

DenisChenu

Details Diff 		Fixed issue 11650: Array dropdown : answer_width don't set answer column width Affected Issues
11650
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/answer.php Diff File

answers_html 71743fe0

2016-09-14 09:00:17

DenisChenu

Details Diff 		Dev: WIP for array question type : with sr-only fix and some other
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/arrays/10point/answer.php Diff File
mod - application/views/survey/questions/arrays/10point/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/10point/rows/cells/answer_td_input.php Diff File
mod - application/views/survey/questions/arrays/10point/rows/cells/thead.php Diff File
mod - application/views/survey/questions/arrays/5point/answer.php Diff File
mod - application/views/survey/questions/arrays/5point/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/answer.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/answer.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php Diff File
mod - templates/base/css/template-core.css Diff File
mod - templates/base_awesome/css/template-core.css Diff File
mod - templates/base_awesome/pstpl/question.pstpl Diff File
mod - templates/default/css/template-core.css Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/views/question.pstpl Diff File

answers_html ef288b91

2016-09-13 13:19:43

DenisChenu

Details Diff 		Dev: restart working on array : 5 point + array (radio) actually
Dev: must review no-more-table system
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/arrays/5point/answer.php Diff File
mod - application/views/survey/questions/arrays/5point/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/5point/rows/cells/answer_td_input.php Diff File
mod - application/views/survey/questions/arrays/5point/rows/cells/thead.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/answer.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/cells/answer_td.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/cells/thead.php Diff File
mod - templates/base/config.xml Diff File
add - templates/base/css/template-core.css Diff File
mod - templates/base_awesome/config.xml Diff File
add - templates/base_awesome/css/template-core.css Diff File
mod - templates/base_awesome/css/template.css Diff File
mod - templates/default/config.xml Diff File
mod - templates/default/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css Diff File
mod - templates/default/css/bootstrap-complement.css Diff File
rm - templates/default/css/bootstrap-ls.css Diff File
add - templates/default/css/template-core.css Diff File
mod - templates/default/css/template.css Diff File

master 09a20dc9

2016-09-13 13:00:20

ollehar

Details Diff 		Revert "Fixed issue 11532: "Exit and clear survey" in frontend still uses Javascript confirm, should be BS modal"

This reverts commit fd5ca4333388f092d69c0133f3a46f323c330d00.

Conflicts:
application/helpers/replacements_helper.php		 Affected Issues
11532
mod - application/helpers/replacements_helper.php Diff File

master b39ad5f0

2016-09-13 06:26:06

DenisChenu

Details Diff 		Fixed issue 11647: Can not use LANGUAGECHANGER inside a survey
Dev: good name fopr input fix the issue		 Affected Issues
11647
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File

answers_html 1517e40b

2016-09-12 17:03:59

DenisChenu

Details Diff 		Dev: replace fa-fa-thumbs-o-up/fa-thumbs-o-down by fa-check/fa-ban in YesNo question
Attach Issues:
mod - application/views/survey/questions/yesno/buttons/item.php Diff File

master ac22efcb

2016-09-12 15:06:41

markusfluer

Details Diff 		Fixed issue: Language changer not holding language with activated captcha
Attach Issues:
mod - application/views/survey/frontpage/enterCaptcha.php Diff File

master 810c6466

2016-09-12 12:26:43

c_schmitz

Details Diff 		Fixed issue 11642: Update CKEditor to Version 4.5.11 Affected Issues
11642
mod - third_party/ckeditor/CHANGES.md Diff File
mod - third_party/ckeditor/README.md Diff File
mod - third_party/ckeditor/build-config.js Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/lang/af.js Diff File
mod - third_party/ckeditor/lang/ar.js Diff File
mod - third_party/ckeditor/lang/bg.js Diff File
mod - third_party/ckeditor/lang/bn.js Diff File
mod - third_party/ckeditor/lang/bs.js Diff File
mod - third_party/ckeditor/lang/ca.js Diff File
mod - third_party/ckeditor/lang/cs.js Diff File
mod - third_party/ckeditor/lang/cy.js Diff File
mod - third_party/ckeditor/lang/da.js Diff File
mod - third_party/ckeditor/lang/de-ch.js Diff File
mod - third_party/ckeditor/lang/de.js Diff File
mod - third_party/ckeditor/lang/el.js Diff File
mod - third_party/ckeditor/lang/en-au.js Diff File
mod - third_party/ckeditor/lang/en-ca.js Diff File
mod - third_party/ckeditor/lang/en-gb.js Diff File
mod - third_party/ckeditor/lang/en.js Diff File
mod - third_party/ckeditor/lang/eo.js Diff File
mod - third_party/ckeditor/lang/es.js Diff File
mod - third_party/ckeditor/lang/et.js Diff File
mod - third_party/ckeditor/lang/eu.js Diff File
mod - third_party/ckeditor/lang/fa.js Diff File
mod - third_party/ckeditor/lang/fi.js Diff File
mod - third_party/ckeditor/lang/fo.js Diff File
mod - third_party/ckeditor/lang/fr-ca.js Diff File
mod - third_party/ckeditor/lang/fr.js Diff File
mod - third_party/ckeditor/lang/gl.js Diff File
mod - third_party/ckeditor/lang/gu.js Diff File
mod - third_party/ckeditor/lang/he.js Diff File
mod - third_party/ckeditor/lang/hi.js Diff File
mod - third_party/ckeditor/lang/hr.js Diff File
mod - third_party/ckeditor/lang/hu.js Diff File
mod - third_party/ckeditor/lang/id.js Diff File
mod - third_party/ckeditor/lang/is.js Diff File

master d08c1cd9

2016-09-12 11:38:36

c_schmitz

Details Diff 		Fixed issue: Version number not updated Affected Issues
11643
mod - application/config/version.php Diff File

master e59c1ed0

2016-09-12 11:07:10

c_schmitz

Details Diff 		Fixed issue: ~ and _ in tokens hard to manually enter
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/models/Token.php Diff File

master 154e026f

2016-09-12 10:59:15

c_schmitz

Details Diff 		Fixed issue: ~ and _ in tokens hard to manually enter
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/models/Token.php Diff File

2.06lts a16c37cd

2016-09-12 10:59:15

c_schmitz

Details Diff 		Fixed issue: ~ and _ in tokens hard to manually enter
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/models/Token.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 625 626 627 628 629 630 631 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1451 1452 1453  Next  Last