Changesets: LimeSurvey
|
master 755d74e4 2016-04-22 15:58:56 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
| mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
| mod - templates/news_paper/css/template.css | Diff File | ||
| mod - templates/ubuntu_orange/css/template.css | Diff File | ||
|
master dbf9ffe8 2016-04-22 15:24:32
|
Fixed issue 11014: Multiple numeric input with narrow colum is aligned too right |
Affected Issues 11014 |
|
| mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
| mod - templates/news_paper/css/template.css | Diff File | ||
| mod - templates/ubuntu_orange/css/template.css | Diff File | ||
|
master 849a61ca 2016-04-22 15:07:21 Details Diff |
Dev: Include Bootstrap DateTimePicker as third-party library | ||
| mod - application/config/third_party.php | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/README.md | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/bower.json | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/daterangepicker.css | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/daterangepicker.js | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/daterangepicker.scss | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/demo.html | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/drp.png | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/moment.js | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/moment.min.js | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/package.js | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/package.json | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/website/index.html | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/website/website.css | Diff File | ||
| add - third_party/bootstrap-daterangepicker-2.1.19/website/website.js | Diff File | ||
|
master 7e2b9a43 2016-04-22 14:59:57 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
| mod - application/controllers/UploaderController.php | Diff File | ||
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/homepagesettings.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/models/QuestionGroup.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabNotification_view.php | Diff File | ||
| mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php | Diff File | ||
|
master 53d1507b 2016-04-22 14:59:52 Details Diff |
Dev: Replace datepicker in frontend with bootstrap datetimepicker | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/date/selector/answer.php | Diff File | ||
|
master 240dd5a1 2016-04-22 14:58:46
|
Fixed issue 11000: Slider question rendered too small |
Affected Issues 11000 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php | Diff File | ||
|
master 58b23fcf 2016-04-22 14:30:58 Details Diff |
Fixed issue 11018: User with only statistics access can see survey in list Dev: test only model entitity + entity_id for listing Dev: tested with nonly stat access : seems OK (no preview, can see some part : but can already see it in statistic) |
Affected Issues 11018 |
|
| mod - application/models/Survey.php | Diff File | ||
|
master f28ff155 2016-04-22 14:08:51 Details Diff |
Fixed #11004: [security] Unauthorized access to certain admin pages by restricted admins |
Affected Issues 11004 |
|
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/homepagesettings.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
|
master 14002a64 2016-04-22 12:52:21 Details Diff |
Dev Some minor fixes | ||
| mod - application/models/QuestionGroup.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabNotification_view.php | Diff File | ||
|
master 9d0e8785 2016-04-22 12:39:21
|
Fixed issue: template.js path forced in uploader controller | ||
| mod - application/controllers/UploaderController.php | Diff File | ||
|
master bfc857ab 2016-04-22 12:19:01 Details Diff |
Fixed issue 11012: Delete Group button in group list view |
Affected Issues 11012 |
|
| mod - application/models/QuestionGroup.php | Diff File | ||
|
master a9227a58 2016-04-22 12:00:59
|
Fixed issue 10946: design issue when entering answer options on double matrix question |
Affected Issues 10946 |
|
| mod - scripts/admin/answers.js | Diff File | ||
|
master 548d7465 2016-04-22 11:55:03
|
Fixed issue 10949: numbering of sub questions The first subquestion is numbered with leading 0, like SQ001, while the following is numbered SQ2, SQ3 etc. |
Affected Issues 10949 |
|
| mod - scripts/admin/answers.js | Diff File | ||
|
master 8d05392e 2016-04-22 11:53:23
|
Fixed issue 10949: numbering of sub questions The first subquestion is numbered with leading 0, like SQ001, while the following is numbered SQ2, SQ3 etc. |
Affected Issues 10949 |
|
| mod - scripts/admin/subquestions.js | Diff File | ||
|
master dec58744 2016-04-22 11:25:30 Details Diff |
Fixed issue 11013: Small editor when adding/editing a question group |
Affected Issues 11013 |
|
| mod - application/views/admin/survey/QuestionGroups/addGroup_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/editGroup_view.php | Diff File | ||
|
master 32aa2e8d 2016-04-22 10:39:19 Details Diff |
Fixed issue 11001: Selecting a screen in the template editor fails |
Affected Issues 11001 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
|
master 6f23b64e 2016-04-22 10:35:29 Details Diff |
Fixed issue 11011: Blank screen after adding new group |
Affected Issues 11011 |
|
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
|
master 14c88ad1 2016-04-22 10:18:41 Details Diff |
Fixed issue 11010: PHP notice when create a new survey |
Affected Issues 11010 |
|
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
|
master 786a6bcd 2016-04-22 10:13:03 Details Diff |
Fixed issue 11005: Button link error |
Affected Issues 11005 |
|
| mod - application/views/admin/survey/importSurvey_view.php | Diff File | ||
|
master 88924013 2016-04-22 10:01:23
|
Fixed issue 10939: Public Survey List (root of app) includes a different set of CSS files from the Survey itself, and in the wrong order |
Affected Issues 10939 |
|
| mod - application/controllers/SurveysController.php | Diff File | ||
|
master bb4475a2 2016-04-22 09:46:22 Details Diff |
Fixed issue 10274: bad layout of mini calendar in statistics Dev: DatePicker in data entry view. |
Affected Issues 10274 |
|
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/views/admin/dataentry/content_view.php | Diff File | ||
|
master 274cae47 2016-04-22 09:38:04 Details Diff |
Dev: Change date format HH:MM to HH:mm | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/views/admin/export/statistics_subviews/_submissiondate.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_publication_panel.php | Diff File | ||
| mod - application/views/admin/token/dummytokenform.php | Diff File | ||
| mod - application/views/admin/token/tokenform.php | Diff File | ||
|
master ee5d7da5 2016-04-22 08:41:37 Details Diff |
Fixed #11004: [security] Unauthorized access to certain admin pages by restricted admins |
Affected Issues 11004 |
|
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/homepagesettings.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/controllers/admin/useraction.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/views/admin/global_settings/_bounce.php | Diff File | ||
| mod - application/views/admin/global_settings/_overview.php | Diff File | ||
| mod - application/views/admin/global_settings/_presentation.php | Diff File | ||
| mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
| mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
| mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
| mod - application/views/admin/user/personalsettings.php | Diff File | ||
|
2.06lts b87289a2 2016-04-22 08:32:34 Details Diff |
[feature] beforeController event (for web) - See https://github.com/LimeSurvey/LimeSurvey/commit/ecdfce386b32b24baa232c0be55bd90a2268d570 |
||
| mod - README.md | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
|
2.06lts 6c9f5b6d 2016-04-22 08:26:38 Details Diff |
Merge branch '2.06lts' of git@git.framasoft.org:Shnoulle/LimeSurvey.git into 2.06_SondagesPro # Conflicts: # application/config/version.php # application/models/UpdateForm.php |
||
| 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/admin/update.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/UpdateForm.php | Diff File | ||
| mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_check_local_errors.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_final.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_updater_updated.php | Diff File | ||
| mod - application/views/admin/update/updater/welcome/_subscribe.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - images/emoticons/1.png | Diff File | ||
| mod - images/emoticons/2.png | Diff File | ||
| mod - images/emoticons/3.png | Diff File | ||
| mod - images/emoticons/4.png | Diff File | ||
| mod - images/emoticons/5.png | Diff File | ||
| mod - scripts/admin/attributeMapCSV.js | Diff File | ||
| mod - scripts/admin/comfortupdate/displayComfortStep.js | Diff File | ||
| add - tmp/.gitignore | Diff File | ||
| mod - upload/images/smiley/msn/angel_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/angry_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/broken_heart.gif | Diff File | ||
| mod - upload/images/smiley/msn/cake.gif | Diff File | ||
| mod - upload/images/smiley/msn/confused_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/cry_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/devil_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/embaressed_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/envelope.gif | Diff File | ||
| mod - upload/images/smiley/msn/heart.gif | Diff File | ||
| mod - upload/images/smiley/msn/kiss.gif | Diff File | ||
| mod - upload/images/smiley/msn/lightbulb.gif | Diff File | ||
| mod - upload/images/smiley/msn/omg_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/regular_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/sad_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/shades_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/teeth_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/thumbs_down.gif | Diff File | ||
| mod - upload/images/smiley/msn/thumbs_up.gif | Diff File | ||
| mod - upload/images/smiley/msn/tounge_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/whatchutalkingabout_smile.gif | Diff File | ||
| mod - upload/images/smiley/msn/wink_smile.gif | Diff File | ||
