Changesets: LimeSurvey
|
rtl b1a4fe69 2016-01-25 16:02 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| add - application/views/survey/questions/date/dropdown/day.php | Diff File | ||
| add - application/views/survey/questions/date/dropdown/month.php | Diff File | ||
| mod - application/views/surveys/publicSurveyList.php | Diff File | ||
|
rtl 0276768a 2016-01-25 16:01 Details Diff |
Dev: RTL: Remove double offset for panel boxes | ||
| mod - application/extensions/PannelBoxWidget/views/box.php | Diff File | ||
| mod - application/views/admin/super/welcome.php | Diff File | ||
| mod - styles/Sea_Green/css/adminstyle-rtl.css | Diff File | ||
|
2.5 b4aa9b61 2016-01-25 15:28
Details Diff |
Dev: few changes in surveys list | ||
| mod - application/views/surveys/publicSurveyList.php | Diff File | ||
|
rtl 54d6af23 2016-01-25 15:21 Details Diff |
Merge branch '2.5' into rtl | ||
| 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 | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
| add - application/views/survey/question_help/asterisk.php | Diff File | ||
| add - application/views/survey/question_help/error.php | Diff File | ||
| add - application/views/survey/question_help/help.php | Diff File | ||
| add - application/views/survey/question_timer/timer.php | Diff File | ||
| add - application/views/survey/question_timer/timer_content.php | Diff File | ||
| add - application/views/survey/question_timer/timer_footer.php | Diff File | ||
| add - application/views/survey/question_timer/timer_header.php | Diff File | ||
| add - application/views/survey/question_timer/timer_javascript.php | Diff File | ||
|
2.5 90230d40 2016-01-25 14:57
Details Diff |
Dev: surveys list | ||
| mod - application/views/surveys/publicSurveyList.php | Diff File | ||
|
2.5 afda074a 2016-01-25 14:52
Details Diff |
Dev: views for date question | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| add - application/views/survey/questions/date/dropdown/day.php | Diff File | ||
| add - application/views/survey/questions/date/dropdown/month.php | Diff File | ||
|
rtl 0b327ae2 2016-01-25 14:47 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| 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 | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
| add - application/views/survey/question_help/asterisk.php | Diff File | ||
| add - application/views/survey/question_help/error.php | Diff File | ||
| add - application/views/survey/question_help/help.php | Diff File | ||
| add - application/views/survey/question_timer/timer.php | Diff File | ||
| add - application/views/survey/question_timer/timer_content.php | Diff File | ||
| add - application/views/survey/question_timer/timer_footer.php | Diff File | ||
| add - application/views/survey/question_timer/timer_header.php | Diff File | ||
| add - application/views/survey/question_timer/timer_javascript.php | Diff File | ||
|
2.5 a9b6bd00 2016-01-25 12:46
Details Diff |
Dev: replaced global function getQuestionAttributes by model one | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 c66f5083 2016-01-25 12:35
Details Diff |
Dev: more cleaning | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 afd6b456 2016-01-25 12:28
Details Diff |
Dev: quanda cleaning | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 90aafeeb 2016-01-25 12:10
Details Diff |
Dev: created views for question timer | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| add - application/views/survey/question_timer/timer.php | Diff File | ||
| add - application/views/survey/question_timer/timer_content.php | Diff File | ||
| add - application/views/survey/question_timer/timer_footer.php | Diff File | ||
| add - application/views/survey/question_timer/timer_header.php | Diff File | ||
| add - application/views/survey/question_timer/timer_javascript.php | Diff File | ||
|
2.5 ffe4a48c 2016-01-25 11:08
Details Diff |
Dev: added views for help/error messages in survey templates | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| add - application/views/survey/question_help/asterisk.php | Diff File | ||
| add - application/views/survey/question_help/error.php | Diff File | ||
| add - application/views/survey/question_help/help.php | Diff File | ||
|
master 52753798 2016-01-22 17:17
Details Diff |
Dev: removed undefined index | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
|
rtl 54accf64 2016-01-22 17:13 Details Diff |
Merge branch '2.5' into rtl | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
|
rtl b4486669 2016-01-22 17:10 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
|
rtl d912f586 2016-01-22 17:10 Details Diff |
Dev: Add reversed bootstrap to end of adminstyle-rtl file | ||
| mod - styles/Sea_Green/css/adminstyle-rtl.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-rtl.css | Diff File | ||
|
2.5 fbd647b6 2016-01-22 17:09
Details Diff |
Dev: dataentry close button | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
|
2.5 3c3b35fe 2016-01-22 17:04
Details Diff |
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 15:56
Details Diff |
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 15:44 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 14:57 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 14: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 14:56 Details Diff |
Dev: Add curly braces around if-statement | ||
| mod - application/views/admin/super/header.php | Diff File | ||
|
2.5 effe70dc 2016-01-22 14:12
Details Diff |
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 14:10
Details Diff |
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 | ||
