mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 10:32:40 +01:00
Code Issues Projects Releases Wiki Activity
91,694 Commits 36 Branches 527 Tags
Commit Graph

91694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
7f6f45c460 MDL-64167 core_message: fix counts to exclude 'self' conversations 2018-11-26 08:52:55 +08:00
Jake Dallimore
425f5adcca MDL-64167 core_message: get_conversations() excludes self conversations 
The UI can't handle these, so for now, let's not return them.
 2018-11-26 08:52:55 +08:00
Jake Dallimore
cb38961988 MDL-64167 core_message: get_conversations() handles self conversations 
Those individual conversations created with one's self (via admin user
bulk actions) are now supported in get_conversations(). These had two
records with the same userid in the message_conversation_members table.
The following adjustments have been made to accomodate these:
- Member count adjusted to read 1, not 2 for 'self' conversations.
- Member information for the current user now returned for 'self'
conversations.
- The method now tracks 'self' conversations via $selfconversations.
 2018-11-26 08:52:54 +08:00
Jake Dallimore
ad5de40c49 MDL-64167 core_message: fix for sending bulk messages from site admin 
This ensures the following:
- An admin/manager can send a message to all users, including themself,
without any errors.
 2018-11-26 08:52:53 +08:00
Bas Brands
02383d7119 MDL-64173 block_myoverview: remove heading class from course title 
Using <h4> on the course name titles is symantically incorrect
To align with the other views the heading tag has been removed.
 2018-11-25 13:44:35 +01:00
Bas Brands
ecefd2d5b5 MDL-64172 block_myoverview: use .text-primary to colour star icons 
Using the .text-primary class allows colour to be overridden easily
This will back the dashboard icons look consistent with the messaging icons.
 2018-11-25 12:44:04 +01:00
Bas Brands
224567a0f2 MDL-64170 block myoverview: change title string to course 
change language string for Sort by "Title" to "Course"
 2018-11-25 11:36:14 +01:00
Eloy Lafuente (stronk7)
599703e83d Moodle release 3.6rc1 v3.6.0-rc1 2018-11-25 10:50:38 +01:00
David Mudrák
8b52601b1a MDL-64205 users: Do not delete the actual records of unconfirmed users 
There is an automatic data privacy request created to get rid of all the
personal data upon the user deletion. With the actual user record
absent, the data privacy requests page throws an error. Let's do here
same as we do in `delete_incomplete_users_task` and let us not delete
the actual user record.
 2018-11-25 06:55:23 +01:00
Eloy Lafuente (stronk7)
12008f51e2 Merge branch 'MDL-64186-master-enfix' of git://github.com/mudrd8mz/moodle 2018-11-24 00:26:18 +01:00
Eloy Lafuente (stronk7)
69f2118621 on-demand release 3.6beta+ 2018-11-23 16:36:55 +01:00
Eloy Lafuente (stronk7)
1b8caf1970 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-11-23 16:36:53 +01:00
Helen Foster
414da8c0be MDL-64186 lang: Import fixed English strings (en_fix) 
Significant string change:

* togglemessagemenu, core_message - messages menu -> messaging drawer
  (new functionality)
 2018-11-23 14:39:54 +01:00
Jun Pataleta
beb7083381 Merge branch 'MDL-64057-master' of https://github.com/snake/moodle 2018-11-23 14:47:00 +08:00
Jake Dallimore
c296c48f66 MDL-64057 core_message: fix bug with favourite count aggregation 2018-11-23 14:42:33 +08:00
Damyon Wiese
35889e23b7 Merge branch 'MDL-64180_master' of git://github.com/markn86/moodle 2018-11-23 12:21:13 +08:00
Mark Nelson
7d678923b3 MDL-64180 core_message: added new WS for contact request count 2018-11-23 11:34:55 +08:00
Mark Nelson
720cc99331 MDL-64180 core_message: change stdClass to int for count requests param 
This will be used by a new web service and we do not want to fetch
the user unnecessarily in the call.

Also renamed the method for consistency.
 2018-11-23 11:34:40 +08:00
