Commit Graph

20348 Commits

Author SHA1 Message Date
John Okely 68e1f52814 MDL-37168 mod_lti: Add behat test to cover lti quick edit 2017-03-20 16:02:11 +08:00
Sam Chaffee 77a827e14d MDL-37168 mod_lti: Fix LTI activity quick edit title 2017-03-20 16:02:11 +08:00
Dan Poltawski 5d8d3a8ce2 Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle 2017-03-20 07:24:54 +00:00
Andrew Nicols 2154c9824d Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle 2017-03-20 13:57:38 +08:00
David Monllao 72005b6daf Merge branch 'MDL-57254-master' of git://github.com/jleyva/moodle 2017-03-20 06:48:43 +01:00
David Monllao 51060a665f Merge branch 'MDL-57390-master' of git://github.com/jleyva/moodle 2017-03-20 06:07:25 +01:00
David Monllao 050d8e84cd Merge branch 'MDL-58166-m' of git://github.com/pavelsokolov/moodle 2017-03-20 05:13:10 +01:00
Pavel Sokolov 32ad5c86ae MDL-57858 mod_assign: fix submissions count for assign with scales 2017-03-17 18:28:43 +03:00
Pavel Sokolov bfca67f045 MDL-58166 mod_assign: markingworkflow breaks assign for non-graders 2017-03-17 17:46:09 +03:00
Tony Butler 05aa787bde MDL-56324 assignfeedback_editpdf: Revert erroneous commits
This reverts commits 88d309d and 3cd718e.
2017-03-17 11:01:41 +00:00
Damyon Wiese b9b409cfc3 MDL-40759 icons: Peer review fixes (all minor) 2017-03-17 15:52:46 +08:00
Damyon Wiese 3e6adcd69c MDL-40759 icons: Rename activity_icon
image_icon is a better name because there are some valid uses for these other than for activity icons.

E.g. Old JS code that is not worth re-writing.
2017-03-17 15:52:18 +08:00
Damyon Wiese 8857c715d1 MDL-40759 icons: Behat fixes for font-awesome 2017-03-17 15:52:18 +08:00
Damyon Wiese ad056aa267 MDL-40759 icons: Better mapping of some icons 2017-03-17 15:52:18 +08:00
Damyon Wiese 0b772813dc MDL-40759 icons: Update unit tests
Match the expected output for unit tests.
2017-03-17 15:52:17 +08:00
Damyon Wiese 663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
2017-03-17 15:52:17 +08:00
Damyon Wiese 2b931458ad MDL-40759 plugins: Add font icon mapping to all plugins 2017-03-17 15:51:29 +08:00
Damyon Wiese e6bf10c772 MDL-40759 dragdrop: Use a pix icon renderer for drag handles. 2017-03-17 15:51:28 +08:00
Damyon Wiese a26ce2482a MDL-40759 themes: font awesome support
We add a new theme config so the theme can say it supports font-awesome.
If this is true, the pix_icon renderer will call a mapping function to map
from the moodle style t/edit to a font-awesome style fa-cog icon name. Then the renderer
will either render an image tag for old icons - or an accessible font-awesome <i> tag.

