mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
83,265 Commits 36 Branches 519 Tags
Commit Graph

83265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Poltawski
e8f8594244 Merge branch 'MDL-58285' of https://github.com/NeillM/moodle 2017-03-20 08:53:23 +00:00
Dan Poltawski
11e7eb3088 Merge branch 'MDL-58291-master-unoconvlink' of git://github.com/mudrd8mz/moodle 2017-03-20 08:49:54 +00:00
John Okely
ea1d9f7c86 MDL-37168 grade: Debugging if gradebook callbacks are not both present 2017-03-20 16:02:11 +08: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
48f5c05019 Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle 2017-03-20 07:54:22 +00:00
Dan Poltawski
5d8d3a8ce2 Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle 2017-03-20 07:24:54 +00:00
Marina Glancy
44e86fb3d5 MDL-34859 backup: add restore defaults 2017-03-20 14:59:45 +08:00
Marina Glancy
f840bf03e0 MDL-34859 course: use defaultcustom element for sections 2017-03-20 14:59:45 +08:00
Marina Glancy
b4eb5f0212 MDL-34859 forms: new element defaultcustom 2017-03-20 14:59:45 +08:00
Andrew Nicols
dfa5d22700 MDL-40759 themes: Correct ignore file whitespace 2017-03-20 14:40:37 +08:00
David Monllao
28b1cc19e7 Merge branch 'MDL-57419-master-2' of https://github.com/xow/moodle 2017-03-20 07:33:25 +01: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
Damyon Wiese
8626dc99fa MDL-40759 fontawesome: Add BC for unmapped icons 
This is yukky but it works. Note: I had to duplicate the standard pix icon template
inside the font-awesome one because the way this is rendered does not support partials.
 2017-03-20 13:47:30 +08:00
David Monllao
89a4995fa5 Merge branch 'MDL-57994' of https://github.com/ak4t0sh/moodle 2017-03-20 06:29:16 +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
a9cba0ba69 Merge branch 'MDL-58288-master' of git://github.com/andrewnicols/moodle 2017-03-20 05:15:29 +01:00
David Monllao
050d8e84cd Merge branch 'MDL-58166-m' of git://github.com/pavelsokolov/moodle 2017-03-20 05:13:10 +01:00
David Monllao
eaf3bcfecd Merge branch 'MDL-58182-master' of https://github.com/snake/moodle 2017-03-20 05:04:25 +01:00
Andrew Nicols
640b8efad8 Merge branch 'MDL-57429-master' of https://github.com/snake/moodle 2017-03-20 08:16:07 +08:00
Pavel Sokolov
bfca67f045 MDL-58166 mod_assign: markingworkflow breaks assign for non-graders 2017-03-17 17:46:09 +03:00
Dan Poltawski
1ea1180a6f Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle 2017-03-17 08:21:03 +00:00
Damyon Wiese
42d4689c65 MDL-40759 fontawesome: Minor cleanups 
Remove eslint hints that are not required and revert changes to the
behat test for recycle bin that are not needed.
 2017-03-17 15:52:46 +08:00
Damyon Wiese
07171e831e MDL-40759 fontawesome: Fix bugs from rebase 2017-03-17 15:52:46 +08:00
Damyon Wiese
c8d0efc332 MDL-40759 icons: More details in upgrade.txt 
More details in upgrade.txt for developers who were using pix_url.
 2017-03-17 15:52:46 +08:00
Damyon Wiese
b9b409cfc3 MDL-40759 icons: Peer review fixes (all minor) 2017-03-17 15:52:46 +08:00
Damyon Wiese
1caabd8468 MDL-40759 icons: Keep separate alt/title 
For font awesome icons I had only supported one of alt/title. This was because (subjectively) we have
done a terrible job of providing meaningful alt text for icons. This is not a good idea and not backwards
compatible so I have put it back again.

Fingers crossed I did not break 1000 behats.
 2017-03-17 15:52:18 +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
e330b1c214 MDL-40759 icons: Refactor to allow theme icon systems 2017-03-17 15:52:18 +08:00
Damyon Wiese
24a6b59412 MDL-40759 icons: Remove unused file type icons. 
Because we can use svgs always - we got rid of different size icons for file types.
 2017-03-17 15:52:18 +08:00
Damyon Wiese
9d67a40862 MDL-40759 icons: Fixes for icons used in CSS 2017-03-17 15:52:18 +08:00
Damyon Wiese
7776c9e112 MDL-40759 icons: Fix when icon map comes from cache 2017-03-17 15:52:17 +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
3c8850711f MDL-40759 icons: filepicker 
Use font awesome svg icons for files in the file picker. Move the old icons to bootstrapbase.
 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
7cf6ef7bbb MDL-40759 icons: Fix icons in action menus and links 
Always use the pix icon helper in templates.
 2017-03-17 15:51:29 +08:00
Damyon Wiese
c266d256e7 MDL-40759 icons: Deprecate $OUTPUT->pix_url() 2017-03-17 15:51:29 +08:00
Damyon Wiese
c2dde7eebc MDL-40759 icons: Split pix_icon from activity_icon 
Activity icons always use the standard icon renderer.
 2017-03-17 15:51:29 +08:00
Damyon Wiese
95b06c13c6 MDL-40759 icons: Refactor icon system to be extensible. 2017-03-17 15:51:29 +08:00
Damyon Wiese
348aed801c MDL-40759 pix: Use proper pix tags for required fields. 2017-03-17 15:51:29 +08:00