mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 15:32:32 +02:00
Code Issues Projects Releases Wiki Activity
85,112 Commits 37 Branches 536 Tags
Commit Graph

85112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
1250166338 Merge branch 'MDL-59515' of https://github.com/NeillM/moodle 2017-07-17 09:42:27 +01:00
Dan Poltawski
540177523f Merge branch 'MDL-59442-master' of git://github.com/lameze/moodle 2017-07-17 09:16:29 +01:00
David Monllao
9e3b60c95d Merge branch 'MDL-59539-master' of git://github.com/tobiasreischmann/moodle 2017-07-17 10:14:55 +02:00
David Monllao
2764cd594b Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle 2017-07-17 10:09:35 +02:00
Dan Poltawski
16c903acc0 Merge branch 'wip-MDL-57649-master' of git://github.com/abgreeve/moodle 2017-07-17 09:01:05 +01:00
David Monllao
35d27924f9 Merge branch 'MDL-54607-master' of git://github.com/ankitagarwal/moodle 2017-07-17 09:31:53 +02:00
David Monllao
3ea76efa00 Merge branch 'MDL-58948_chrome_mink_driver' of https://github.com/mrmark/moodle 2017-07-17 09:10:25 +02:00
David Monllao
05c616d0b1 Merge branch 'wip-MDL-55912-master' of git://github.com/abgreeve/moodle 2017-07-17 09:09:03 +02:00
Andrew Nicols
5ee30c0fb4 Merge branch 'mdl55979-master' of https://github.com/tlock/moodle 2017-07-17 12:29:00 +08:00
Andrew Nicols
5a842a92b3 Merge branch 'MDL-57476_file_callbacks' of https://github.com/gthomas2/moodle 2017-07-17 10:31:28 +08:00
Andrew Nicols
cdbfc8d3ef Merge branch 'MDL-59371-master' of git://github.com/lameze/moodle 2017-07-17 10:23:06 +08:00
Adrian Greeve
0163e5d276 MDL-55912 mod_assign: Set grader details to the correct user. 2017-07-17 09:21:39 +08:00
Adrian Greeve
63cf03265b MDL-57649 mod_lesson: Delete answer files correctly. 
The files associated with answers and responses were
not being deleted due to the fact that the wrong itemid
was being used.
 2017-07-17 09:15:21 +08:00
Neill Magill
a5fbe27d8e MDL-59515 messages: Order of popup messages should be predictable 
Before this change the messages in the message popup would be loaded
onto a page in a random order, based on the speed at which the user's
browser was able to render each template.

This causes the messages to be attached to the page sequentially, after
they have all been rendered asynchronously.
 2017-07-14 15:50:48 +01:00
gthomas2
023037dc9e MDL-57476 file: Add CUD callbacks 2017-07-14 13:51:51 +01:00
Dan Poltawski
16a68a2f76 weekly release 3.4dev 2017-07-14 11:46:44 +01:00
Dan Poltawski
de1c03ccce NOBUG: Fixed file access permissions 2017-07-14 11:46:43 +01:00
Dan Poltawski
5b38d0b031 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-07-14 11:46:42 +01:00
Tobias Reischmann
d029841300
MDL-59539 oauth2/issuer: Changed baseurl for guessing image URL 
The url, which was used for guessing the image, was queried with the
key 'discoveryurl', which is not defined in the context of an issuer.
The baseurl should be sufficient to retrieve the favicon.ico from a
server. That's why the key for was changed from 'discoveryurl' to
'baseurl'.
 2017-07-14 11:10:50 +02:00
Dan Poltawski
009dcd91fd Merge branch 'MDL-59534' of git://github.com/stronk7/moodle 2017-07-14 07:16:05 +01:00
Andrew Nicols
de1d92459e Merge branch 'MDL-59383-master-behat-failure' of https://github.com/lameze/moodle 2017-07-14 11:52:53 +08:00
Simey Lameze
ebebbc442c MDL-59383 core_calendar: remove failing behat steps 2017-07-14 11:42:56 +08:00
Ankit Agarwal
8aaba9e47d MDL-54607 calendar: Export 0 duration events properly 
Thanks to Paul Prencis for initial suggestion of this patch
 2017-07-14 09:07:26 +05:30
