Changesets: LimeSurvey

develop 6e00c0b2

2018-05-25 16:24:19

TonisOrmisson


Committer: ollehar1 Details Diff
DEV: implement QuestionType (#1066)

* DEV: add QuestionType

* DEV: add QuestionType - getters

* DEV: add Field

* DEV: add StaticModel

* DEV: add QuestionType::modelsAttributes()

* DEV: fix attributeNames()

* DEV: getQuestionType for Question

* DEV: rename textCodes

* DEV: clean up Field

* DEV: PHPdoc

* DEV: Fix Static __construct()
add - application/core/StaticModel.php Diff File
add - application/models/Field.php Diff File
mod - application/models/Question.php Diff File
add - application/models/QuestionType.php Diff File

develop eec564dc

2018-05-25 16:21:18

olle

Details Diff
Merge branch 'master' into develop
mod - application/models/SurveysGroups.php Diff File
mod - application/views/admin/surveysgroups/_form.php Diff File

develop deb023a8

2018-05-25 16:21:15

olle

Details Diff
Dev: Indentation in UploadController
mod - application/controllers/UploaderController.php Diff File

develop 99e11b88

2018-05-25 16:21:01

olle

Details Diff
Dev: Missing null in PHPDoc
mod - framework/db/ar/CActiveRecord.php Diff File

master fa236596

2018-05-25 15:17:23

Dominik Vitt

Details Diff
Fixed issue 13598: Missing filter when selecting parent survey group
mod - application/models/SurveysGroups.php Diff File
mod - application/views/admin/surveysgroups/_form.php Diff File

develop 61cdbac8

2018-05-25 11:20:38

olle

Details Diff
Dev: Missing questionHelper use
mod - application/controllers/admin/database.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File

develop 35f71469

2018-05-25 11:00:26

olle

Details Diff
Dev: Clean up merge problems
mod - application/controllers/admin/questions.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

develop 4caa8b88

2018-05-25 10:22:44

olle

Details Diff
Merge branch 'master' into develop

Conflicts:
application/controllers/admin/questions.php
mod - application/controllers/admin/questions.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/third_party/gtranslate-api/GTranslate.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

master 0abd142f

2018-05-25 09:01:55

markusfluer

Details Diff
Fixed issue: PHP7 not creating folders automatically on copy
mod - application/models/TemplateManifest.php Diff File

master 1a4b965d

2018-05-24 17:15:33

Dominik Vitt

Details Diff
Fixed issue 13645: Error message Google Translate API
mod - application/third_party/gtranslate-api/GTranslate.php Diff File

master c166461c

2018-05-24 17:12:14

Dominik Vitt

Details Diff
Dev: New corrections of question theme selection on edit question page
mod - application/controllers/admin/questions.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

develop 42d8df4a

2018-05-24 16:16:41

olle

Details Diff
Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/controllers/admin/questions.php
application/helpers/admin/statistics_helper.php
application/views/admin/survey/Question/editQuestion_view.php
mod - application/controllers/admin/questions.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.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/hu/hu.mo Diff File
mod - locale/ja/ja.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 - tests/TestHelper.php Diff File

master 0668e183

2018-05-24 15:59:13

olle

Details Diff
Release 3.8.1+180524
mod - application/config/version.php Diff File
mod - docs/release_notes.txt Diff File

master fcc3f9b2

2018-05-24 15:41:41

olle

Details Diff
Dev: Don't use date in tests screenshots
mod - tests/TestHelper.php Diff File

master ba13820a

2018-05-24 15:18:49

Dominik Vitt

Details Diff
Dev: Corrections of question theme selection on edit question page
mod - application/controllers/admin/questions.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

master a009d48e

2018-05-24 15:00:56

olle

Details Diff
Dev: Apply statistics fix to user statistics
mod - application/helpers/userstatistics_helper.php Diff File

master 4d5ed420

2018-05-24 13:00:55

olle

Details Diff
Fixed issue: Move subquestion text to top in statistics
mod - application/helpers/admin/statistics_helper.php Diff File

master 42f1f233

2018-05-24 12:34:22

LimeSurvey Translations Bot

Details Diff
Dev Automatic translation update
mod - locale/_template/limesurvey.pot Diff File

master 5191557f

2018-05-24 12:05:21

olle

Details Diff
Dev: Remove 'Field' in 'Field summary for ...'
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File

master a18bb925

2018-05-24 11:59:16

LimeSurvey Translations Bot

Details Diff
Updated translation: Catalan by qualitatuvic
Updated translation: Hungarian by kkd
Updated translation: Japanese by nomoto
Updated translation: Dutch by Han
Updated translation: Polish by elissa
Updated translation: Dutch (Informal) by Han
Updated translation: Polish (Informal) by elissa
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/ja/ja.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

develop 66633c7f

2018-05-24 10:33:35

olle

Details Diff
Merge branch 'master' into develop

Conflicts:
application/views/admin/survey/Question/editQuestion_view.php
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/views/admin/assessments/assessments_edit.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - assets/scripts/admin/questions.js Diff File
add - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/bootstrap_buttons_listradio.png Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig Diff File
add - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/bootstrap_buttons_multiplechoice.png Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml Diff File

master 9146fa9c

2018-05-24 10:31:18

Dominik Vitt

Details Diff
Fixed issue 13689: Missing translation
mod - application/views/admin/assessments/assessments_edit.php Diff File

master 9ef2467b

2018-05-23 17:55:36

LouisGac

Details Diff
Fixed issue: response created at welcome page
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 096b75d4

2018-05-23 17:50:05

Dominik Vitt

Details Diff
Dev: Bootstrap buttons question theme - new attributes in xml files
add - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/bootstrap_buttons_listradio.png Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig Diff File
add - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/bootstrap_buttons_multiplechoice.png Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml Diff File

master c8678eda

2018-05-23 17:42:46

Dominik Vitt

Details Diff
Dev: Question theme preview created on edit question page
mod - application/models/QuestionTemplate.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - assets/scripts/admin/questions.js Diff File
1 2 3 4 ... 110 ... 220 ... 330 ... 440 ... 550 ... 660 ... 770 ... 880 ... 990 ... 1088 1089 1090  Next  Last