Changesets: LimeSurvey
|
develop b2703455 2018-10-23 11:03:47 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop # Conflicts: # application/controllers/admin/questions.php # application/core/Survey_Common_Action.php # application/helpers/expressions/em_manager_helper.php # application/helpers/questionHelper.php |
||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
| mod - application/helpers/admin/export/HtmlWriter.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
| mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig | Diff File | ||
|
master-ranking_14162 de87675e 2018-10-22 17:55:37 Details Diff |
Dev: review css selector | ||
| mod - assets/packages/questions/ranking/scripts/ranking.js | Diff File | ||
|
master 2461a56d 2018-10-22 17:54:54 Dominik Vitt Details Diff |
Fixed issue 10162: new visit on a survey with token deletes last entry |
Affected Issues 10162 |
|
| mod - application/helpers/frontend_helper.php | Diff File | ||
|
master-ranking_14162 d399847e 2018-10-22 17:50:07 Details Diff |
Fixed issue 14162: Functionality ranking questions breaks with relevance Fixed issue : Same choice height work again Dev: update and depend actual |
Affected Issues 14162 |
|
| mod - application/config/questiontypes.php | Diff File | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/answer/ranking/answer.twig | Diff File | ||
| mod - assets/packages/questions/ranking/scripts/ranking.js | Diff File | ||
| rm - third_party/jquery-actual/.gitignore | Diff File | ||
| rm - third_party/jquery-actual/CHANGELOG.md | Diff File | ||
| mod - third_party/jquery-actual/README.md | Diff File | ||
| rm - third_party/jquery-actual/demo/PIE.htc | Diff File | ||
| rm - third_party/jquery-actual/demo/css3pie.html | Diff File | ||
| rm - third_party/jquery-actual/demo/normal.html | Diff File | ||
| mod - third_party/jquery-actual/jquery.actual.js | Diff File | ||
| mod - third_party/jquery-actual/jquery.actual.min.js | Diff File | ||
| rm - third_party/jquery-actual/package.json | Diff File | ||
|
master 0c8638f5 2018-10-22 11:44:54
|
Dev: ignore contents of upload/adminthemes | ||
| mod - .gitignore | Diff File | ||
|
master 77b7fc2d 2018-10-22 09:52:08 Details Diff |
Dev: didn't show help button if help is empty Dev: not currently in core but can happen |
||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
|
master_notforcedtable 0a9e130c 2018-10-19 17:15:18 Details Diff |
New feature 14156: Need a way to easily disable table to block for particular questions Dev: just add forced-table in Class name : done for user Dev: really don't found a cleaner solution … |
Affected Issues 14156 |
|
| mod - assets/packages/template-core/template-core.css | Diff File | ||
|
master f2518ac0 2018-10-19 16:11:55 Details Diff |
Fixed issue 14098: Subquestion incorrectly named 'Sub-question' |
Affected Issues 14098 |
|
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/helpers/admin/export/HtmlWriter.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig | Diff File | ||
|
master 87499dc5 2018-10-19 15:48:30 Details Diff |
Fixed issue 14150: Wrong survey menu id entry |
Affected Issues 14150 |
|
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
|
develop 762602ca 2018-10-19 09:58:51 Details Diff |
Dev Fake merge (only reverted a feature in master, don't want it reverted in dev) | ||
|
master 4ac16f1c 2018-10-19 09:57:20 Details Diff |
Dev: Revert: Show modal on create new question Dev: This reverts commit 71f642cbd015e9e1161d9b71910348542b4d5075. |
||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.min.css | Diff File | ||
| mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
| mod - assets/scripts/admin/questions.js | Diff File | ||
|
develop 9ea5ce56 2018-10-19 09:56:04 Details Diff |
Dev Merge master to dev | ||
| mod - application/commands/WipeCommand.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/extensions/yii-jsoneditor/JsonEditor.php | Diff File | ||
| mod - application/models/TemplateManifest.php | Diff File | ||
| mod - application/views/admin/participants/importCSV_view.php | Diff File | ||
| mod - application/views/admin/token/csvupload.php | Diff File | ||
| mod - application/views/admin/token/tokenform.php | Diff File | ||
| rm - assets/scripts/deactivatedebug.js | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig | Diff File | ||
| add - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/columns/column_footer.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/columns/column_header.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_noanswer.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_other.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.css | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig | Diff File | ||
|
master c4ad32a4 2018-10-18 15:55:55 Dominik Vitt Details Diff |
Dev: Redesign of bootstrapbuttons question theme | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig | Diff File | ||
| add - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/columns/column_footer.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/columns/column_header.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_noanswer.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_other.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.css | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig | Diff File | ||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig | Diff File | ||
|
master 1c0bc38d 2018-10-18 12:45:39
|
Fixed issue: datefield from mssql database always contains milliseconds | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
|
master 8d467804 2018-10-18 12:45:12
|
Fixed issue: upload to generalfiles fails | ||
| mod - .gitignore | Diff File | ||
| add - upload/themes/survey/generalfiles/index.html | Diff File | ||
|
master 56c50469 2018-10-18 11:34:49 Details Diff |
Fixed issue: Survey groups not being wiped | ||
| mod - application/commands/WipeCommand.php | Diff File | ||
|
master bc59ab00 2018-10-17 18:29:19 Dominik Vitt Details Diff |
Fixed issue 14124: Changing invitation/reminder dates for a certain tokens changes the date format at the database |
Affected Issues 14124 |
|
| mod - application/views/admin/token/tokenform.php | Diff File | ||
|
master 2f87a0fb 2018-10-17 16:46:12 yent Committer: |
Fixed issue: JSON editor options to load the right content (#1130) Fixed issue: content, whatever its type, was passed to CHtml::encode which expects a string due to lack of encode htmlOption for CHtml::textarea. Also added needed json_encode so that textarea value is a string in the end. |
||
| mod - application/extensions/yii-jsoneditor/JsonEditor.php | Diff File | ||
|
develop c0fa0d39 2018-10-17 16:34:15 Details Diff |
Dev HTML fixes | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/views/admin/export/exportresult_panels/_format.php | Diff File | ||
| mod - application/views/admin/export/exportresult_panels/_general.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_outputformat.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_response_filter_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_responseid.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_statistics_header.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_submissiondate.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - application/views/admin/export/vv_view.php | Diff File | ||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | ||
|
develop 53243881 2018-10-17 15:45:51 Details Diff |
Dev Fixed issues caused by previous incomplete DBVersion changes | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
|
develop 8c47314e 2018-10-17 15:38:02 Details Diff |
Fixed import issues due to improper merge | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
|
develop 3ef07bbb 2018-10-17 15:30:39 Details Diff |
Dev Fixed issues caused by previous incomplete DBVersion changes | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/AssetVersion.php | Diff File | ||
| mod - application/models/QuestionType.php | Diff File | ||
|
master 52345367 2018-10-17 15:19:19 Dominik Vitt Details Diff |
Release 3.15.1+181017 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 77db01b2 2018-10-17 14:34:33 kw-pr Committer: c_schmitz Details Diff |
Fixed issue: Statistics export as PDF opens the PDF in the current tab. It should create a download like the Excel export. (#982) | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
|
develop 715bc2b2 2018-10-17 14:31:05 gekkedev Committer: c_schmitz Details Diff |
New feature: RemoteControl list_users can now search for username | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