This mostly works - but there are some places where we don't use the pix icon renderer, and
we directly create image tags with pix_url image sources. These will need updating (Atto icons,
drag and drop move icons, editpdf icons).
2017-03-17 15:51:28 +08:00
Jun Pataleta f3ec5411b0 MDL-58255 mod_assign: Fix usage of assign object for overrides
* Fix the parameters being passed for the assign constructor.
* Use assign::get_instance() instead of assign::get_context() to fetch
the assignment instance's properties.
2017-03-17 09:33:00 +08:00
Juan Leyva d37472d88f MDL-57657 mod_lesson: New WS mod_lesson_get_user_attempt_grade 2017-03-16 16:45:02 +01:00
Juan Leyva 78dbb42c80 MDL-57657 mod_lesson: New WS mod_lesson_get_user_grade 2017-03-16 16:45:01 +01:00
Juan Leyva d689c1ed46 MDL-57648 mod_lesson: New Web Service mod_lesson_get_questions_attempts 2017-03-16 16:43:03 +01:00
Juan Leyva 4ac71790b6 MDL-57645 mod_lesson: New Web Service mod_lesson_view_lesson 2017-03-16 16:40:25 +01:00
Juan Leyva 7d7a2a4ef1 MDL-57645 mod_lesson: Refactor code to move completion to lib
This commit also fix how completion was being set (before the access
restriction checks)
2017-03-16 16:40:24 +01:00
Juan Leyva bb676b74fe MDL-57815 mod_feedback: New Web Service mod_feedback_get_items 2017-03-16 15:35:06 +01:00
Juan Leyva d52973ae19 MDL-57815 mod_feedback: Add new method to item class to return other data 2017-03-16 15:35:05 +01:00
Andrew Nicols 9c2ca40041 Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle 2017-03-16 07:58:08 +08:00
Juan Leyva b315d721d9 MDL-57814 mod_feedback: New WS mod_feedback_get_current_completed_tmp 2017-03-15 15:31:38 +01:00
Juan Leyva 1a305933c7 MDL-57814 mod_feedback: Create exporter and required API changes 2017-03-15 15:28:03 +01:00
Juan Leyva 0f3c09979f MDL-57811 mod_feedback: New Web Service mod_feedback_view_feedback 2017-03-15 15:25:00 +01:00
Juan Leyva 3f62cbd33e MDL-57812 mod_feedback: New WS get_feedback_access_information 2017-03-15 15:23:24 +01:00
Juan Leyva cac43b9b6a MDL-57916 mod_data: New WS mod_data_get_access_information 2017-03-15 11:48:08 +01:00
Juan Leyva a99c13af84 MDL-57916 mod_data: Move notifications code to new functions 2017-03-15 11:44:28 +01:00
Juan Leyva 630f0e3bce MDL-57643 mod_lesson: New WS mod_lesson_get_access_information 2017-03-15 11:35:27 +01:00
Juan Leyva 37029e468f MDL-57643 mod_lesson: Refactor, move php code to locallib 2017-03-15 11:35:25 +01:00
Eric Merrill 28cdba9dcf MDL-58262 assign: Use unique sql parameter 2017-03-14 15:09:27 -04:00
Juan Leyva 1f7734931f MDL-50538 mod_feedback: New WS mod_feedback_get_feedbacks_by_courses 2017-03-14 15:54:26 +01:00
Juan Leyva 581e75bf3c MDL-57390 mod_forum: Return more permissions in can_add_discussion
When adding new discussions we should know if:
- Pinned discussions can be created
- Attachments are supported
2017-03-14 15:25:54 +01:00
Juan Leyva fa19c73350 MDL-57254 mod_choice: Add not open case in choice_can_view_results
If the choice is not available (not open yet), the function must return
false even is CHOICE_SHOWRESULTS_ALWAYS is set to true.
This was failing only in Web Services, in Web that function is not
reached (execution stops when the time open check is done).
2017-03-14 13:34:27 +01:00
Dan Poltawski 732bd13171 Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle 2017-03-14 12:07:33 +00:00
Andrew Nicols 224853595c Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle 2017-03-14 11:27:22 +01:00
Eloy Lafuente (stronk7) 501ed0c46d Merge branch 'MDL-57915-master' of git://github.com/jleyva/moodle 2017-03-14 11:26:55 +01:00
Juan Leyva 9fac7c8640 MDL-57915 mod_data: New Web Service mod_data_view_database 2017-03-13 19:21:08 +01:00
Juan Leyva 023ffa656d MDL-57915 mod_data: Move view completion and event code to function 2017-03-13 19:21:07 +01:00
Andrew Nicols 34f5a23e6a MDL-55956 mod_assign: Do not use API constant in upgrade 2017-03-10 18:04:50 +00:00
Jun Pataleta 5f399bcf55 MDL-55956 mod_assign: Set priorities of old assign event overrides 2017-03-10 18:04:48 +00:00
Andrew Nicols ef607980cf Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle 2017-03-10 18:04:45 +00:00
Eloy Lafuente (stronk7) 4e0cad1cbd Merge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle 2017-03-10 18:03:53 +00:00
Juan Leyva 1abfa3a95e MDL-58217 mod_feedback: Add data generators for items 2017-03-10 10:51:51 +01:00