David Monllao
5b95bd50df
Merge branch 'MDL-57688-master' of git://github.com/jleyva/moodle
2017-03-21 19:59:00 +01:00
Juan Leyva
d088632b97
MDL-57688 mod_lesson: New WS mod_lesson_launch_attempt
2017-03-21 15:43:24 +01:00
Juan Leyva
dbba944e32
MDL-57688 mod_lesson: Move duplicated code to methods
...
Some code that will be used by Web Services was moved, we created new
methods to avoid code duplication:
- To generate the lesson messages on page view
- To check the time restrictions in a current attempt
2017-03-21 15:18:44 +01:00
Juan Leyva
ac9f0a6800
MDL-58229 mod_feedback: New WS get_unfinished_responses
2017-03-21 13:21:32 +01:00
Juan Leyva
82b2cd7d19
MDL-57820 mod_feedback: New WS mod_feedback_get_analysis
2017-03-21 13:12:35 +01:00
Juan Leyva
ac122465e0
MDL-57820 mod_feedback: Create function to get analysis for external api
2017-03-21 13:12:22 +01:00
Dan Poltawski
5fd24a89a6
Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle
2017-03-21 11:28:13 +00:00
Juan Leyva
82a7a67869
MDL-57818 mod_feedback: New WS mod_feedback_process_page
2017-03-21 12:25:32 +01:00
Juan Leyva
96ae31bddc
MDL-57818 mod_feedback: Refactor form processing
2017-03-21 12:24:41 +01:00
Juan Leyva
74975948e5
MDL-57817 mod_feedback: New WS mod_feedback_get_page_items
2017-03-21 11:33:55 +01:00
Juan Leyva
951ddedf6f
MDL-57816 mod_feedback: New WS mod_feedback_launch_feedback
2017-03-21 11:22:13 +01:00
David Monllao
a2ccbae441
Merge branch 'MDL-57685_master' of git://github.com/dmonllao/moodle
2017-03-21 10:54:44 +01:00
Juan Leyva
f4d0909fc0
MDL-57685 mod_lesson: New Web Service mod_lesson_get_pages
2017-03-21 10:53:35 +01:00
John Okely
cd9b8f4e57
MDL-37168 mod_lti: Fix rename behat
2017-03-21 10:29:50 +08:00
Eloy Lafuente (stronk7)
592cdff297
Merge branch 'MDL-57815-master' of git://github.com/jleyva/moodle
2017-03-21 00:48:44 +01:00
Juan Leyva
10948ae133
MDL-57823 mod_feedback: Implement the check_updates callback
...
- added a mini version bump.
- fix some conflicts.
- fix phpdoc @version
2017-03-20 20:12:54 +01:00
Eloy Lafuente (stronk7)
beff62f6ec
Merge branch 'MDL-57814-master' of git://github.com/jleyva/moodle
2017-03-20 18:00:48 +01:00
Eloy Lafuente (stronk7)
74ccc7768e
Merge branch 'MDL-57916-master' of git://github.com/jleyva/moodle
...
Mini bump version in merge...
2017-03-20 17:53:02 +01:00
Eloy Lafuente (stronk7)
d8c8082998
Merge branch 'MDL-57811-master' of git://github.com/jleyva/moodle
2017-03-20 17:39:53 +01:00
Dan Poltawski
7bb2eafe9c
Merge branch 'MDL-58262-master' of git://github.com/merrill-oakland/moodle
2017-03-20 15:19:55 +00:00
Dan Poltawski
7d77fb1421
Merge branch 'MDL-58255-master' of git://github.com/junpataleta/moodle
2017-03-20 13:08:54 +00:00
Eloy Lafuente (stronk7)
ec116fe676
Merge branch 'MDL-57812-master' of git://github.com/jleyva/moodle
2017-03-20 12:35:43 +01:00
David Monllao
2ddcf27219
Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle
2017-03-20 11:25:09 +01:00
David Monllao
c12578d3a2
Merge branch 'MDL-57664_master' of git://github.com/dmonllao/moodle
2017-03-20 11:20:22 +01:00
Juan Leyva
f8edef2e58
MDL-57665 mod_lesson: New WS mod_lesson_get_user_timers
2017-03-20 11:18:34 +01:00
Juan Leyva
592c94f3ba
MDL-57665 mod_lesson: New method for get timers
2017-03-20 11:18:29 +01:00
Juan Leyva
ba6b2c11f6
MDL-57664 mod_lesson: New Ws mod_lesson_get_content_pages_viewed
2017-03-20 11:16:55 +01:00
Juan Leyva
b584c49d03
MDL-57664 mod_lesson: New lesson method get_content_pages_viewed
2017-03-20 11:16:46 +01:00
David Monllao
e11d2d87ff
Merge branch 'MDL-37168-master' of https://github.com/xow/moodle
2017-03-20 10:15:36 +01:00
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
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
