Changesets: LimeSurvey
2.5 3c3b35fe 2016-01-22 16:04:10
|
Dev: corrected undefined index in dataentry | ||
mod - application/controllers/admin/dataentry.php | Diff File | ||
mod - application/controllers/admin/questions.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
2.5 0f333536 2016-01-22 14:56:35
|
Dev: added jpg and pdf as default attribute values for file upload | ||
mod - application/helpers/common_helper.php | Diff File | ||
2.5 8ca3f9f4 2016-01-22 14:44:09 LouisGac Details Diff |
Dev: restored question type preview | ||
mod - application/controllers/admin/questions.php | Diff File | ||
mod - scripts/admin/admin_core.js | Diff File | ||
rtl 2f968e77 2016-01-22 13:57:50 Details Diff |
Merge branch '2.5' into rtl | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/admin/assessments.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/emailtemplates.php | Diff File | ||
mod - application/controllers/admin/export.php | Diff File | ||
mod - application/controllers/admin/expressions.php | Diff File | ||
mod - application/controllers/admin/labels.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/responses.php | Diff File | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.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/core/LSHttpRequest.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - application/core/LSYii_Controller.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
mod - application/helpers/admin/import_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/globalsettings_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
mod - application/models/Answer.php | Diff File | ||
mod - application/models/DefaultValue.php | Diff File | ||
mod - application/models/Question.php | Diff File | ||
mod - application/views/admin/export/exportresults_view.php | Diff File | ||
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_answer.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_arithmetic.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php | Diff File | ||
mod - application/views/admin/export/statistics_subviews/_question.php | Diff File | ||
add - application/views/admin/export/statistics_user_view.php | Diff File | ||
mod - application/views/admin/export/statistics_view.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
mod - application/views/admin/responses/browseindex_view.php | Diff File | ||
mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
mod - application/views/admin/super/_question_explorer.php | Diff File | ||
mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
mod - application/views/admin/super/header.php | Diff File | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
mod - application/views/admin/super/title_bar.php | Diff File | ||
add - application/views/admin/survey/Question/_subQuestionsAndAnwsersJsVariables.php | Diff File | ||
mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
mod - application/views/admin/survey/Question/subQuestion_view.php | Diff File | ||
mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff File | ||
mod - application/views/admin/survey/subview/_template_carousel.php | Diff File | ||
mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
mod - application/views/admin/token/token_bar.php | Diff File | ||
mod - application/views/admin/token/tokenwarning.php | Diff File | ||
mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
mod - application/views/survey/questions/5pointchoice/5pointchoice_footer.php | Diff File | ||
add - application/views/survey/questions/date/date_header.php | Diff File | ||
add - application/views/survey/questions/date/dropdown/date_header.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
add - styles/Black_Pearl/css/lime-admin.css.map | Diff File | ||
rtl 0d95a233 2016-01-22 13:56:56 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/admin/assessments.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/emailtemplates.php | Diff File | ||
mod - application/controllers/admin/export.php | Diff File | ||
mod - application/controllers/admin/expressions.php | Diff File | ||
mod - application/controllers/admin/labels.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/responses.php | Diff File | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.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/core/LSHttpRequest.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - application/core/LSYii_Controller.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
mod - application/helpers/admin/import_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/globalsettings_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
mod - application/models/Answer.php | Diff File | ||
mod - application/models/DefaultValue.php | Diff File | ||
mod - application/models/Question.php | Diff File | ||
mod - application/views/admin/export/exportresults_view.php | Diff File | ||
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_answer.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_arithmetic.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php | Diff File | ||
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php | Diff File | ||
mod - application/views/admin/export/statistics_subviews/_question.php | Diff File | ||
add - application/views/admin/export/statistics_user_view.php | Diff File | ||
mod - application/views/admin/export/statistics_view.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
mod - application/views/admin/responses/browseindex_view.php | Diff File | ||
mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
mod - application/views/admin/super/_question_explorer.php | Diff File | ||
mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
mod - application/views/admin/super/header.php | Diff File | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
mod - application/views/admin/super/title_bar.php | Diff File | ||
add - application/views/admin/survey/Question/_subQuestionsAndAnwsersJsVariables.php | Diff File | ||
mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
mod - application/views/admin/survey/Question/subQuestion_view.php | Diff File | ||
mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff File | ||
mod - application/views/admin/survey/subview/_template_carousel.php | Diff File | ||
mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
mod - application/views/admin/token/token_bar.php | Diff File | ||
mod - application/views/admin/token/tokenwarning.php | Diff File | ||
mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
mod - application/views/survey/questions/5pointchoice/5pointchoice_footer.php | Diff File | ||
add - application/views/survey/questions/date/date_header.php | Diff File | ||
add - application/views/survey/questions/date/dropdown/date_header.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
add - styles/Black_Pearl/css/lime-admin.css.map | Diff File | ||
rtl d45aa2ba 2016-01-22 13:56:43 Details Diff |
Dev: Add curly braces around if-statement | ||
mod - application/views/admin/super/header.php | Diff File | ||
2.5 effe70dc 2016-01-22 13:12:57
|
Dev: usergroupbar close button referrer url | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
2.5 1ecc7cb6 2016-01-22 13:10:20
|
Dev: tokenbar close button referrer url | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/token/token_bar.php | Diff File | ||
2.5 75b0d7f5 2016-01-22 13:07:29
|
Dev: template editor bar close button referrer url | ||
mod - application/controllers/admin/templates.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
2.5 01677534 2016-01-22 13:03:05
|
Dev: survey bar close button referrer url | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
2.5 e5de5b65 2016-01-22 13:00:04
|
Dev: question bar close button referrer url | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
2.5 6e79dee5 2016-01-22 12:52:19
|
Dev: questiongroup bar close button referrer url | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
2.5 021b9c61 2016-01-22 12:48:12
|
Dev: full page bar close button referrer url | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/views/admin/super/fullpagebar_view.php | Diff File | ||
2.5 197fd945 2016-01-22 12:36:29
|
Dev: labelbar close button referrer url | ||
mod - application/controllers/admin/labels.php | Diff File | ||
2.5 f86244ba 2016-01-22 12:35:16
|
Dev: label bar close button | ||
mod - application/controllers/admin/labels.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
2.5 baf298f0 2016-01-22 12:20:04
|
Dev: excluded expert statistics from close loop | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/core/LSHttpRequest.php | Diff File | ||
2.5 5d2561b0 2016-01-22 12:10:13
|
Dev: added check of forbidden actions in getUrlReferrer to avoid looping | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/core/LSHttpRequest.php | Diff File | ||
master 0a2dec58 2016-01-22 12:00:07 Details Diff |
Merge pull request #417 from cebe/patch-1 Re-added Yii framework License file. Thanks @cebe . Just next time : can you put a "Fixed issue" or a "Dev" at start of the commit message. |
||
add - framework/LICENSE | Diff File | ||
2.5 c4b1d4c5 2016-01-22 11:54:38
|
Dev: extended getUrlReferrer in LSHttpRequest | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/core/LSHttpRequest.php | Diff File | ||
mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
master a0cf88da 2016-01-22 11:24:20 Details Diff |
Merge pull request #416 from GuillaumeSmaha/fix_session_expire_postgresql Fixed issue 09644: Unable to preview survey when using database sessions - link bug 09592 |
Affected Issues 09644 |
|
mod - application/config/config-sample-dblib.php | Diff File | ||
mod - application/config/config-sample-mysql.php | Diff File | ||
mod - application/config/config-sample-pgsql.php | Diff File | ||
mod - application/config/config-sample-sqlsrv.php | Diff File | ||
mod - application/controllers/InstallerController.php | Diff File | ||
mod - application/core/db/DbConnection.php | Diff File | ||
add - application/core/web/DbHttpSession.php | Diff File | ||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
mod - third_party/kcfinder/core/bootstrap.php | Diff File | ||
master ed9a57e4 2016-01-22 11:15:20 Details Diff |
Merge pull request #420 from Shnoulle/master_cronPermissionFix2 unable to use Survey::model in Plugin cron : 2nd solution |
||
mod - application/models/Permission.php | Diff File | ||
2.5 f0740425 2016-01-22 11:11:54
|
Dev: simple/expert mode for statistics | ||
mod - application/controllers/admin/export.php | Diff File | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/views/admin/export/exportresults_view.php | Diff File | ||
mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
master adfd7f16 2016-01-22 08:45:48 Details Diff |
Release 2.06+ Build 160123 | ||
mod - docs/release_notes.txt | Diff File | ||
master 4fb2c859 2016-01-22 08:43:35 Details Diff |
Fixed issue 10162: Jump instead of navigate to avoid saving NULL-values for old question group cookie left-over (reverted from commit 2460c6945576e8f5843bc1f3e7137d2df45f9023) |
Affected Issues 10162 |
|
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
2.5 4db7f4ac 2016-01-21 17:30:28
|
Dev: export results, page design | ||
mod - application/views/admin/export/exportresults_view.php | Diff File | ||
mod - application/views/admin/export/statistics_view.php | Diff File |