Jun Pataleta
252f0e16ea Merge branch 'MDL-64057-master' of https://github.com/snake/moodle 2018-11-23 11:24:58 +08:00
Jun Pataleta
4fb38666b4 Merge branch 'MDL-64030-master' of git://github.com/andrewnicols/moodle 2018-11-23 11:14:57 +08:00
Jake Dallimore
0847aa120c MDL-64057 core_message: return conversations with soft-deleted users 
Individual conversations with a soft-deleted user (including messages)
are now displayed in the conversation listing. This brings the behaviour
of individual conversations in line with group conversations, in that
the active user can still view messages.
 2018-11-23 11:02:20 +08:00
Jake Dallimore
b694b9b8e2 MDL-64057 core_message: use get_conversation_counts() during rendering 2018-11-23 11:02:20 +08:00
Jake Dallimore
28ff6ad1da MDL-64057 core_message: add get_conversation_counts() web service 2018-11-23 11:02:20 +08:00
Jake Dallimore
8e91aaabc9 MDL-64057 core_message: consolidate conversation counts into single call 
Counts for types (individual, group) and favourites can be fetched with
a single API call.
 2018-11-23 11:02:19 +08:00
Jake Dallimore
92bea7db2a MDL-64057 core_favourites: add get_join_sql_by_type() to service layer 
This provides a way for external queries to include information about
favourited items.
 2018-11-23 11:02:18 +08:00
AMOS bot
79a607eb3c Automatically generated installer lang files 2018-11-23 00:07:24 +00:00
Andrew Nicols
26ce2c0a81 MDL-64030 tool_dataprivacy: Process requests when system purpose not set 2018-11-23 07:54:22 +08:00
Eloy Lafuente (stronk7)
78fd9a2b53 Merge branch 'MDL-62988_master' of git://github.com/markn86/moodle 2018-11-22 23:15:54 +01:00
Jun Pataleta
c039ba7341 Merge branch 'MDL-64119-master' of git://github.com/junpataleta/moodle 2018-11-22 20:34:06 +08:00
Sara Arjona
9ecc75d497 MDL-64119 output: Use context of renderer_base's page object 2018-11-22 20:33:27 +08:00
Jun Pataleta
1dcb2445c6 MDL-63571 grade_report_grader: Use correct context for capability check 2018-11-22 16:19:38 +08:00
Jun Pataleta
7c60fac9dc MDL-63571 grade_report_grader: Set correct type for the context variable 2018-11-22 16:19:38 +08:00
Jun Pataleta
5dfd0e63a0 Merge branch 'MDL-64142-master-1' of git://github.com/mihailges/moodle 2018-11-22 15:46:01 +08:00
Andrew Nicols
90015eff82 Merge branch 'MDL-64165_master' of git://github.com/markn86/moodle 2018-11-22 15:40:41 +08:00
Mark Nelson
2be9a4aecb MDL-64165 core_message: fixed contact requests web service structure 2018-11-22 14:51:59 +08:00
Mark Nelson
34b940f682 MDL-64165 core_message: removed unused params from WS helper method 2018-11-22 14:47:05 +08:00
Mihail Geshoski
30e89a5a9d MDL-64142 gradebook: Fix the left hand table column on scroll 2018-11-22 12:51:29 +08:00
Cory Buecker
c30a2c9903 MDL-62988 LTI provider: fix missing info. for LTI 2.X tool provider 
Fixes missing capabilities (user information) when membership service is called
from a LTI 2.X tool provider.
 2018-11-22 12:26:22 +08:00
Andrew Nicols
c746921e6e Merge branch 'MDL-64018_master' of git://github.com/markn86/moodle 2018-11-22 11:03:58 +08:00
Andrew Nicols
a0a365fe43 Merge branch 'MDL-64092-master' of git://github.com/peterRd/moodle 2018-11-22 10:16:23 +08:00
Jun Pataleta
9946d0a5bf Merge branch 'MDL-64119-master' of git://github.com/sarjona/moodle 2018-11-22 09:52:56 +08:00
Eloy Lafuente (stronk7)
a46a951e87 Merge branch 'MDL-63920-master' of git://github.com/damyon/moodle 2018-11-21 16:47:14 +01:00
Eloy Lafuente (stronk7)
9c8203cf14 Merge branch 'MDL-64129-master' of git://github.com/bmbrands/moodle 2018-11-21 16:18:56 +01:00
Eloy Lafuente (stronk7)
cbd6122e27 Merge branch 'MDL-64149-master' of git://github.com/sarjona/moodle 2018-11-21 16:14:42 +01:00
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