Changesets: LimeSurvey

Search Browse Back to Index

master 81976768

2016-03-09 12:03:21

ollehar

Details Diff 		Dev: Adapt standard token fields to new style at CPDB export
Attach Issues:
mod - application/views/admin/participants/attributeMap_view.php Diff File

master 71f0f0f6

2016-03-09 11:43:23

LimeSurvey Translations Bot

Details Diff 		Updated translation: German by c_schmitz
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Norwegian (Nynorsk) by pmonstad
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/de.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File

master d8bc7ff3

2016-03-09 11:39:20

c_schmitz

Details Diff 		Dev Fixed text
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File

master 9dd7805c

2016-03-09 11:34:42

c_schmitz

Details Diff 		Release 2.50+ Build 160309
Attach Issues:
mod - docs/release_notes.txt Diff File

2.06lts 15695228

2016-03-09 11:30:40

ollehar

Details Diff 		Dev: Type-cast int to string in postgresql query
Attach Issues:
mod - application/helpers/admin/statistics_helper.php Diff File

master 7a718233

2016-03-09 11:30:08

LimeSurvey Translations Bot

Details Diff 		Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/helpers/admin/statistics_helper.php Diff File

master e50dad30

2016-03-09 11:28:44

LimeSurvey Translations Bot

Details Diff 		Updated translation: Finnish by c_schmitz, morbid, jhnrk, olde
Updated translation: French (France) by arnaud21
Updated translation: Lithuanian by liudas, simasj
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Dutch by Han
Updated translation: Norwegian (Nynorsk) by c_schmitz, pmonstad
Updated translation: Polish by elisa
Updated translation: Portuguese (Brazil) by holch, mauriciofurtado
Updated translation: Thai by tomzt
Updated translation: Dutch (Informal) by Han
Updated translation: Polish (Informal) by elisa
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/lt/lt.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/pt-BR/pt-BR.mo Diff File
mod - locale/th/th.mo Diff File

master 9210a49f

2016-03-09 11:28:06

ollehar

Details Diff 		Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/controllers/admin/questions.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/survey/questions/multiplenumeric/footer.php Diff File
mod - application/views/survey/questions/multiplenumeric/item.php Diff File

master f46594f0

2016-03-09 11:27:40

c_schmitz

Details Diff 		Dev Fixed texts
Attach Issues:
mod - application/helpers/common_helper.php Diff File

master 29b235e2

2016-03-09 11:27:18

ollehar

Details Diff 		Dev: Type-cast int to string in postgresql query
Attach Issues:
mod - application/helpers/admin/statistics_helper.php Diff File

master 239d8512

2016-03-09 11:22:15

LouisGac

Details Diff 		Fixed issue 10715: Multiple numerical input, The system display visual errors as shown in the following link when assigning values in the input section (maximum sum value). Affected Issues
10715
mod - application/views/survey/questions/multiplenumeric/footer.php Diff File

master b00911eb

2016-03-09 11:20:30

LouisGac

Details Diff 		Fixed issue 10607: Multiple numerical input - sum of sliders broken Affected Issues
10607
mod - application/controllers/admin/questions.php Diff File
mod - application/views/survey/questions/multiplenumeric/footer.php Diff File
mod - application/views/survey/questions/multiplenumeric/item.php Diff File

master 918d540c

2016-03-09 10:55:06

ollehar

Details Diff 		Dev: Scrutinizer fixes
Attach Issues:
mod - application/controllers/Statistics_userController.php Diff File
mod - application/libraries/admin/progressbar.php Diff File

master 33144bcf

2016-03-09 10:08:43

ollehar

Details Diff 		Dev: Remove last global oTemplate
Attach Issues:
mod - application/controllers/RegisterController.php Diff File
mod - application/views/register/display.php Diff File

master a47f6528

2016-03-09 10:03:48

ollehar

Details Diff 		Revert "Dev: correct use of global $oTemplate"

This reverts commit 8a1fd15802a007ab7bd7e1660d823be615848bd8.

Conflicts:
application/helpers/replacements_helper.php
Attach Issues:
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File

master a2217355

2016-03-09 09:59:49

ollehar

Details Diff 		Merge branch 'master' into globaltemplateobjectfix
Attach Issues:
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/helpers/admin/export/SurveyObj.php Diff File
mod - application/helpers/admin/export/Writer.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/multiplenumeric/item.php Diff File

master eec845a0

2016-03-09 09:58:54

ollehar

Details Diff 		Dev: Change StdClass to TemplateConfiguration
Attach Issues:
mod - application/controllers/admin/templates.php Diff File
mod - application/models/Template.php Diff File

