moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84275 commits 37 branches 540 tags 1.3 GiB
Commit graph

19281 commits

Author SHA1 Message Date
Juan Leyva
8d6748380c MDL-57696 mod_lesson: Remove redirects from API 
In this commit I removed redirects that potentially could break the Web
Services layer.
Instead doing redirect inside APIs I return a special flag that is
properly checked.
 2017-03-21 15:51:51 +01:00
Juan Leyva
61b51764b8 MDL-57696 mod_lesson: Move code to lesson methods 
Small refactor to avoid duplication in the Web Service
 2017-03-21 15:51:50 +01:00
Juan Leyva
ef8d1c9a15 MDL-57693 mod_lesson: New WS mod_lesson_get_page_data 2017-03-21 15:48:18 +01:00
Juan Leyva
66cd7b8ecc MDL-57693 mod_lesson: Refactor to move code to lesson methods 
This is a big refactor to avoid code duplication in the new WS.
Basically I’ve moved code from the page and renderer to the lesson
class.
New code is into methods, there are no code functionality changes (just
minor fixes in comments).
 2017-03-21 15:48:17 +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
Juan Leyva
6d21073b08 MDL-58227 mod_feedback: Delete duplicated completions records 
This commit also fixes the way the previous completion record was
fetched to avoid the creation of new duplicates.
 2017-03-21 09:46:44 +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
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