mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 23:12:32 +02:00
Code Issues Projects Releases Wiki Activity
91,902 Commits 36 Branches 528 Tags
Commit Graph

91902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
70abb41263 Merge branch 'MDL-63798_assign_restore_groups' of git://github.com/davosmith/moodle 2018-11-21 16:05:32 +01:00
Jun Pataleta
69b6e2e9bc Merge branch 'MDL-64079-master' of https://github.com/Dagefoerde/moodle 2018-11-21 22:44:16 +08:00
Sara Arjona
ae09cccf5a MDL-64149 core_badges: Remove and deprecate unused strings 2018-11-21 13:18:22 +01:00
Bas Brands
eae1a1eda7 MDL-64129 messaging: messaging accordion 
* fixes open / close chevron icons
* add 1 pixel content for Bootstrap 2 accordion Javascript to work
 2018-11-21 11:06:27 +01:00
Jun Pataleta
2102625e09
MDL-64079 oauth2: Test access token expiration 2018-11-21 10:07:14 +01:00
Jan Dageförde
121fa4381e
MDL-64079 oauth2: Set an arbitrary expiration date for eternal tokens 
The oauth2 standard does not require access tokens to have an
expiration date. This assumes a default validity period of 7 days unless
an explicit expiration date is communicated by the server.
 2018-11-21 10:07:14 +01:00
David Monllao
ede77961aa Merge branch 'MDL-63591_master' of git://github.com/markn86/moodle 2018-11-21 09:40:59 +01:00
Mark Nelson
b564a55153 MDL-63591 core_grades: updated privacy provider 2018-11-21 16:15:12 +08:00
Mark Nelson
ac81c98648 MDL-63591 core_grades: delete files when grade object is deleted 2018-11-21 16:15:12 +08:00
Davo Smith
b5f63b1e90 MDL-63798 mod_assign: fix restore when group is missing 2018-11-21 07:58:11 +00:00
Andrew Nicols
77295b2922 Merge branch 'MDL-64136-master' of git://github.com/ryanwyllie/moodle 2018-11-21 14:48:31 +08:00
Mark Nelson
4f95f92edc MDL-63591 assignfeedback_comments: fix privacy provider file URLs 2018-11-21 14:38:13 +08:00
Peter
495e1b5615 MDL-64092 block_timeline: Separate the activity view and submission link 
* Reintroduce separate links similar to 35
* Hide submission links if not actionable
 2018-11-21 14:26:38 +08:00
Ryan Wyllie
070d4819b2 MDL-64136 message: remove unused message_drawer_view_contacts_section.js 2018-11-21 14:11:29 +08:00
Andrew Nicols
1d163100ec Merge branch 'MDL-64128-master' of git://github.com/ryanwyllie/moodle 2018-11-21 14:04:27 +08:00
David Monllao
819cb2054b Merge branch 'MDL-64063-master' of git://github.com/abgreeve/moodle 2018-11-21 06:27:09 +01:00
Jun Pataleta
f4aa71be50 Merge branch 'MDL-64091-master' of git://github.com/mickhawkins/moodle 2018-11-21 12:21:15 +08:00
Ryan Wyllie
6adee4a7b5 MDL-64128 message: fix exception when declining contact request 2018-11-21 11:45:24 +08:00
Jun Pataleta
2f22731a36 Merge branch 'MDL-64078-master' of https://github.com/Dagefoerde/moodle 2018-11-21 11:17:38 +08:00
Mark Nelson
00e103a7b4 MDL-64018 core_message: use new web service in UI 2018-11-21 11:09:55 +08:00
Mark Nelson
c9b0f33f78 MDL-64018 core_message: added external::get_user_contacts 
This is to replace usages of external::data_for_messagearea_contacts
in the new UI.
 2018-11-21 11:09:55 +08:00
Mark Nelson
715c45aac9 MDL-64018 core_message: added api::get_user_contacts 
This is to replace api::get_contacts when that gets deprecated.
 2018-11-21 11:09:11 +08:00
