Changesets: LimeSurvey

master a8162a07

2018-01-22 11:32:18

TonisOrmisson


Committer: GitHub Details Diff
Merge pull request #948 from lokiahk/patch-3

Fix issue 13161: Error page when submitting a form which has been sav…
Attach Issues:
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 5cbfef9d

2018-01-22 08:51:59

TonisOrmisson


Committer: GitHub Details Diff
Merge pull request #949 from TonisOrmisson/error-img-local

DEV: fix vanilla theme external image to local
Attach Issues:
mod - themes/survey/vanilla/css/errors.css Diff File
add - themes/survey/vanilla/files/block.gif Diff File

master 12cd3d97

2018-01-22 08:51:26

markusfluer

Details Diff
Dev: removed create_function from common helper
Attach Issues:
mod - application/helpers/common_helper.php Diff File

master 138849e3

2018-01-22 08:49:56

TonisOrmisson

Details Diff
DEV: fix vanilla theme external image to local
Attach Issues:
mod - themes/survey/vanilla/css/errors.css Diff File
add - themes/survey/vanilla/files/block.gif Diff File

master d0786326

2018-01-22 05:13:38

kllam


Committer: GitHub Details Diff
Fix issue 13161: Error page when submitting a form which has been saved for later and then resumed.
Attach Issues:
mod - application/helpers/expressions/em_manager_helper.php Diff File

master ac8d0726

2018-01-21 17:57:56

TonisOrmisson


Committer: GitHub Details Diff
Merge pull request #947 from TonisOrmisson/fix-tavis-tags

DEV: fix travis tag branch develop->master
Attach Issues:
mod - README.md Diff File

master 335ca8d6

2018-01-21 17:57:21

TonisOrmisson

Details Diff
DEV: fix travis tag branch develop->master
Attach Issues:
mod - README.md Diff File

master a1cd6d20

2018-01-21 14:44:56

TonisOrmisson


Committer: GitHub Details Diff
Merge pull request #946 from TonisOrmisson/fix-tests

DEV: fix failing tests (missing upload/themes/survey folder)
Attach Issues:
mod - .gitignore Diff File
mod - .travis.yml Diff File

master 7e0530d4

2018-01-21 14:32:21

TonisOrmisson

Details Diff
DEV: fix failing tests (missing upload/themes/survey folder)
Attach Issues:
mod - .gitignore Diff File
mod - .travis.yml Diff File

master 5f6026ef

2018-01-19 23:46:36

DenisChenu

Details Diff
Dev: oups …
Attach Issues:
mod - application/controllers/admin/authentication.php Diff File

master b847f05c

2018-01-19 19:03:22

DenisChenu

Details Diff
Dev: comment fix
Attach Issues:
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File

master abef4c6f

2018-01-19 19:01:18

DenisChenu

Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_RC_AuthPlugin
Dev: fix conflict
* 'master' of https://github.com/LimeSurvey/LimeSurvey.git: (84 commits)
Dev: remove deprecated code _GetSessionUserRights Dev: USER_RIGHT_INITIALSUPERADMIN replaced by config Dev: and not used since 2.6lts or before
Fixed issue 13200: LDAP Auth plugin user autocreate broken Dev: just unsubscribe from beforeHasPermission when needed Dev: i hate to find a one line fix after testing, hacking for hours …
Dev: removed special characters from sidemenu
Dev: minimal changes and typo fixing
Dev: translate surveymenuentried
Fixed issue: language error
Fixed issue 13212: missing translation frontend survey
Fixed issue: Emailtemplate reset not working
Fixed issue 13215: Missing string
Fixed issue 13216: missing translation
Updated translation: Catalan by qualitatuvic Updated translation: German by c_schmitz Updated translation: Hungarian by kkd Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Polish by elissa Updated translation: German (Informal) by c_schmitz Updated translation: Polish (Informal) by elissa
Fixed issue 13193: Unable to update question type (simple selector)
Dev: added a demomode command to not only restore mint status but also install some demo surveys
Fixed issue: Demo rendered unusable with wipe command
New feature 12240: Validation settings for "array by column" question type
Fixed issue 13190 : Remove text or uncheck checkbox automatically not work
Updated translation: Danish by abc99 Updated translation: Georgian by zch5368
Updated translation: German by c_schmitz Updated translation: Hungarian by kkd Updated translation: Japanese by nomoto Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Romanian by cdorin
Fixed issue: Captcha not showing
Removed translation: Papiamento (Aruba)
...