master 853952b4

2016-03-09 09:54:25

LouisGac

Details Diff 		Dev: more specific criterias to delete last visited question
Attach Issues:
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/update.php Diff File

master 9ba5e3bc

2016-03-08 16:59:00

aesteban

Details Diff 		Merge pull request #407 from GuillaumeSmaha/fix_multiple_numeric_result

Fixed issue 10208: Rendering any PDF, CSV, HTML introducing numerical		 Affected Issues
10208
mod - application/helpers/admin/export/SurveyObj.php Diff File
mod - application/helpers/admin/export/Writer.php Diff File
mod - application/helpers/common_helper.php Diff File

globaltemplateobjectfix e75f070a

2016-03-08 16:47:01

ollehar

Details Diff 		Merge branch 'master' into globaltemplateobjectfix

Conflicts:
application/controllers/admin/templates.php
application/helpers/replacements_helper.php
Attach Issues:
mod - application/config/third_party.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
rm - application/extensions/Menu/MenuWidget.php Diff File
rm - application/extensions/Menu/assets/nav.css Diff File
rm - application/extensions/Menu/assets/nav.js Diff File
rm - application/extensions/Menu/views/adminmenu.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/statistics_helper.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
add - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
add - application/models/AdminTheme.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Template.php Diff File
add - application/models/TemplateConfiguration.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/homepagesettings/_form.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/participants/attributeMapToken_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/messagebox.php Diff File
mod - application/views/admin/super/title_bar.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/usergroup/usergroups_view.php Diff File
mod - application/views/register/display.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - application/views/survey/questions/5pointchoice/item_noanswer_row.php Diff File
mod - application/views/survey/questions/5pointchoice/item_row.php Diff File
mod - application/views/survey/questions/gender/buttons/item.php Diff File
mod - application/views/survey/questions/list_dropdown/select.php Diff File
mod - application/views/survey/questions/list_with_comment/list/item.php Diff File
mod - application/views/survey/questions/listradio/item_noanswer_row.php Diff File
mod - application/views/survey/questions/listradio/item_row.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_inputtext.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_textarea.php Diff File
mod - application/views/survey/questions/ranking/second_list.php Diff File
mod - application/views/survey/questions/yesno/buttons/item.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/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.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/ru/ru.mo Diff File
mod - locale/th/th.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/ckeditor-config.js Diff File
mod - scripts/admin/homepagesettings.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/ranking.js Diff File
mod - styles/Sea_Green/css/lime-admin-misc.css Diff File
mod - styles/Sea_Green/scripts/save.js Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/scripts/template.js Diff File
mod - templates/default/views/register.pstpl Diff File
mod - templates/default/views/startpage.pstpl Diff File
mod - templates/default/views/surveylist.pstpl Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/news_paper/scripts/template.js Diff File
mod - templates/news_paper/views/register.pstpl Diff File
mod - templates/news_paper/views/startpage.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/scripts/template.js Diff File
mod - templates/ubuntu_orange/views/register.pstpl Diff File
mod - templates/ubuntu_orange/views/startpage.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File
rm - third_party/jquery/jquery-1.11.1.min.js Diff File
add - third_party/jquery/jquery-1.12.1.min.js Diff File
add - tmp/runtime/CSS/4.6.0,24166bfe16a0cc6bd18d813b83121ef2eaf16545,1.ser Diff File

globaltemplateobjectfix bfa71e24

2016-03-08 16:43:31

ollehar

Details Diff 		Dev: Fix template configuration for template editor
Attach Issues:
mod - application/controllers/admin/templates.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Template.php Diff File

master 1123be6b

2016-03-08 16:24:41

LouisGac

Details Diff 		Fixe issue 10579: Slider questions will show normal instructions for multiple numerical questions Affected Issues
10579
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/multiplenumeric/item.php Diff File

2.06lts 20e4d6ff

2016-03-08 15:40:49

ollehar


Committer: DenisChenu Details Diff 		Fixed issue 10641: pie chart error will make statistics reports unavailable Affected Issues
10641
mod - application/helpers/admin/statistics_helper.php Diff File

master 0100dee4

2016-03-08 15:13:17

ollehar

Details Diff 		Fixed issue 10641: pie chart error will make statistics reports unavailable Affected Issues
10641
mod - application/helpers/admin/statistics_helper.php Diff File

2.06lts 85130ba9

2016-03-08 14:40:49

ollehar

Details Diff 		Fixed issue 10641: pie chart error will make statistics reports unavailable Affected Issues
10641
mod - application/helpers/admin/statistics_helper.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 736 737 738 739 740 741 742 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1451 1452 1453  Next  Last