mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-17 14:10:08 +01:00
Code Issues Projects Releases Wiki Activity
87,076 Commits 36 Branches 527 Tags
Commit Graph

24142 Commits

Author SHA1 Message Date
David Monllao
08641175b3 Merge branch 'MDL-60764' of git://github.com/stronk7/moodle 2017-11-10 10:20:25 +01:00
Damyon Wiese
f738fc8efd Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle 2017-11-10 13:57:04 +08:00
Andrew Nicols
27973b545c MDL-60763 calendar: Use PHP concat, not JS 2017-11-10 13:56:39 +08:00
Damyon Wiese
3192438075 Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle 2017-11-10 13:47:05 +08:00
Andrew Nicols
41b7375c07 MDL-60763 core_calendar: Deprecate calendar_get_upcoming 2017-11-10 13:45:32 +08:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release 
version = 2017111300 release version
requires= 2017110800 current rc2 version
 2017-11-10 02:52:53 +01:00
David Monllao
4e73acf3cf Merge branch 'MDL-60579-master' of https://github.com/mihailges/moodle 2017-11-08 12:16:20 +01:00
David Monllao
fcafb22c22 MDL-60733 oauth: Remove outdated comment 2017-11-08 12:04:31 +01:00
David Monllao
6463a047a2 Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle 2017-11-08 12:03:43 +01:00
Damyon Wiese
d3882ea4a3 MDL-60733 core: B/C for google_oauth 
The google_oauth class extends oauth2client which was modified to send "Accept" headers.

The "Accept" headers break picasa and could break any other plugin that was using google_oauth.
 2017-11-08 15:41:53 +08:00
David Monllao
cae37299f3 Merge branch 'MDL-59758-master' of git://github.com/damyon/moodle 2017-11-07 12:37:30 +01:00
Mihail Geshoski
c835126185 MDL-60579 enrolments: Applied filters lost on certain actions 
AMOS BEGIN
    CPY [invalidrequest,enrol_lti],[invalidrequest,enrol]
AMOS END
 2017-11-07 16:17:00 +08:00
Damyon Wiese
b5b81de3d6 MDL-59758 core_user: Replace old bulk actions 
The participants page has some clunky multi page forms for bulk actions. Replaces it with an ajax alternative.
 2017-11-07 14:18:49 +08:00
Damyon Wiese
8aa01fcf61 Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle 2017-11-07 11:05:43 +08:00
Damyon Wiese
b9ae53f86b MDL-59758 js: auto_rows module easier to use 
Allow passing the direct text area, or a container.
Trigger change events on the text area, not the container.
Properly handle starting with rows > 1
 2017-11-07 10:36:13 +08:00
Jun Pataleta
13b19e40cb Merge branch 'wip-MDL-60391-master' of git://github.com/marinaglancy/moodle 2017-11-07 14:30:58 +13:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
sam marshall
11e60032be MDL-60671 core_search: Cron output should use mtrace 
The mtrace function is preferable for plain text logging/progress
output because it can be redirected if necessary. By convention it
is normally used in cron and can be used in CLI tasks if required.

This change makes the text_progress_trace class use mtrace instead
of echo and then flush. (Default behaviour of mtrace is to do
exactly that, but it can be redirected too.)

Before this change, if anybody is relying on mtrace behaviour to
redirect logs of cron output, this will fail for some parts of the
search cron output (and some other places like auth plugins).
 2017-11-06 11:55:29 +00:00
Andrew Nicols
3602df58b2 Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle 2017-11-06 13:27:11 +08:00
Damyon Wiese
ef29782f31 Merge branch 'MDL-59858-master' of git://github.com/junpataleta/moodle 2017-11-06 10:45:34 +08:00
Jake Dallimore
eb354bdefa Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle 2017-11-06 09:29:46 +08:00
Jun Pataleta
4cd3927c4f MDL-59858 amd: Focus on the element that actually triggers the modal 2017-11-06 13:18:03 +13:00
Eloy Lafuente (stronk7)
796e48a58b MDL-60611 phpunit: remove deprecated stuff and other minor fixes 
Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons
 2017-11-05 01:45:04 +01:00
