mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 18:12:29 +01:00
Code Issues Projects Releases Wiki Activity
91,680 Commits 36 Branches 527 Tags
Commit Graph

91680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Nicols
08cd15658a Merge branch 'MDL-63692-master' of git://github.com/sarjona/moodle 2018-11-20 07:51:40 +08:00
Eloy Lafuente (stronk7)
b2cb05a8c7 Merge branch 'MDL-64049-master' of git://github.com/andrewnicols/moodle 2018-11-20 00:26:09 +01:00
Eloy Lafuente (stronk7)
16d4f75b26 Merge branch 'MDL-63976-master-enfix' of git://github.com/mudrd8mz/moodle 2018-11-19 22:17:44 +01:00
Sara Arjona
16913e60b3 MDL-63692 core_message: Add favourite conversations to Privacy API 2018-11-19 22:09:13 +01:00
Sara Arjona
6b036d04cf MDL-63692 core_message: Fix the context for favourite conversations 
The converation favourites were previously set in the system context
which is not right, as they should be stored:
- In the conversation context when defined.
- In the user context, when contextid is null (that means is an
individual conversation).
 2018-11-19 22:08:28 +01:00
Sara Arjona
c752cce7dd MDL-63692 core_group: Add group conversation messages to Privacy API 2018-11-19 22:08:28 +01:00
Sara Arjona
201cebeae5 MDL-63692 core_message: Add conversation support to Privacy API 2018-11-19 22:08:22 +01:00
David Monllao
9af8b0aef1 Merge branch 'MDL-63394-master' of git://github.com/jleyva/moodle 2018-11-19 19:42:06 +01:00
David Mudrák
94693027e0 MDL-63976 lang: Update the Behat scenarios with the new strings 2018-11-19 19:18:53 +01:00
Helen Foster
cd492e2ea5 MDL-63976 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* courseoverviewfiles, courseoverviewfiles_help, courseoverviewfilesext
  in core, configcourseoverviewfilesext, configcourseoverviewfileslimit
  in core_admin, areacourseoverviewfiles in core_repository - renaming
  of 'Course summary files' to 'Course image'
 2018-11-19 19:17:52 +01:00
Adrian Greeve
674c00edb2 MDL-64008 badges: Stop displaying empty fields in badge display. 2018-11-19 18:42:49 +01:00
David Monllao
892356acaa MDL-64060 message: Replace error code by language str 2018-11-19 11:18:39 +01:00
David Monllao
a6c4e6f0a6 Merge branch 'MDL-64060-master' of git://github.com/jleyva/moodle 2018-11-19 11:16:09 +01:00
David Monllao
dd2d82e55c Merge branch 'MDL-64010-master' of git://github.com/abgreeve/moodle 2018-11-19 11:12:09 +01:00
David Monllao
c47fea4e75 MDL-63817 block_timeline: Consistent activities limit default 2018-11-19 10:57:13 +01:00
David Monllao
94db315b50 Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle 2018-11-19 10:49:15 +01:00
Damyon Wiese
a356db0db2 Merge branch 'MDL-63973-master' of https://github.com/snake/moodle 2018-11-19 16:28:13 +08:00
Jun Pataleta
31cc108654 Merge branch 'MDL-63994-master-castoken' of git://github.com/mudrd8mz/moodle 2018-11-19 15:51:38 +08:00
Andrew Nicols
90a4438139 Merge branch 'MDL-64035-master' of https://github.com/snake/moodle 2018-11-19 15:08:22 +08:00
David Monllao
9b2d10e522 Merge branch 'MDL-63487-master' of https://github.com/lucaboesch/moodle 2018-11-19 08:07:05 +01:00