Changesets: LimeSurvey

Search Browse Back to Index

master 8daed883

2016-10-17 13:12

ollehar


Details Diff		 Dev: Indentation
mod - application/controllers/admin/PluginHelper.php Diff File

master 0c2cceda

2016-10-17 13:01

ollehar


Details Diff		 Dev: Port stuff from the cint branch to make plugin full-page possible
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/core/LSYii_Application.php Diff File
add - application/views/admin/super/dummy.php Diff File

master fbcd7c96

2016-10-17 12:38

ollehar


Details Diff		 Dev: Use flash message instead of old AdminController error()
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/tokens.php Diff File

answers_html b0a7aee2

2016-10-17 03:49

DenisChenu


Details Diff		 Dev: fix (again) dropdown list
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.php Diff File
mod - application/views/survey/questions/list_dropdown/rows/option.php Diff File
mod - application/views/survey/questions/list_dropdown/rows/othertext.php Diff File

questionobject_prototype1 9586fd5e

2016-10-17 02:34

ollehar1


Details Diff		 Dev: Add question base module and read config into it
mod - application/core/questions/ArrayQuestionObject/ArrayQuestionObjectModule.php Diff File
add - application/core/questions/ArrayQuestionObject/config.json Diff File
add - application/core/questions/common/QuestionModule.php Diff File
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File

questionobject_prototype1 d54fbdaa

2016-10-17 02:00

ollehar1


Details Diff		 Dev: Factor out some view variables
mod - application/controllers/admin/questions.php Diff File
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File

questionobject_prototype1 61dedb9f

2016-10-17 01:14

ollehar1


Details Diff		 Dev: More URL fixes
mod - application/views/admin/survey/Question/question_view.php Diff File

questionobject_prototype1 8de1c5ea

2016-10-17 01:06

ollehar1


Details Diff		 Dev: More public renderWrappedTemplate and slash in URL
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/pluginmanager.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/statistics.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/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File

questionobject_prototype1 0829fb42

2016-10-17 00:48

ollehar1


Details Diff		 Dev: Prefix URL with slash to avoid module confusion
mod - application/core/plugins/QuickMenu/QuickMenu.php Diff File

questionobject_prototype1 50418915

2016-10-17 00:47

ollehar1


Details Diff		 Dev: Make renderWrapperTemplate public so it can be used as object; prefix URL with slash
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File

questionobject_prototype1 a3e2c079

2016-10-17 00:41

ollehar1


Details Diff		 Dev: Use question_view as default view for question module
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/questions/ArrayQuestionObject/controllers/AdminController.php Diff File
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File

questionobject_prototype1 0ba04c17

2016-10-17 00:24

ollehar1


Details Diff		 Dev: Move things around so we can render question summary from question module
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/questions/ArrayQuestionObject/ArrayQuestionObjectModule.php Diff File
mod - application/core/questions/ArrayQuestionObject/controllers/AdminController.php Diff File
add - application/core/questions/common/controllers/AdminBaseController.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File

questionobject_prototype1 a168728f

2016-10-16 22:58

ollehar1


Details Diff		 Merge remote-tracking branch 'origin/master' into questionobject_prototype1
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/survey/questions/list_dropdown/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/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - scripts/array-totalsum.js Diff File
mod - scripts/expressions/em_javascript.js Diff File

answers_html 8b977014

2016-10-16 18:25

DenisChenu


Details Diff		 Fixed issue 11800 : time limit expiry message + disable submit
Fixed issue 11795 : superfluous class .col-xs-12 in timer
Dev : for 11800 : use css transition		 Affected Issues
11795, 11800
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/qanda_helper.php Diff File
mod - application/views/survey/question_timer/timer_content.php Diff File
mod - application/views/survey/question_timer/timer_footer.php Diff File
mod - application/views/survey/question_timer/timer_header.php Diff File
mod - application/views/survey/question_timer/timer_javascript.php Diff File
add - scripts/timer.js Diff File

answers_html 04f8af95

2016-10-15 21:12

DenisChenu


Details Diff		 Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey into answers_html
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html 9cad06b4

2016-10-15 21:09

DenisChenu


Details Diff		 New feature 11797: Allow template to use some class in default core message: message.pstpl
Dev: move some message to this new pstpl file
Dev: surely some more todo		 Affected Issues
11797
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/replacements_helper.php Diff File
add - application/views/survey/system/error.php Diff File
mod - application/views/survey/system/loadForm/error.php Diff File
add - application/views/survey/system/message.php Diff File
add - application/views/survey/system/url.php Diff File
mod - templates/basic/pstpl/completed.pstpl Diff File
add - templates/basic/pstpl/message.pstpl Diff File
add - templates/default/views/message.pstpl Diff File
add - templates/test/pstpl/message.pstpl Diff File

answers_html 41fe9ae9

2016-10-15 18:13

DenisChenu


Details Diff		 Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

master 1fef50b7

2016-10-15 18:12

DenisChenu


Details Diff		 Dev: bad merging : close the select
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html 95937585

2016-10-15 18:10

DenisChenu


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

# Conflicts:
# application/views/survey/questions/list_dropdown/answer.php
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html e69e1732

2016-10-15 18:08

DenisChenu


Details Diff		 Merge branch 'answers_html' of github.com:LimeSurvey/LimeSurvey into answers_html
mod - application/controllers/SurveyController.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/questionHelper.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/list_dropdown/answer.php Diff File
mod - application/views/survey/questions/ranking/answer.php Diff File
mod - application/views/survey/system/display.php Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File
mod - templates/basic/config.xml Diff File
mod - templates/test/config.xml Diff File

master 646ecdac

2016-10-15 18:07

DenisChenu


Details Diff		 Fixed issue 11702: Dropdown question : 2 'no answer' if value selected is 0

# Conflicts:
# application/views/survey/questions/list_dropdown/answer.php		 Affected Issues
11702
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html a027f11a

2016-10-15 18:00

DenisChenu


Details Diff		 Fixed issue 11702: Dropdown question : 2 'no answer' if value selected is 0 Affected Issues
11702
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.php Diff File

answers_html c6ccf7b5

2016-10-15 17:38

DenisChenu


Details Diff		 Fixed issue 11779: Ranking question different styling
Dev: height are really hard to fix : We need a margin bottom
Dev: set the height fix the issue with border-box
Dev: BUT border-box is not apply when using min-height
Dec: We CAN NOT use height : some element can be hidden : then the list can be bigger with array filtering after		 Affected Issues
11779
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/ranking/answer.php Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File

answers_html 2879302c

2016-10-15 16:49

DenisChenu


Details Diff		 New feature 11798: Wrapper to end url and othe url (then can add it directly) Affected Issues
11798
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File

answers_html 1ea9bac8

2016-10-15 16:22

DenisChenu


Details Diff		 Dev: #11801: Move views/survey/system/display.php to layout
Dev: remove usage of common_helper
Dev: remove Basic CMS Integration support (depecated : see https://manual.limesurvey.org/The_template_editor#Basic_CMS_Integration_support)
mod - application/controllers/SurveyController.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/questionHelper.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/system/display.php Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - templates/basic/config.xml Diff File
mod - templates/test/config.xml Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 617 618 619 620 621 622 623 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last