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

23136 Commits

Author SHA1 Message Date
Mark Nelson
9bd158a3c7 MDL-57878 core: fixed failing unit test 
Part of MDL-55611 epic.
 2017-04-03 11:37:09 +08:00
Simey Lameze
fdeeaff954 MDL-58265 core_test: replace I turn editing on steps 
Also remove few more unnecessary steps that redirects behat to
site home page to actually get to the course.

Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Simey Lameze
3353cfd8c1 MDL-58265 core_test: add I am on course homepage in edit mode step 
This commit also:
- Rename i_am_on_course_page to i_am_on_course_homepage.
- Pass false to out_as_local_url()

Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Simey Lameze
93be3f730c MDL-58265 core_test: remove unnecessary steps 
This commmit removes steps that take behat to site home page
to actually get to a course page.

Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Simey Lameze
c987d1b2ef MDL-58265 core_test: replace all uses of I follow course steps 
Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Simey Lameze
95f11fde64 MDL-58265 core_test: add I am on course page behat step 
Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Cameron Ball
e798fa76f5 MDL-58110 core_calendar: Add proxy for modules 
Modules associated with an event are stored in the event table
as the module's name and instance number not the actual ID of the instance
in the modules table.

So to lazy load them we need a proxy that uses the module name and instance
rather than the ID.

Part of MDL-55611 epic.
 2017-04-03 11:37:06 +08:00
Mark Nelson
00995f0339 MDL-58239 core_output: fixed user date helper doc example 
Part of MDL-55611 epic.
 2017-04-03 11:37:06 +08:00
Ryan Wyllie
9b8e505715 MDL-57503 calendar: external function for action events by courses 
Added an external function to get action events by a list of courses and
timesort.

Part of MDL-55611 epic.
 2017-04-03 11:36:34 +08:00
Ryan Wyllie
60774b28c3 MDL-57503 calendar: external function get action events by course 
Added an external function to get action events by course and timesort.

Part of MDL-55611 epic.
 2017-04-03 11:36:34 +08:00
Ryan Wyllie
1ef06b4335 MDL-57503 enrol: allow course ids for enrol_get_my_courses 
Allow enrol_get_my_courses to be filtered by a set of known course ids
that the user may or may not be enrolled on.

The result will be a subset of the given course ids that the user is
enrolled in.

Part of MDL-55611 epic.
 2017-04-03 11:36:34 +08:00
Mark Nelson
c0f877fa62 MDL-57502 core_calendar: add get calendar action events web service 
Part of MDL-55611 epic.
 2017-04-03 11:36:07 +08:00
Mark Nelson
12cbce0aa3 MDL-57888 core_calendar: moved functions from calendar/lib.php 
Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Simey Lameze
a22fa7cb68 MDL-57545 core_calendar: remove visibility fields from calendar events 
Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Mark Nelson
c45266d115 MDL-57545 core_calendar: trigger update event when toggling visibility 
Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Ryan Wyllie
e03d5d4790 MDL-57445 core: allow context variables in pix helper 
Allow the user of context variables in the id and component section of
the pix helper.

Part of MDL-55611 epic.
 2017-04-03 11:35:37 +08:00
Mark Nelson
ca622fd9fa MDL-57435 core: added additional columns to 'event' table 
Part of MDL-55611 epic.
 2017-04-03 11:35:37 +08:00
Mark Nelson
e057f279e4 MDL-57497 core_calendar: added new calendar event class 
Moved calendar_event class to new location using replaceclasses.php

Part of MDL-55611 epic.
 2017-04-03 11:33:55 +08:00
Mark Nelson
e9dfeec94e MDL-57434 core: deprecated xxx_print_overview() and related functions 
Part of MDL-55611 epic.
 2017-04-03 11:33:55 +08:00
Mark Nelson
4c5cde3134 MDL-57433 block_course_overview: removed block from core 
Part of MDL-55611 epic.
 2017-04-03 11:33:55 +08:00
Mark Nelson
932f299bc0 MDL-57437 core: upgrade code for introduction of block_myoverview 
Part of MDL-55611 epic.
 2017-04-03 11:32:57 +08:00
Mark Nelson
1c69e1994d MDL-57436 core: added 'myoverview' block to list of standard plugins 
Part of MDL-55611 epic.
 2017-04-03 11:31:32 +08: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