# Conflicts:
# application/helpers/remotecontrol/remotecontrol_handle.php
Affected Issues
13190, 13193, 13200, 13212, 13215, 13216
add - application/commands/DemomodeCommand.php Diff File
mod - application/commands/WipeCommand.php Diff File
mod - application/commands/console.php Diff File
add - application/config/fonts.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
add - application/config/questiontypes.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/updater_version.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
add - application/core/ConsoleHttpSession.php Diff File
add - application/core/LSCaptcha.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/assets/reload.js Diff File
mod - application/extensions/captchaExtended/CaptchaExtendedAction.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_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/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/global_settings/_email.php Diff File
mod - application/views/admin/super/layout_insurvey.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_ajax_variables.php Diff File
mod - application/views/admin/survey/_activation_error.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/emailpost.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
rm - application/views/survey/questions/answer/5pointchoice/answer.php Diff File
add - application/views/survey/questions/answer/5pointchoice/answer.twig Diff File
rm - application/views/survey/questions/answer/5pointchoice/rows/item_row.php Diff File
add - application/views/survey/questions/answer/5pointchoice/rows/item_row.twig Diff File
mod - application/views/survey/questions/answer/list_dropdown/rows/othertext.php Diff File
mod - application/views/survey/questions/answer/listradio/rows/answer_row_other.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic_slider.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
mod - assets/packages/limesurvey/survey.js Diff File
add - assets/packages/questions/5pointchoice/css/emoji.css Diff File
add - assets/packages/questions/5pointchoice/css/ss-emoji.css Diff File
add - assets/packages/questions/5pointchoice/fonts/noto_emoji_color.ttf Diff File
add - assets/packages/questions/5pointchoice/fonts/noto_emoji_regular.ttf Diff File
add - assets/packages/questions/5pointchoice/fonts/ss-emoji-adobe-mozilla.ttf Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - assets/scripts/admin/tokens.js Diff File
mod - assets/scripts/multiplechoice_withcomments.js Diff File
mod - assets/scripts/survey_runtime.js Diff File
mod - docs/release_notes.txt Diff File
mod - framework/cli/views/webapp/protected/controllers/SiteController.php Diff File
mod - index.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.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/es/es.mo Diff File
mod - locale/hu/hu.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
mod - locale/ka/ka.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
rm - locale/pap-AW/index.html Diff File
rm - locale/pap-AW/pap-AW.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
add - tests/LimeSurveyWebDriver.php Diff File
mod - tests/TestBaseClass.php Diff File
mod - tests/TestBaseClassWeb.php Diff File
mod - tests/TestHelper.php Diff File
mod - tests/bootstrap.php Diff File
add - tests/data/surveys/limesurvey_survey_143933.lss Diff File
add - tests/surveys/LanguageChangerTest.php Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/answer.twig Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/bootswatch/scripts/theme.js Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/layout_user_forms.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/load.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/save.twig Diff File
add - themes/survey/vanilla/views/subviews/content/userforms.twig Diff File
add - themes/survey/vanilla/views/subviews/logincomponents/captcha.twig Diff File
add - themes/survey/vanilla/views/subviews/logincomponents/token.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/language_changer_top_menu.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_head.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_question.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_table.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-increase-same-decrease.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-yes-uncertain-no.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_boilerplate.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_gender.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_upload-files.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_yes-no.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_form.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_message.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_success.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/required.twig Diff File
mod - themes/survey/vanilla/views/subviews/survey/group_subviews/group_desc.twig Diff File
mod - themes/survey/vanilla/views/subviews/survey/group_subviews/group_name.twig Diff File
rm - upload/surveys/index.html Diff File
rm - upload/surveys/readme.txt Diff File
rm - upload/templates/index.html Diff File
rm - upload/templates/readme.txt Diff File
rm - upload/themes/question/index.html Diff File
rm - upload/themes/survey/index.html Diff File

