mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
83,440 Commits 36 Branches 527 Tags
Commit Graph

23115 Commits

Author SHA1 Message Date
Juan Leyva
a7d9c5373e MDL-57411 groups: New helper functions 
- groups_get_groups_members
- groups_get_activity_shared_group_members
 2017-03-31 09:04:58 +02:00
Dan Poltawski
f98ad251ae Merge branch 'MDL-55139' of git://github.com/stronk7/moodle 2017-03-28 18:33:19 +01:00
David Monllao
6d8b31d3c9 Merge branch 'MDL-58079_master' of https://github.com/kiklop74/moodle 2017-03-28 17:30:40 +02:00
Dan Poltawski
702be5ee47 Merge branch 'MDL-58160' of git://github.com/aolley/moodle 2017-03-28 11:34:33 +01:00
Dan Poltawski
313aa61610 Merge branch 'MDL-58257' of https://github.com/ak4t0sh/moodle 2017-03-28 10:50:57 +01:00
Dan Poltawski
ed8ab587be Merge branch 'MDL-38278-pptx-et-al-presentation-group' of https://github.com/lucaboesch/moodle 2017-03-28 10:15:22 +01:00
Luca Bösch
5ee4e09334 MDL-38278 core_files: Populating presentation group some more. 
Now all filetypes with icon 'powerpoint' and 'impress', i.e.
pps, ppt, pptx, pptm, potx, potm, ppam, ppsx, ppsm, odp, otp, sxi, sti
are all attributed to the "presentation" group.

Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
 2017-03-28 10:50:34 +02:00
Marina Glancy
cc401e6f30 MDL-34859 forms: fix the checkbox in defaultcustom element 2017-03-22 11:25:58 +08:00
Dan Poltawski
dca0ea03b1 Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle 2017-03-21 08:03:42 +00:00
Andrew Nicols
afc8dc90fc Merge branch 'MDL-40759-master-fix1' of http://github.com/damyon/moodle 2017-03-21 11:31:26 +08:00
Damyon Wiese
7e8940b544 MDL-40759 fontawesome: Use a cache 
Cache the callback info.
 2017-03-21 10:51:41 +08:00
Dan Poltawski
57ee1502fd Merge branch 'MDL-58121-master' of https://github.com/snake/moodle 2017-03-20 13:15:07 +00:00
Dan Poltawski
d4d91727bf Merge branch 'MDL-58263-master' of git://github.com/jleyva/moodle 2017-03-20 11:39:58 +00: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
ea1d9f7c86 MDL-37168 grade: Debugging if gradebook callbacks are not both present 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
Marina Glancy
44e86fb3d5 MDL-34859 backup: add restore defaults 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
2154c9824d Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle 2017-03-20 13:57:38 +08: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
Damyon Wiese
f4e623b3e7 MDL-58317 templates: Fix async template render 
There is an edge case where we do not wait for all promises before
rendering a template. This can generate "failed to pre-fetch the template" JS errors.
 2017-03-20 13:29:09 +08: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
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
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
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
Jake Dallimore
62b482938b MDL-58121 email: ensure support user is defined in email_to_user 2017-03-17 09:08:45 +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
ce4379973f MDL-58257 course: fix search containing a hyphen 
In case a hyphen (-) was preceded and followed by spaces,
the pattern for the "not regex" was empty causing an empty response from the database.
 2017-03-16 18:43:15 +01:00
Darko Miletic
ed63ffc715 MDL-58079 core_enrol: Implementing fix and unit test 2017-03-16 14:23:34 -03:00
Eloy Lafuente (stronk7)
fc31b06a28 Merge branch 'm33_MDL-58027_Restore_Missing_HTMLEntities_Call' of https://github.com/scara/moodle 2017-03-15 00:37:02 +01:00