Ankit Agarwal
0de211094a MDL-54607 calendar: Update benu lib to allow for instantaneous events 2017-07-14 09:07:08 +05:30
Eloy Lafuente (stronk7)
1d52027e57 MDL-59534 feedback: avoid some randomness with behat test failures 2017-07-13 20:08:33 +02:00
sam marshall
e80e4778c5 MDL-58957 Global search: fix failing text compare in Oracle 2017-07-13 14:41:37 +01:00
Dan Poltawski
671971775f Merge branch 'MDL-59437-master' of git://github.com/damyon/moodle 2017-07-13 09:16:19 +01:00
Simey Lameze
3a3d8c487b MDL-59442 core_course: apply css classes to activity icons 2017-07-13 15:23:22 +08:00
Andrew Nicols
f6a7d54f24 Merge branch 'MDL-59365-master-fix2' of http://github.com/damyon/moodle 2017-07-13 13:04:08 +08:00
Andrew Nicols
e45c3ae9b2 Merge branch 'MDL-58957-master-fix' of https://github.com/lameze/moodle 2017-07-13 12:58:27 +08:00
Damyon Wiese
b7386d0034 MDL-59437 participants: Add sort/pagination behat 2017-07-13 11:48:43 +08:00
Eloy Lafuente (stronk7)
d131489e3d MDL-59437 behat: avoid using participants page for tag tests 
While participants page is being refactored, there are links (fullname)
going and changing, leading to inestability in tests that were using
those links.

When possible, provide an alternative, stable path, in this case, the
tags page itself can be used to jump to the user profile, keeping the
tag tests better isolated.
 2017-07-13 11:48:35 +08:00
Eloy Lafuente (stronk7)
28fcc33944 MDL-59437 behat: old "edit" cog to go to enrollments page is gone 
There use to be a little cot to easily navigate from the
participations page to the enrollments page.

In boost it was already hidden, but present and the test was still
working (non-javascript).

With the conversion, the functionality is 100% gone so, right now,
the only way to navigate from participats to enrollments (that will
dissappear with with unification), is using the course admin cog.
 2017-07-13 11:48:28 +08:00
Simey Lameze
54ff9a4bb8 MDL-58957 theme_boost: add rule to prevent target conflict 2017-07-13 11:10:36 +08:00
Simey Lameze
a14907faa8 MDL-58957 core_block: fix link to site home 2017-07-13 11:10:36 +08:00
Damyon Wiese
af6d23853a MDL-59365 enrol: Behat fixes 
Fixes for the new enrol users popup with behat.
 2017-07-13 10:55:01 +08:00
David Monllao
002ac8e9fe MDL-59368 users: Clear whitespace 2017-07-12 16:53:55 +02:00
David Monllao
ed45119212 MDL-59368 users: Fix incorrect reference 2017-07-12 16:47:20 +02:00
David Monllao
eac6f51590 Merge branch 'MDL-59368-master' of git://github.com/damyon/moodle 2017-07-12 16:46:49 +02:00
David Monllao
9e548756cf Merge branch 'MDL-59384-master-final' of https://github.com/lameze/moodle 2017-07-12 14:12:53 +02:00
Simey Lameze
38b325a3e6 MDL-59384 core_calendar: add delete event logic to modal 
Part of MDL-59333.
 2017-07-12 20:03:04 +08:00
Simey Lameze
ea0368d599 MDL-59384 core_calendar: add calendar event amd module 2017-07-12 20:00:37 +08:00
Simey Lameze
1e8e6e132c MDL-59384 core_calendar: add necessary data-* attributes 
Part of MDL-59333.
 2017-07-12 19:58:57 +08:00
Simey Lameze
97c4a29d41 MDL-59384 core_modal: trigger bodyRendered event 
Part of MDL-59333.
 2017-07-12 19:57:22 +08:00
Simey Lameze
e4aff89a16 MDL-59384 core_calendar: add deleteEvent function to repository 
Part of MDL-59333.
 2017-07-12 19:56:27 +08:00
Simey Lameze
542f5afacc MDL-59384 core_calendar: make delete_calendar_events ajax visible 
Part of MDL-59333.
 2017-07-12 19:55:24 +08:00
Dan Poltawski
eff0303ad8 Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle 2017-07-12 12:22:32 +01:00
Simey Lameze
f02e119afd MDL-59383 core_modal: trigger event on modal module 2017-07-12 18:57:55 +08:00
Simey Lameze
e1c811609b MDL-59383 core_calendar: change modal body rendering 2017-07-12 18:56:45 +08:00
Simey Lameze
8a5c06b705 MDL-59383 core_calendar: proper handling of description on webservice 2017-07-12 18:56:30 +08:00