moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84018 commits 37 branches 540 tags 1.3 GiB
Commit graph

84018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Nelson
01f96180ff MDL-58504 mod_*: fixed PHPDoc return type for *_provide_event_action 2017-04-06 15:00:02 +08:00
David Monllao
a10461e034 Merge branch 'MDL-58369-master' of git://github.com/damyon/moodle 2017-04-06 08:59:21 +02:00
David Monllao
12b471a4d3 Merge branch 'MDL-58398-master' of git://github.com/ankitagarwal/moodle 2017-04-06 08:38:52 +02:00
Andrew Nicols
ffc4b7e4af Merge branch 'MDL-55611_master' of git://github.com/markn86/moodle 2017-04-06 13:24:05 +08:00
Mark Nelson
5c85bfe122 MDL-55611 core_calendar: Fixed query for Oracle 
Also fixed unit test filter.
 2017-04-06 12:56:00 +08:00
Andrew Nicols
97f17c0490 Merge branch 'MDL-58220-master-fix4' of http://github.com/damyon/moodle 2017-04-06 11:54:58 +08:00
Damyon Wiese
427fa27cf4 MDL-58220 auth_oauth2: Fix login domains 
The login domains were checking the email of the moodle account, not the returned
email from oauth. Also after a failure, it was not killing the oauth session, which
prevents you trying again with a different account.
 2017-04-06 11:35:02 +08:00
Damyon Wiese
0eb4c06645 MDL-58220 oauth2: Fix account linking 
The username passed to the confirm account link request is the oauth username,
which may be different to the moodle username so can't be used to look up the user record.
 2017-04-06 10:41:46 +08:00
Jake Dallimore
b8094f8a18 Merge branch 'MDL-58443-master' of git://github.com/jleyva/moodle 2017-04-06 09:41:37 +08:00
Jake Dallimore
6e58427458 Merge branch 'MDL-55611-master-fix' of git://github.com/andrewnicols/moodle 2017-04-06 09:23:29 +08:00
Andrew Nicols
3e57763833 Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle 2017-04-06 09:02:36 +08:00
Marina Glancy
63709b0e16 MDL-23919 mod_data: fix bug when completion is reset 2017-04-06 08:54:00 +08:00
Andrew Nicols
95f38c22ca MDL-55611 calendar: Fix unit test filter 
The event test factory uses a closure to return only every other record.
This was previously working based on ID but MSSQL starts from an even
number rather than an odd number.

This change changes that to use a static variable which keeps a count of
the records instead and only returns every other record in this fashion,
removing the dependance upon ID.
 2017-04-06 08:50:12 +08:00
AMOS bot
a946e1a838 Automatically generated installer lang files 2017-04-06 00:07:08 +08:00
AMOS bot
2ee6fc9fd8 Automatically generated installer lang files 2017-04-06 00:07:08 +08:00
Dan Poltawski
5f5f71ea62 Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle 2017-04-05 12:44:03 +01:00
Juan Leyva
8c60d198c2 MDL-57411 groups: Fix tests for MSSQL 2017-04-05 13:17:46 +02:00
Dan Poltawski
c3345f32f0 Merge branch 'MDL-58220-master-fix3' of http://github.com/damyon/moodle 2017-04-05 10:16:57 +01:00
Damyon Wiese
f331513347 MDL-58220 auth_oauth2: Fix for login via linked login 
This was broken by the refactoring to always link logins. Some of the static
variables could also be removed but I'll do that in a later issue to keep this patch small.
 2017-04-05 15:55:53 +08:00
Andrew Nicols
00aa58eb5f Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle 2017-04-05 15:49:49 +08:00
Juan Leyva
dbc404de71 MDL-58399 webservice: Add missing upgrade.txt information 
We should indicate the API changes for developers.
 2017-04-05 09:41:15 +02:00
Juan Leyva
682aea9b84 MDL-58453 mod_feedback: Refactor get_non_respondents WS 
We should return more information like if the user started or not the
feedback and the total number of non respondents (to be able to
paginate).
 2017-04-05 09:28:29 +02:00