Mark Nelson
f89055372e MDL-64018 core_message: deprecated get_contacts web service 2018-11-21 11:09:11 +08:00
Michael Hawkins
ef9f22a85c MDL-64091 theme_clean: Fix conflicting CSS for icon-size-* class 2018-11-21 10:54:53 +08:00
Damyon Wiese
730284fc16 Merge branch 'MDL-64054-master' of git://github.com/ryanwyllie/moodle 2018-11-21 10:07:42 +08:00
Andrew Nicols
f83041790a Merge branch 'MDL-64045-master' of git://github.com/ryanwyllie/moodle 2018-11-21 09:58:50 +08:00
Adrian Greeve
c84ee67864 MDL-64063 core_calendar: Unit test for suspended users. 2018-11-21 09:51:52 +08:00
Adrian Greeve
644ffbd332 MDL-64063 core_calendar: events by time considers enrolment status. 2018-11-21 09:51:52 +08:00
Ryan Wyllie
b263491138 MDL-64045 message: stop favouriting null conversations 
Don't show the controls to favourite a conversation until one has been
created.
 2018-11-21 08:57:34 +08:00
Andrew Nicols
3c1d2a88c2 Merge branch 'MDL-64077-master' of git://github.com/vmdef/moodle 2018-11-21 08:10:59 +08:00
Sara Arjona
4ecb387d55 MDL-64119 user: Display full names consistently for teachers 
Fix an error with users with the moodle/site:viewfullnames capability
in a course context (like teachers), to display properly the full
names in pages like the participants one.
 2018-11-20 19:41:21 +01:00
David Monllao
a78a876629 Merge branch 'MDL-63571-master' of git://github.com/peterRd/moodle 2018-11-20 17:19:11 +01:00
Jan Dageförde
3559677cb7
MDL-64078 oauth2: Google service relies on autodiscovery 2018-11-20 16:43:35 +01:00
Víctor Déniz Falcón
d77efead0a MDL-64077 block_site_main: modify style to fix layout in boost theme 2018-11-20 13:08:13 +00:00
David Monllao
0225ad42ea on-demand release 3.6beta+ 2018-11-20 12:55:28 +01:00
Damyon Wiese
dcb35b721c MDL-63920 backup: Email string improvement 
Change from semicolon to colon in email.
 2018-11-20 16:14:35 +08:00
Jun Pataleta
bc7195fa02 Merge branch 'MDL-63692-master-fix' of git://github.com/junpataleta/moodle 2018-11-20 14:48:08 +08:00
Jun Pataleta
918776482a MDL-63692 message: Set canonicalize to true for array comparison 2018-11-20 14:41:40 +08:00
Andrew Nicols
43f6899289 MDL-63692 message: Correct favourite fetch 2018-11-20 14:40:39 +08:00
Andrew Nicols
ffd303146f MDL-63692 message: Fix unit test assumption 
Contact requests do not cause notifications.
 2018-11-20 14:40:39 +08:00
Peter
727d3d70e1 MDL-63571 gradebook: Display the name header based on config setting 2018-11-20 14:06:31 +08:00
Jun Pataleta
60e265e76f Merge branch 'MDL-63921-master' of git://github.com/andrewnicols/moodle 2018-11-20 13:54:14 +08:00
Andrew Nicols
b20a6a4af6 Merge branch 'MDL-64024-master' of git://github.com/snake/moodle 2018-11-20 12:26:09 +08:00
Jun Pataleta
a7ca299373 Merge branch 'MDL-63663-master' of git://github.com/bmbrands/moodle 2018-11-20 11:59:29 +08:00
Jun Pataleta
1cc37dc523 Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle 2018-11-20 11:20:23 +08:00
Sara Arjona
4f97ea8856 MDL-64024 message: Fix lib::get_messages to get only individual messages 
From 3.6 users can have also group conversations, so it's needed to review
the messages_get_messages function to make sure only returns the
individual messages between 2 users.
 2018-11-20 10:44:27 +08:00
Andrew Nicols
04e83dcf10 Merge branch 'MDL-64058-master' of https://github.com/snake/moodle 2018-11-20 10:22:41 +08:00
Andrew Nicols
2f7076ebf2 MDL-63692 message: Resolve bad merge conflict 2018-11-20 09:04:53 +08:00
Peter
eb2fe63ef1 MDL-63817 block_timeline: Fixed behat test and clean template 2018-11-20 09:00:44 +08:00
Jake Dallimore
4283291889 MDL-64058 core_message: fix logic driving conversation section expansion 
Unread conversations should be given priority over read. If one or more
sections have unread conversations, prioritise favourites over group and
group over individual. The same applies if all conversations are read.
 2018-11-20 08:56:37 +08:00