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,687 Commits 36 Branches 527 Tags
Commit Graph

91687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
c45d11de06 Merge branch 'MDL-64161-master' of git://github.com/abgreeve/moodle 2018-11-27 11:36:42 +08:00
Andrew Nicols
3bf11f7335 Merge branch 'MDL-64170-master-fix' of git://github.com/junpataleta/moodle 2018-11-27 11:07:13 +08:00
Jun Pataleta
d82cc9f297 MDL-64170 block_myoverview: Behat fix 2018-11-27 10:58:04 +08:00
Jun Pataleta
a75af1d053 Merge branch 'MDL-64099-master' of git://github.com/ryanwyllie/moodle 2018-11-27 10:53:04 +08:00
Ryan Wyllie
12d238100d MDL-64099 message: fix last message and date in group conversations 2018-11-27 10:51:39 +08:00
Bas Brands
99cbd6197a MDL-64099 message: correct dropdown container html 
in the bootstrapbase overridden template <ul> should
be used for the dropdown container
 2018-11-27 10:51:04 +08:00
Bas Brands
4631749c5a MDL-64099 message: Hide scrollbar on section collapsing 2018-11-27 10:51:04 +08:00
Bas Brands
347fb901a7 MDL-64099 message: Highlight the collapsible header on hover 2018-11-27 10:51:04 +08:00
Bas Brands
dfd6eec2b4 MDL-64099 message: Make collapsible headers bold 2018-11-27 10:51:04 +08:00
Bas Brands
986d1a20f6 MDL-64099 message: Move timestamps all the way to the right 2018-11-27 10:48:52 +08:00
Bas Brands
e2cf9af22d MDL-64099 message: conversation long sender names truncate 2018-11-27 10:48:52 +08:00
Bas Brands
2edfbf880a MDL-64099 message: Align group image to container top 2018-11-27 10:48:52 +08:00
Bas Brands
e677e0e53b MDL-64099 message: Replace badge with rectangular shape 2018-11-27 10:48:52 +08:00
Bas Brands
051c675fd2 MDL-64099 message: Add a border in between messages and contacts 2018-11-27 10:48:52 +08:00
Bas Brands
71b13a84a4 MDL-64099 message: Add sender name to conversation preview in overview 2018-11-27 10:48:52 +08:00
Ryan Wyllie
302586a5bc MDL-64099 message: Change icons for select and selected messages 2018-11-27 10:47:59 +08:00
Ryan Wyllie
41cc9fbb57 MDL-64099 message: move delete messages icon to the right 2018-11-27 10:47:59 +08:00
Ryan Wyllie
2809ab7b52 MDL-64099 message: Align the icons and avatar at the top of the header 2018-11-27 10:47:59 +08:00
Ryan Wyllie
c483a8eee7 MDL-64099 message: remove conversation name link underline 2018-11-27 10:47:59 +08:00
Ryan Wyllie
a009ce6014 MDL-64099 message: de-emphasize participant count in group conversation 2018-11-27 10:47:59 +08:00
Ryan Wyllie
a471607457 MDL-64099 message: increase margins between messages in conversations 2018-11-27 10:47:59 +08:00
Ryan Wyllie
af3cfc7729 MDL-64099 message: bold senders name in message 2018-11-27 10:47:59 +08:00
Andrew Nicols
999030766b Merge branch 'MDL-64139-master' of git://github.com/ryanwyllie/moodle 2018-11-27 09:17:18 +08:00
Jake Dallimore
e4088b7582 MDL-64047 core_message: test get_contact_requests() with blocked users 2018-11-27 08:55:35 +08:00
Jake Dallimore
e492a5540d MDL-64047 core_message: contact request count must exclude blocked users 2018-11-27 08:46:25 +08:00
Damyon Wiese
a2cb00b655 MDL-64181 javascript: Recursive template fix 
This change prevents template rendering from waiting for itself, but does
allow it to wait for another async call to render.
 2018-11-27 08:44:36 +08:00
Bas Brands
c8ff3ce496 MDL-63223 theme_boost: flexbox for login pagin footer 2018-11-26 16:06:30 +01:00
David Monllao
b14ad6e17d Merge branch 'MDL-64205-master-sarunconfirmeduser' of git://github.com/mudrd8mz/moodle 2018-11-26 15:42:26 +01:00
David Mudrák
87bb5954eb MDL-64205 privacy: Delete orphaned data request records on upgrade 
As a result of the bug, some requests can be orphaned - the linked user
record may not exist any more. This is a cleanup of such records.
 2018-11-26 14:17:04 +01:00
Tim Hunt
614077863b MDL-63459 qtype_calculatedmulti: fix incorrect hint object type 2018-11-26 12:52:09 +00:00
Tim Hunt
1e8374c370 MDL-63459 qtype_calculatedmulti: unit test should test this qtype 
This also demonstrates the bug to be fixed
 2018-11-26 12:49:47 +00:00
David Monllao
65c6723681 Merge branch 'MDL-64140-master' of https://github.com/snake/moodle 2018-11-26 13:27:24 +01:00
Ryan Wyllie
3528c86c12 MDL-64139 message: load conversation counts async 2018-11-26 14:36:35 +08:00
David Monllao
9f61908ccd MDL-64170 block_myoverview: Extend fix to aria label 2018-11-26 05:44:00 +01:00
David Monllao
5cd2cd385c Merge branch 'MDL-64170-master' of git://github.com/bmbrands/moodle 2018-11-26 05:43:02 +01:00
David Monllao
bb63b48bcb Merge branch 'MDL-64173-master' of git://github.com/bmbrands/moodle 2018-11-26 05:36:57 +01:00
David Monllao
4bcdf02c5f Merge branch 'MDL-64172-master' of git://github.com/bmbrands/moodle 2018-11-26 04:52:34 +01:00
Adrian Greeve
3e2b8b21c6 MDL-64161 gradereport_singleview: Behat test for out of bounds grade. 2018-11-26 11:44:26 +08:00
Adrian Greeve
f2462522f6 MDL-64161 gradereport_singleview: Stop updating grades with errors. 2018-11-26 11:44:26 +08:00
Jake Dallimore
36fabf72c0 MDL-64140 core_message: test unread counts with dataprovider in api 
The 3 methods used to test this function are superceded by the cases in
the dataprovider, so let's remove these and use the provider instead.
 2018-11-26 10:54:29 +08:00
Jake Dallimore
b402a163e3 MDL-64140 core_message: add get_unread_conversation_counts() web service 2018-11-26 10:54:18 +08:00
Mihail Geshoski
bde5947d13 MDL-64207 gradebook: Fix grader report misalignment 2018-11-26 10:43:25 +08:00
Andrew Nicols
8dbaf173b9 Merge branch 'MDL-64167-master-2' of https://github.com/snake/moodle 2018-11-26 09:07:38 +08:00
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