master 543257f9

2018-01-19 18:24:07

DenisChenu

Details Diff
Dev: remove deprecated code _GetSessionUserRights
Dev: USER_RIGHT_INITIALSUPERADMIN replaced by config
Dev: and not used since 2.6lts or before
Attach Issues:
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File

master a5a05d59

2018-01-19 18:06:37

DenisChenu

Details Diff
Fixed issue 13200: LDAP Auth plugin user autocreate broken
Dev: just unsubscribe from beforeHasPermission when needed
Dev: i hate to find a one line fix after testing, hacking for hours …
Affected Issues
13200
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File

master fd4441a6

2018-01-19 17:43:40

markusfluer

Details Diff
Dev: removed special characters from sidemenu
Attach Issues:
mod - application/core/LsDefaultDataSets.php Diff File

master 7351bc85

2018-01-19 17:38:35

markusfluer

Details Diff
Dev: minimal changes and typo fixing
Attach Issues:
mod - application/core/LsDefaultDataSets.php Diff File

master f2c828f3

2018-01-19 17:02:11

markusfluer

Details Diff
Dev: translate surveymenuentried
Attach Issues:
mod - application/models/Survey.php Diff File

master 240fca7e

2018-01-19 16:37:25

markusfluer

Details Diff
Fixed issue: language error
Attach Issues:
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File

master 12fa8a28

2018-01-19 16:36:15

markusfluer

Details Diff
Fixed issue 13212: missing translation frontend survey Affected Issues
13212
mod - application/config/internal.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic_slider.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_head.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_question.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_table.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-increase-same-decrease.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-yes-uncertain-no.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_boilerplate.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_gender.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_upload-files.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_yes-no.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_form.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_message.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_success.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/required.twig Diff File

master 07b29262

2018-01-19 16:30:46

markusfluer

Details Diff
Fixed issue: Emailtemplate reset not working
Attach Issues:
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File

master 00569957

2018-01-19 14:47:33

LimeSurvey Translations Bot

Details Diff
Updated translation: Catalan by qualitatuvic
Updated translation: German by c_schmitz
Updated translation: Hungarian by kkd
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Polish by elissa
Updated translation: German (Informal) by c_schmitz
Updated translation: Polish (Informal) by elissa
Attach Issues:
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/de/de.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/pl/pl.mo Diff File

master 4e2a5e24

2018-01-19 14:43:16

markusfluer

Details Diff
Fixed issue 13215: Missing string Affected Issues
13215
mod - application/core/LsDefaultDataSets.php Diff File

master 7e426f33

2018-01-19 14:40:53

markusfluer

Details Diff
Fixed issue 13216: missing translation Affected Issues
13216
mod - application/views/admin/global_settings/_email.php Diff File

master 2bde7854

2018-01-19 14:31:36

markusfluer

Details Diff
Fixed issue 13193: Unable to update question type (simple selector) Affected Issues
13193
mod - application/controllers/admin/questions.php Diff File
mod - application/views/admin/super/layout_insurvey.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_ajax_variables.php Diff File
mod - assets/scripts/admin/questions.js Diff File

master d3168a80

2018-01-19 13:10:25

markusfluer

Details Diff
Dev: added a demomode command to not only restore mint status but also install some demo surveys
Attach Issues:
add - application/commands/DemomodeCommand.php Diff File
mod - application/commands/console.php Diff File
add - application/core/ConsoleHttpSession.php Diff File
rm - upload/surveys/index.html Diff File
rm - upload/surveys/readme.txt Diff File
rm - upload/templates/index.html Diff File
rm - upload/templates/readme.txt Diff File
rm - upload/themes/question/index.html Diff File
rm - upload/themes/survey/index.html Diff File
 First  Prev  1 2 3 ... 130 ... 258 259 260 261 262 263 264 ... 390 ... 520 ... 650 ... 780 ... 910 ... 1040 ... 1170 ... 1300 ... 1310 1311 1312  Next  Last