Changesets: LimeSurvey

Search Browse Back to Index

twig-layout d4efc9e8

2017-02-20 12:59:33

LouisGac

Details Diff 		Dev: put back displayFirstPageIfNeeded() after initMove()...
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout d0e37f8d

2017-02-20 12:52:18

LouisGac

Details Diff 		Dev: move displayFirstPageIfNeeded() with showTokenOrCaptchaFormsIfNeeded()
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout 1a5c8be4

2017-02-20 12:49:49

LouisGac

Details Diff 		Dev: renamed runPage() to initMove()
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout 9c331904

2017-02-20 12:46:46

LouisGac

Details Diff 		Dev: moved display function from runPage() to run()
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/frontend_helper.php Diff File

twig-layout 71ed3ed5

2017-02-20 12:33:53

LouisGac

Details Diff 		Dev: finished reading/cleaning initFirstStep and subfunctions
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/frontend_helper.php Diff File

twig-layout d312f2a9

2017-02-17 18:31:13

LouisGac

Details Diff 		Dev: some cleaning
Attach Issues:
mod - application/helpers/frontend_helper.php Diff File
mod - templates/default/views/user_forms_layout.twig Diff File

twig-layout 24e5bbcd

2017-02-17 18:25:15

LouisGac

Details Diff 		Dev: use renderCaptcha() for scenario without token form
Attach Issues:
mod - templates/default/views/user_forms_layout.twig Diff File

twig-layout 883f6471

2017-02-17 18:05:51

LouisGac

Details Diff 		Dev: fixed reset() issue
Attach Issues:
mod - templates/default/views/user_forms_layout.twig Diff File

twig-layout 782959a9

2017-02-17 17:53:24

LouisGac

Details Diff 		Dev: use the captcha/token layout
Attach Issues:
mod - application/helpers/frontend_helper.php Diff File

twig-layout 55e9e4c7

2017-02-17 17:53:05

LouisGac

Details Diff 		Dev: added a twig layout for token/captcha form
Attach Issues:
add - templates/default/views/user_forms_layout.twig Diff File

twig-layout 52830415

2017-02-17 17:52:36

LouisGac

Details Diff 		Dev: added renderCaptcha() to LS Twig extension
Attach Issues:
mod - application/core/LS_Twig_Extension.php Diff File

twig-layout e287de6b

2017-02-17 17:52:11

LouisGac

Details Diff 		Dev: added functions to twig
Attach Issues:
mod - application/config/internal.php Diff File

develop ac98d1a3

2017-02-17 17:35:36

ollehar

Details Diff 		Dev: Fix namespace for oldUrlCompat
Attach Issues:
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php Diff File

develop f56b145e

2017-02-17 17:35:22

ollehar

Details Diff 		Merge remote-tracking branch 'origin/master' into develop

Conflicts:
application/libraries/PluginManager/PluginManager.php
Attach Issues:
mod - application/commands/PluginCommand.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.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/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/LSYii_Application.php Diff File
rm - application/core/PluginBase.php Diff File
rm - application/core/PluginEvent.php Diff File
rm - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.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/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File

master 22253b8b

2017-02-17 17:30:31

ollehar

Details Diff 		Dev: Remove three empty classes

Dev: Three classes from the plugin system that was not needed.
Dev: Needed to include \ls\pluginmanager\PluginEvent in a lot
Dev: of places.
Attach Issues:
mod - application/commands/PluginCommand.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.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/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/LSYii_Application.php Diff File
rm - application/core/PluginBase.php Diff File
rm - application/core/PluginEvent.php Diff File
rm - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.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/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File

develop 3981feab

2017-02-17 16:57:41

ollehar

Details Diff 		Merge remote-tracking branch 'origin/master' into develop

Conflicts:
application/controllers/survey/index.php
application/libraries/PluginManager/PluginBase.php
Attach Issues:
mod - application/commands/PluginCommand.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.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/statistics.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_delete_results.php Diff File
mod - application/helpers/admin/activate_helper.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/remotecontrol/remotecontrol_handle.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/token/token_bar.php 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/da/da.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/hu/hu.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/pt/pt.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sl/sl.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File

twig-layout 32fcf011

2017-02-17 10:52:23

LouisGac

Details Diff 		Dev: removed todo
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout 193c26c9

2017-02-17 10:49:01

LouisGac

Details Diff 		Dev: some cleaning
Attach Issues:
mod - application/helpers/frontend_helper.php Diff File

twig-layout 2a269e1e

2017-02-17 10:31:00

LouisGac

Details Diff 		Dev: added not about captcha problem
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout 4fc6949b

2017-02-17 10:27:08

LouisGac

Details Diff 		Dev: use $this->template
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout df5734dc

2017-02-16 17:53:23

LouisGac

Details Diff 		Dev: added note about captcha bug
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File

twig-layout a628053d

2017-02-16 17:48:13

LouisGac

Details Diff 		Dev: moved captcha/token form outside of buildsession
Attach Issues:
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/frontend_helper.php Diff File

twig-layout b355e153

2017-02-16 17:31:13

LouisGac

Details Diff 		Dev: some cleaning
Attach Issues:
mod - application/helpers/frontend_helper.php Diff File

twig-layout f86aabc2

2017-02-16 17:20:23

LouisGac

Details Diff 		Dev: put back language code
Attach Issues:
mod - application/helpers/frontend_helper.php Diff File

twig-layout f0bd37ac

2017-02-16 17:17:31

LouisGac

Details Diff 		Dev: removed double definition of $sTemplatePath
Attach Issues:
mod - application/helpers/frontend_helper.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 552 553 554 555 556 557 558 ... 600 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1451 1452 1453  Next  Last