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,241 Commits 36 Branches 519 Tags
Commit Graph

83241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damyon Wiese
5e73ccfb38 MDL-40759 output: Fix non-existent fa icons 2017-03-17 15:51:29 +08:00
Damyon Wiese
3be09119d9 MDL-40759 upgrade: Note about fontawesome callback 2017-03-17 15:51:29 +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
d3d2f09cef MDL-40759 atto: Use pix_icon renderer for atto buttons 2017-03-17 15:51:28 +08:00
Damyon Wiese
ec7b552251 MDL-40759 course: Fix group mode switcher to use renderPix 
Dont assume icons are image tags and call Templates.renderPix to rebuild the entire icon.
 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
Andrew Nicols
c563adfa78 MDL-58288 fileconverter_unoconv: Remove old test conversions 2017-03-17 09:31:57 +08:00
Andrew Nicols
2935d0fe7f MDL-58288 fileconverter_unoconv: Fix issue with test generation 2017-03-17 09:27:37 +08:00
Jake Dallimore
3d4339b817 MDL-58182 javascript: Fix for buttons regression in core dialog. 
Fixes a regression caused by MDL-56364, wherein the buttons were made
readOnly, meaning addButtons wouldn't work. This removes that change,
while maintaining the original dependency between the buttons and the
closeButton config options.
 2017-03-17 09:05:04 +08:00
Arnaud Trouve
019186b7b5 MDL-57994 course: fix newsitems value 2017-03-16 18:34:30 +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
Dan Poltawski
aed2641a8b Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle 2017-03-16 15:42:07 +00: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
Dan Poltawski
98c4094eac weekly release 3.3dev 2017-03-16 11:52:46 +00:00
Dan Poltawski
ec673f6f98 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-03-16 11:52:44 +00:00
Jake Dallimore
cb2a75dcbf MDL-57429 badges: removal of unused Persona code 
Removed the backpackconnect script used with Persona, and all the
associated js code.
 2017-03-16 09:35:14 +08:00
Jake Dallimore
80e8e0061e MDL-57429 badges: lang string deprecation for new email verify process 
Deprecated those lang strings used in the old Persona login process.
 2017-03-16 09:35:14 +08:00