Changesets: LimeSurvey
develop c1c99345 2017-04-18 17:22:16
|
Dev: removed useless occurrences of redata (get_defined_vars) | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
develop 5a464e53 2017-04-18 17:12:40
|
Dev: replaced templatereplace by twig render. | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
develop a21f8a29 2017-04-18 14:21:19
|
Dev: removed pstpl files | ||
rm - templates/default/views/clearall.pstpl | Diff File | ||
rm - templates/default/views/completed.pstpl | Diff File | ||
rm - templates/default/views/endgroup.pstpl | Diff File | ||
rm - templates/default/views/endpage.pstpl | Diff File | ||
rm - templates/default/views/form.pstpl | Diff File | ||
rm - templates/default/views/layout_submit.twig | Diff File | ||
rm - templates/default/views/load.pstpl | Diff File | ||
rm - templates/default/views/message.pstpl | Diff File | ||
rm - templates/default/views/navigator.pstpl | Diff File | ||
rm - templates/default/views/print_group.pstpl | Diff File | ||
rm - templates/default/views/print_question.pstpl | Diff File | ||
rm - templates/default/views/print_survey.pstpl | Diff File | ||
rm - templates/default/views/privacy.pstpl | Diff File | ||
rm - templates/default/views/question.pstpl | Diff File | ||
rm - templates/default/views/register.pstpl | Diff File | ||
rm - templates/default/views/save.pstpl | Diff File | ||
rm - templates/default/views/startgroup.pstpl | Diff File | ||
rm - templates/default/views/startpage.pstpl | Diff File | ||
rm - templates/default/views/survey.pstpl | Diff File | ||
rm - templates/default/views/surveylist.pstpl | Diff File | ||
rm - templates/default/views/welcome.pstpl | Diff File | ||
develop fd44fc3f 2017-04-18 13:14:53
|
Dev: fixed merge | ||
mod - application/models/Response.php | Diff File | ||
develop 634cc8ab 2017-04-18 13:14:41
|
Dev: merged assessments | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
develop 67db23b7 2017-04-18 13:07:31
|
Dev: revert db value for now | ||
mod - application/config/version.php | Diff File | ||
develop 8b62a87b 2017-04-18 13:07:14
|
Dev: few fixes | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
master faf3f187 2017-04-18 13:04:38 Committer: |
[security] Fixed issue #12270: XSS Vulnerability (#682) |
Affected Issues 12270 |
|
mod - application/helpers/qanda_helper.php | Diff File | ||
develop 0b42647e 2017-04-18 12:50:49
|
Dev: fixed issue with plugin manager instantiation | ||
mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
develop 95d3effb 2017-04-13 15:10:35
|
Merge branch 'master' into develop Conflicts: application/commands/console.php application/config/version.php application/controllers/admin/printablesurvey.php application/controllers/admin/quotas.php application/helpers/SurveyRuntimeHelper.php application/helpers/expressions/em_manager_helper.php application/helpers/frontend_helper.php application/helpers/replacements_helper.php application/libraries/PluginManager/PluginManager.php application/models/Permission.php application/models/Question.php application/models/QuestionAttribute.php application/models/Quota.php application/models/QuotaLanguageSetting.php application/models/QuotaMember.php application/models/Response.php application/models/Survey.php application/models/SurveyDynamic.php application/models/SurveyLanguageSetting.php application/models/Token.php application/models/User.php application/views/admin/quotas/editquota_view.php application/views/admin/quotas/newquota_view.php application/views/admin/quotas/viewquotasrow_view.php application/views/register/registerForm.php application/views/survey/frontpage/enterToken.php docs/release_notes.txt scripts/modaldialog.js scripts/star-rating.js templates/news_paper/views/startpage.pstpl |
||
mod - README.md | Diff File | ||
mod - application/commands/PluginCommand.php | Diff File | ||
mod - application/commands/console.php | Diff File | ||
mod - application/config/config-defaults.php | Diff File | ||
mod - application/config/third_party.php | Diff File | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/InstallerController.php | Diff File | ||
mod - application/controllers/PluginsController.php | Diff File | ||
mod - application/controllers/PrintanswersController.php | Diff File | ||
mod - application/controllers/RegisterController.php | Diff File | ||
mod - application/controllers/UploaderController.php | Diff File | ||
mod - application/controllers/admin/PluginHelper.php | Diff File | ||
mod - application/controllers/admin/authentication.php | Diff File | ||
mod - application/controllers/admin/conditionsaction.php | Diff File | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/dataentry.php | Diff File | ||
mod - application/controllers/admin/export.php | Diff File | ||
mod - application/controllers/admin/pluginmanager.php | Diff File | ||
mod - application/controllers/admin/printablesurvey.php | Diff File | ||
mod - application/controllers/admin/quotas.php | Diff File | ||
mod - application/controllers/admin/responses.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/core/LSUserIdentity.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
add - application/core/PluginBase.php | Diff File | ||
add - application/core/PluginEvent.php | Diff File | ||
add - application/core/PluginManager.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/core/db/DbConnection.php | Diff File | ||
mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php | Diff File | ||
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js | Diff File | ||
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php | Diff File | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/admin/exportresults_helper.php | Diff File | ||
mod - application/helpers/admin/import_helper.php | Diff File | ||
mod - application/helpers/admin/token_helper.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/questionHelper.php | Diff File | ||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - application/helpers/sanitize_helper.php | Diff File | ||
mod - application/helpers/surveytranslator_helper.php | Diff File | ||
mod - application/libraries/BigData.php | Diff File | ||
mod - application/libraries/Date_Time_Converter.php | Diff File | ||
mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php | Diff File | ||
mod - application/libraries/PluginManager/iPlugin.php | Diff File | ||
mod - application/models/AdminTheme.php | Diff File | ||
mod - application/models/LSActiveRecord.php | Diff File | ||
mod - application/models/ParticipantAttributeName.php | Diff File | ||
mod - application/models/Permission.php | Diff File | ||
mod - application/models/Question.php | Diff File | ||
mod - application/models/QuestionAttribute.php | Diff File | ||
mod - application/models/QuestionGroup.php | Diff File | ||
mod - application/models/Quota.php | Diff File | ||
mod - application/models/QuotaLanguageSetting.php | Diff File | ||
mod - application/models/QuotaMember.php | Diff File | ||
mod - application/models/Response.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/models/User.php | Diff File | ||
mod - application/views/admin/participants/modal_subviews/_editAttribute.php | Diff File | ||
add - application/views/admin/quotas/_form.php | Diff File | ||
add - application/views/admin/quotas/_form_langsetting.php | Diff File | ||
add - application/views/admin/quotas/_form_langsettings.php | Diff File | ||
mod - application/views/admin/quotas/editquota_view.php | Diff File | ||
rm - application/views/admin/quotas/editquotalang_view.php | Diff File | ||
mod - application/views/admin/quotas/newquota_view.php | Diff File | ||
add - application/views/admin/quotas/viewquotas_massive_langsettings_form.php | Diff File | ||
add - application/views/admin/quotas/viewquotas_massive_selector.php | Diff File | ||
add - application/views/admin/quotas/viewquotas_quota_actions.php | Diff File | ||
add - application/views/admin/quotas/viewquotas_quota_members.php | Diff File | ||
add - application/views/admin/quotas/viewquotas_quota_members_actions.php | Diff File | ||
add - application/views/admin/quotas/viewquotas_quota_members_item.php | Diff File | ||
mod - application/views/admin/quotas/viewquotas_view.php | Diff File | ||
rm - application/views/admin/quotas/viewquotasfooter_view.php | Diff File | ||
rm - application/views/admin/quotas/viewquotasrow_view.php | Diff File | ||
rm - application/views/admin/quotas/viewquotasrowsub_view.php | Diff File | ||
mod - application/views/admin/super/_configuration_menu.php | Diff File | ||
mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
mod - application/views/admin/survey/Question/listquestions.php | Diff File | ||
mod - application/views/admin/survey/Question/question_subviews/_tabs.php | Diff File | ||
mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php | Diff File | ||
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
mod - application/views/admin/token/invite.php | Diff File | ||
mod - application/views/admin/token/managetokenattributes.php | Diff File | ||
mod - application/views/admin/token/remind.php | Diff File | ||
mod - application/views/admin/user/deluser.php | Diff File | ||
mod - application/views/admin/user/setuserpermissions.php | Diff File | ||
mod - application/views/layouts/main.php | Diff File | ||
mod - application/views/statistics_user_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/cs/cs.mo | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
mod - locale/es-MX/es-MX.mo | Diff File | ||
mod - locale/es/es.mo | Diff File | ||
mod - locale/eu/eu.mo | Diff File | ||
mod - locale/fi/fi.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
mod - locale/gl/gl.mo | Diff File | ||
mod - locale/hr/hr.mo | Diff File | ||
mod - locale/hu/hu.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 | ||
add - locale/lb/index.html | Diff File | ||
add - locale/lb/lb.mo | Diff File | ||
mod - locale/mn/mn.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/pt.mo | Diff File | ||
mod - locale/ru/ru.mo | Diff File | ||
mod - locale/sk/sk.mo | Diff File | ||
mod - locale/sv/sv.mo | Diff File | ||
mod - locale/th/th.mo | Diff File | ||
mod - locale/tr/tr.mo | Diff File | ||
mod - locale/zh-Hans/zh-Hans.mo | Diff File | ||
mod - scripts/admin/answers.js | Diff File | ||
mod - scripts/admin/participantpanel.js | Diff File | ||
mod - scripts/admin/surveypermissions.js | Diff File | ||
mod - scripts/admin/userpermissions.js | Diff File | ||
mod - scripts/ajaxupload.js | Diff File | ||
mod - scripts/array-totalsum.js | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
mod - scripts/uploader.js | Diff File | ||
rm - third_party/jquery-cookie/.gitignore | Diff File | ||
rm - third_party/jquery-cookie/.jshintrc | Diff File | ||
rm - third_party/jquery-cookie/.tm_properties | Diff File | ||
rm - third_party/jquery-cookie/.travis.yml | Diff File | ||
rm - third_party/jquery-cookie/CHANGELOG.md | Diff File | ||
rm - third_party/jquery-cookie/Gruntfile.js | Diff File | ||
rm - third_party/jquery-cookie/README.md | Diff File | ||
rm - third_party/jquery-cookie/component.json | Diff File | ||
rm - third_party/jquery-cookie/cookie.jquery.json | Diff File | ||
rm - third_party/jquery-cookie/jquery.cookie.js | Diff File | ||
rm - third_party/jquery-cookie/package.json | Diff File | ||
rm - third_party/jquery-cookie/test/index.html | Diff File | ||
rm - third_party/jquery-cookie/test/malformed_cookie.html | Diff File | ||
rm - third_party/jquery-cookie/test/server.js | Diff File | ||
rm - third_party/jquery-cookie/test/tests.js | Diff File | ||
add - third_party/js-cookie/README.md | Diff File | ||
add - third_party/js-cookie/js.cookie.js | Diff File | ||
add - third_party/js-cookie/js.cookie.min.js | Diff File | ||
add - tmp/runtime/CSS/index.html | Diff File | ||
add - tmp/runtime/URI/index.html | Diff File | ||
master a18bb1cb 2017-04-12 17:15:43 Details Diff |
Dev: Fixed issue : broken javascript if cleansedValue is empty | ||
mod - scripts/survey_runtime.js | Diff File | ||
develop c8f2b045 2017-04-12 12:42:07
|
Merge branch 'twig-layout' into develop Conflicts: application/config/version.php application/helpers/frontend_helper.php application/helpers/replacements_helper.php application/models/Template.php application/models/TemplateConfiguration.php |
||
mod - application/config/config-defaults.php | Diff File | ||
mod - application/config/internal.php | Diff File | ||
mod - application/config/packages.php | Diff File | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/core/LSETwigViewRenderer.php | Diff File | ||
add - application/core/LS_Twig_Extension.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/helpers/viewHelper.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
mod - application/models/Template.php | Diff File | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
rm - templates/default/views/assessment.pstpl | Diff File | ||
add - templates/default/views/group.twig | Diff File | ||
add - templates/default/views/layout-submit-preview.twig | Diff File | ||
add - templates/default/views/layout-submit.twig | Diff File | ||
add - templates/default/views/layout.twig | Diff File | ||
add - templates/default/views/layout_clearall.twig | Diff File | ||
add - templates/default/views/layout_errors.twig | Diff File | ||
add - templates/default/views/layout_first_page.twig | Diff File | ||
add - templates/default/views/layout_quotas.twig | Diff File | ||
add - templates/default/views/layout_save.twig | Diff File | ||
add - templates/default/views/layout_submit.twig | Diff File | ||
add - templates/default/views/navigator.twig | Diff File | ||
add - templates/default/views/privacy.twig | Diff File | ||
add - templates/default/views/question.twig | Diff File | ||
add - templates/default/views/subviews/LEMDebug.twig | Diff File | ||
add - templates/default/views/subviews/allinone_mode_welcome_privacy.twig | Diff File | ||
add - templates/default/views/subviews/assessments.twig | Diff File | ||
add - templates/default/views/subviews/bootstrap_alert_modal.twig | Diff File | ||
add - templates/default/views/subviews/flash_message.twig | Diff File | ||
add - templates/default/views/subviews/google_analytics.twig | Diff File | ||
add - templates/default/views/subviews/head.twig | Diff File | ||
add - templates/default/views/subviews/language_changer.twig | Diff File | ||
add - templates/default/views/subviews/nav_bar.twig | Diff File | ||
add - templates/default/views/subviews/navigation/clearall_links.twig | Diff File | ||
add - templates/default/views/subviews/navigation/language_changer_top_menu.twig | Diff File | ||
add - templates/default/views/subviews/navigation/question_index_menu.twig | Diff File | ||
add - templates/default/views/subviews/navigation/save_links.twig | Diff File | ||
add - templates/default/views/subviews/no_js_alert.twig | Diff File | ||
add - templates/default/views/subviews/start_form.twig | Diff File | ||
add - templates/default/views/subviews/top_container.twig | Diff File | ||
add - templates/default/views/subviews/warnings.twig | Diff File | ||
add - templates/default/views/user_forms_layout.twig | Diff File | ||
add - templates/default/views/welcome.twig | Diff File | ||
mod - third_party/Twig/ETwigViewRenderer.php | Diff File | ||
twig-layout 7d509629 2017-04-11 19:45:04
|
Dev: twigged submit preview | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
add - templates/default/views/layout-submit-preview.twig | Diff File | ||
twig-layout bb87a9f8 2017-04-11 19:28:28
|
Dev: removed unused code (note: confirm with Denis) | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
twig-layout f8c5d213 2017-04-11 19:16:37
|
Dev: twigged clear all | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
add - templates/default/views/layout_clearall.twig | Diff File | ||
twig-layout 804f9583 2017-04-10 15:42:22
|
Dev: some cleaning | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
master 6c75d586 2017-04-10 11:33:38 Details Diff |
Dev: QuickMenu plugin has no self::surveyId variable | ||
mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
twig-layout a78f19b8 2017-04-07 16:28:52
|
Dev: quotas twigged | ||
mod - templates/default/views/layout_quotas.twig | Diff File | ||
twig-layout 3857ae83 2017-04-07 16:28:40
|
Dev: prepared datas for quota twig views | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
twig-layout e5da6f7f 2017-04-07 16:27:40
|
Dev: quick fix | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
2.06lts 78723b30 2017-04-07 10:54:19
|
Fixed issue: wrong url generation for survey new test, that could lead to session problem when combined with wrong resources url (eg: favicon). | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
2.06lts ed3b5788 2017-04-07 10:51:44
|
Dev: some cleaning | ||
mod - application/models/TokenDynamic.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
master fb0be432 2017-04-07 10:44:10
|
Fixed issue: wrong url generation for survey new test, that could lead to session problem when combined with wrong resources url (eg: favicon). | ||
mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
mod - application/models/TokenDynamic.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/surveybar_view.php | Diff File | ||
twig-layout 6feca022 2017-04-06 17:46:05
|
Dev: added layout_quotas.twig | ||
add - templates/default/views/layout_quotas.twig | Diff File | ||
twig-layout 18611402 2017-04-06 16:50:32
|
Dev: added comment for next TWIG file to create | ||
mod - application/helpers/frontend_helper.php | Diff File |