Andrew Nicols
c254588732 Merge branch 'MDL-58361-master' of https://github.com/xow/moodle 2017-04-05 15:19:58 +08:00
Barbara Ramiro
9436711f28 MDL-58499 block_myoverview: show two blocks of courses on XL 2017-04-05 15:09:31 +08:00
Juan Leyva
007b7cad82 MDL-57813 mod_feedback: Create exporter and required API changes 2017-04-05 09:07:43 +02:00
Andrew Nicols
c46ae2fbc1 Merge branch 'MDL-58361-master' of https://github.com/xow/moodle 2017-04-05 15:04:44 +08:00
Andrew Nicols
3aa424703b Merge branch 'MDL-58220-master-fix2' of http://github.com/damyon/moodle 2017-04-05 14:43:13 +08:00
Damyon Wiese
a647e7d762 MDL-58220 oauth2: missing param confirmtokenexpires 2017-04-05 14:42:22 +08:00
Andrew Nicols
941cb7ce3c Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle 2017-04-05 14:22:39 +08:00
Andrew Nicols
2a44422e54 Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle 2017-04-05 12:56:01 +08:00
Damyon Wiese
6cee96c8af MDL-58220 oauth2: obey $CFG->authpreventaccountcreation 2017-04-05 12:52:32 +08:00
Andrew Nicols
038db9734f Merge branch 'MDL-58444-master' of git://github.com/jleyva/moodle 2017-04-05 12:29:13 +08:00
Andrew Nicols
e31dba2c8d Merge branch 'MDL-12689_master' of https://github.com/markn86/moodle 2017-04-05 11:13:31 +08:00
Mark Nelson
90b735b169 MDL-12689 core: fixed incorrect use of the term 'depreciated' 2017-04-05 11:12:07 +08:00
Andrew Nicols
04056e715b Merge branch 'MDL-51998_master' of https://github.com/nadavkav/moodle 2017-04-05 09:56:29 +08:00
Jun Pataleta
458315f857 Merge branch 'MDL-57821-master' of git://github.com/jleyva/moodle 2017-04-05 09:39:02 +08:00
Jake Dallimore
170a8b3ec4 Merge branch 'MDL-58368-master' of git://github.com/damyon/moodle 2017-04-05 09:33:45 +08:00
Eloy Lafuente (stronk7)
e58654f452 Merge branch 'scorm-task' of https://github.com/GanitGenius/moodle 2017-04-05 02:02:03 +02:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Eloy Lafuente (stronk7)
a2c15cc5a2 Merge branch 'MDL-58055-master' of git://github.com/andrewnicols/moodle 2017-04-05 00:22:19 +02:00
Eloy Lafuente (stronk7)
4c9919fb15 Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle 2017-04-04 19:01:57 +02:00
Dan Poltawski
67aaf4eeda MDL-55611 upgrade.txt: remove duplicated note 2017-04-04 17:32:13 +01:00
Eloy Lafuente (stronk7)
fc96fac29e Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle 2017-04-04 18:23:02 +02:00
Dan Poltawski
6ebb0947f0 MDL-55611 upgrade: bump redirect_if_major_update_required 2017-04-04 17:08:35 +01:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
AMOS bot
e2a60440e1 Automatically generated installer lang files 2017-04-05 00:04:21 +08:00
Dan Poltawski
14286ebd4a MDL-55611 calendar: remove duplicated 'scheduled task stuff' 2017-04-04 17:02:07 +01:00
Tim Hunt
2524990d09 MDL-58486 user_prefs: always update $USER cache when applicable 
set_user_preference and unset_user_preference let you pass the user to
set preferences for as an id. Previously, if you passed $USER->id there,
those methods did not update the Cache in $USER, which was surprising,
and not easy to debug.

Now, we always update the preference cache in $USER if the preference is
being changed for the current user.
 2017-04-04 16:20:26 +01:00
Simey Lameze
5342a54159 MDL-58474 block_myoverview: change step datetime format 
Part of MDL-55611 epic.
 2017-04-04 11:01:58 +01:00
Simey Lameze
53cbac18ba MDL-58474 core_calendar: add missing action_event_interface import 
Part of MDL-55611 epic.
 2017-04-04 11:01:57 +01:00