mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-04 07:52:48 +02:00
Code Issues Projects Releases Wiki Activity
83,247 Commits 36 Branches 528 Tags
Commit Graph

18934 Commits

Author SHA1 Message Date
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
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
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
Andrew Nicols
9c2ca40041 Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle 2017-03-16 07:58:08 +08: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
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
Juan Leyva
5bbada53e3 MDL-58217 mod_feedback: API changes to allow generators 
We include a new function set_date at item level so we can add the data
instead using the forms.
 2017-03-10 10:51:32 +01:00
Andrew Nicols
357712eabe MDL-55528 assignfeedback_editpdf: Remove unnecessary escapes 2017-03-10 10:45:47 +08:00
Andrew Nicols
3bd0d4397c MDL-55528 assignfeedback_editpdf: Add step to check all pages loaded 2017-03-10 10:45:46 +08:00
Andrew Nicols
f7a9f1dd0e MDL-55528 assignfeedback_editpdf: Update to use fileconverter_unoconv 2017-03-10 10:45:46 +08:00
Andrew Nicols
1568168717 MDL-55528 fileconverter_unoconv: Add new unoconv plugin 
AMOS BEGIN
 MOV [pathtounoconv,admin],[pathtounoconv,fileconverter_unoconv]
 MOV [pathtounoconv_help,admin],[pathtounoconv_help,fileconv_helperter_unoconv_help]
 MOV [unoconvwarning,admin],[unoconvwarning,fileconverter_unoconv]
 MOV [test_unoconv,assignfeedback_editpdf],[test_unoconv,fileconverter_unoconv]
 MOV [test_unoconvempty,assignfeedback_editpdf],[test_unoconvempty,fileconverter_unoconv]
 MOV [test_unoconvdoesnotexist,assignfeedback_editpdf],[test_unoconvdoesnotexist,fileconverter_unoconv]
 MOV [test_unoconvdownload,assignfeedback_editpdf],[test_unoconvdownload,fileconverter_unoconv]
 MOV [test_unoconvisdir,assignfeedback_editpdf],[test_unoconvisdir,fileconverter_unoconv]
 MOV [test_unoconvnotestfile,assignfeedback_editpdf],[test_unoconvnotestfile,fileconverter_unoconv]
 MOV [test_unoconvnotexecutable,assignfeedback_editpdf],[test_unoconvnotexecutable,fileconverter_unoconv]
 MOV [test_unoconvok,assignfeedback_editpdf],[test_unoconvok,fileconverter_unoconv]
 MOV [test_unoconvversionnotsupported,assignfeedback_editpdf],[test_unoconvversionnotsupported,fileconverter_unoconv]
AMOS END
 2017-03-10 10:45:46 +08:00
Eloy Lafuente (stronk7)
21521604af Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle 2017-03-07 16:36:54 +01:00
David Monllao
2aa1855205 Merge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle 2017-03-07 13:15:55 +01:00
Dan Poltawski
44c4f148da Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle 2017-03-07 07:02:33 -03:00
Dan Poltawski
d04310cb21 Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-07 06:47:38 -03:00
Ankit Agarwal
0884ddea86 MDL-57362 assign: Fix permission checks 2017-03-07 12:43:30 +05:30
Andrew Nicols
342af35ab8 Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle 2017-03-07 12:07:50 +08:00
Jun Pataleta
f7a9bca847 MDL-55956 mod_assign: Remove calendar events with 'open' eventtype 
Remove creation of calendar events for mod_assign with
eventtype = 'open'. Since mod_assign instance creation only creates a
calendar event for the due date, there's no point in creating an override
event for an event type that does not exist.
 2017-03-07 11:33:17 +08:00
Jun Pataleta
98239b2df8 MDL-55956 mod: Set event priority for activity overrides 
Set the event priority of the following activity overrides:
* mod_assign
* mod_lesson
* mod_quiz
Always create separate events for start and end dates of activities.
 2017-03-07 11:33:13 +08:00
Dan Poltawski
892ceeb74e Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-06 10:27:10 -03:00