David Monllao
20b2565c38 MDL-60667 mlbackend_python: Bump to non-linear neural net version 2017-11-03 12:43:52 +01:00
Andrew Nicols
b9fd516407 MDL-60361 calendar: Support all event types for calendar subs 2017-11-03 11:27:40 +08:00
Eloy Lafuente (stronk7)
801a372dad MDL-60611 phpunit: switch to namespaced phunit classes 2017-11-02 23:45:34 +01:00
David Monllao
6e3314f044 Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle 2017-11-02 12:04:07 +01:00
David Monllao
2a542d0265 Merge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle 2017-11-02 11:59:30 +01:00
Ryan Wyllie
f0f38bf1d3 MDL-60657 core: fix upgrade notice modal header padding 2017-11-02 06:07:00 +00:00
Andrew Nicols
58280ae0b8 Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle 2017-11-02 08:47:17 +08:00
Adrian Greeve
ab2095fb0f MDL-60515 groups: Behat test for viewing the group description. 2017-11-01 15:24:38 +08:00
Jun Pataleta
1cc7a14ce4 Merge branch 'MDL-59936-int-fix-1' of github.com:ryanwyllie/moodle 2017-10-31 16:02:50 +13:00
Ryan Wyllie
4397da0c4d MDL-59936 boost: improve focus outline on modal header 2017-10-31 02:38:29 +00:00
Andrew Nicols
d8966238dd Merge branch 'wip-MDL-60569-master' of git://github.com/marinaglancy/moodle 2017-10-31 10:15:56 +08:00
Andrew Nicols
3e4de62607 Merge branch 'MDL-60139' of git://github.com/timhunt/moodle 2017-10-31 09:14:32 +08:00
Andrew Nicols
314b8093e7 MDL-60633 core: Add pendingjs checks for inplace editable 2017-10-31 07:03:13 +08:00
Tim Hunt
46a3753424 MDL-60139 phpunit: Make assertTag verify attribute values with === 
I had a test that cared about the difference between value="5.0" and value="5".
 2017-10-30 12:52:00 +00:00
Adrian Greeve
c550fd0e11 MDL-60515 groups: Update to weblib group function. 
Added a new function to get the url for the group picture.
 2017-10-30 16:43:19 +08:00
Ryan Wyllie
8f730872a7 MDL-59936 calendar: use event colour in summary modal header 2017-10-30 08:34:26 +08:00
Ryan Wyllie
4febb36efe MDL-59936 calendar: use icons in event summary modal 2017-10-30 08:33:54 +08:00
Ryan Wyllie
368832d51c MDL-59936 javascript: hide modal footer without content 2017-10-30 08:33:54 +08:00
David Monllao
a272c25649 Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle 2017-10-26 18:33:49 +02:00
Mark Johnson
a9ca3fa167 MDL-60600 core_output: Clear static icon system cache between unit tests 2017-10-26 14:59:35 +01:00
Jun Pataleta
1fc642324a Merge branch 'MDL-59909-master' of git://github.com/damyon/moodle 2017-10-26 21:09:12 +13:00
David Monllao
fd39db29e2 Merge branch 'MDL-59973-master' of git://github.com/damyon/moodle 2017-10-26 09:47:22 +02:00
David Monllao
341505e5de Merge branch 'MDL-60458-master' of git://github.com/damyon/moodle 2017-10-26 09:41:09 +02:00
Andrew Nicols
4d03dbf13d Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle 2017-10-26 14:19:43 +08:00
Damyon Wiese
a5327e449d MDL-59973 calendar: Admin calendar course lists 
Consolidate the logic for the list of courses an admin will see in the calendar.

They will see all courses if calendar_admincanseeall is enabled.

They will see only courses they are enrolled in of calendar_admincanseeall is not enabled.

They will also see the current course, if they are admin and it is not already in the list.

This applies to the course selector and the create and update event forms.

The calendar link in the navigation block has also been changed to link to the current course calendar instead of the global
one.
 2017-10-26 13:28:00 +08:00
Jake Dallimore
1e67827131 Merge branch 'MDL-60434_master' of git://github.com/dmonllao/moodle 2017-10-26 13:11:46 +08:00
Andrew Nicols
9fd91f8eec Merge branch 'master-MDL-51892' of https://github.com/fwsl/moodle 2017-10-26 11:08:50 +08:00