Changesets: LimeSurvey

twig-layout 67a61d75

2017-02-20 16:47

LouisGac


Details Diff
Dev: turned language changer to data mode
mod - application/helpers/frontend_helper.php Diff File

twig-layout b01b1e01

2017-02-20 16:46

LouisGac


Details Diff
Dev: prepared layout for first page (will be probably merged with main layout)
add - templates/default/views/layout_first_page.twig Diff File

twig-layout 32c94c56

2017-02-20 16:46

LouisGac


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

twig-layout d4efc9e8

2017-02-20 13:59

LouisGac


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

twig-layout d0e37f8d

2017-02-20 13:52

LouisGac


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

twig-layout 1a5c8be4

2017-02-20 13:49

LouisGac


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

twig-layout 9c331904

2017-02-20 13:46

LouisGac


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

twig-layout 71ed3ed5

2017-02-20 13:33

LouisGac


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

twig-layout d312f2a9

2017-02-17 19:31

LouisGac


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

twig-layout 24e5bbcd

2017-02-17 19:25

LouisGac


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

twig-layout 883f6471

2017-02-17 19:05

LouisGac


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

twig-layout 782959a9

2017-02-17 18:53

LouisGac


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

twig-layout 55e9e4c7

2017-02-17 18:53

LouisGac


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

twig-layout 52830415

2017-02-17 18:52

LouisGac


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

twig-layout e287de6b

2017-02-17 18:52

LouisGac


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

develop ac98d1a3

2017-02-17 18:35

ollehar


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

develop f56b145e

2017-02-17 18:35

ollehar


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

Conflicts:
application/libraries/PluginManager/PluginManager.php
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
rm - application/core/PluginEvent.php Diff
rm - application/core/PluginManager.php Diff
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 18:30

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.
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
rm - application/core/PluginEvent.php Diff
rm - application/core/PluginManager.php Diff
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 17:57

ollehar


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

Conflicts:
application/controllers/survey/index.php
application/libraries/PluginManager/PluginBase.php
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 11:52

LouisGac


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

twig-layout 193c26c9

2017-02-17 11:49

LouisGac


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

twig-layout 2a269e1e

2017-02-17 11:31

LouisGac


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

twig-layout 4fc6949b

2017-02-17 11:27

LouisGac


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

twig-layout df5734dc

2017-02-16 18:53

LouisGac


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

twig-layout a628053d

2017-02-16 18:48

LouisGac


Details Diff
Dev: moved captcha/token form outside of buildsession
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 566 567 568 569 570 571 572 ... 600 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last