mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 19:42:56 +01:00
Code Issues Projects Releases Wiki Activity
91,641 Commits 36 Branches 527 Tags
Commit Graph

91641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Nicols
237786f159 Merge branch 'MDL-63913-master' of https://github.com/snake/moodle 2018-11-19 14:59:39 +08:00
Ryan Wyllie
08ae9a7362 MDL-64054 message: add all processors to message settings 
Changed the settings page in the message drawer to display all message
notification processors (e.g. email, mobile, jabber) for the user to
configure based on which processors are enabled on the site.
 2018-11-19 14:53:38 +08:00
Peter
2044a53946 MDL-63817 block_timeline: Persist page limits when sorting by dates 
* Included privacy provider for new pref with unit test
* JS changes
 2018-11-19 14:52:56 +08:00
Damyon Wiese
365dce5fad Merge branch 'MDL-63696-master' of https://github.com/Dagefoerde/moodle 2018-11-19 14:51:46 +08:00
Jake Dallimore
da714be155 MDL-64058 core_message: add unread counts to the conversations view 2018-11-19 13:55:18 +08:00
Jake Dallimore
a54115355a MDL-63913 core_message: fix to ensure favourites is exclusive 
If a conversation is included in the favourites unread count, it
cannot be included in any other type-based counts.
 2018-11-19 13:51:40 +08:00
David Monllao
b46c7d5d9f Merge branch 'MDL-63768-master' of https://github.com/lucaboesch/moodle 2018-11-19 06:06:20 +01:00
Jun Pataleta
8699a985bc Merge branch 'MDL-64034-master' of https://github.com/snake/moodle 2018-11-19 12:59:22 +08:00
Andrew Nicols
18b947671b Merge branch 'MDL-63969-master-4' of git://github.com/mihailges/moodle 2018-11-19 12:27:37 +08:00
Andrew Nicols
8cba8d1a58 MDL-64049 core: Cache prefs for current user 
We were already caching these preferences when a user object is provided
to get_user_preferences, or when $USER is provided.

This changee swaps get_user_preferences to use the global USER object
when the USER->id matches the userid supplied to the function.
 2018-11-19 11:23:59 +08:00
Jake Dallimore
810da68e14 MDL-63973 core_badges: exclude related badges when adding related badges 
The form which allows a user to add related badges should exclude any
related badges, regardless of the direction of the relationship.
 2018-11-19 11:19:12 +08:00
Jake Dallimore
c660772600 MDL-63973 core_badges: fix related badges count in the badges tabs 
If A is related to B, this should show a 1 count for either A or B.
 2018-11-19 11:10:14 +08:00
Jake Dallimore
1dee827c39 MDL-63973 core_badges: related badges query now works both ways 
If A is related to B, then we should be able to view this relationship
from both badge A and badge B. The following badge methods were updated:
- get_related_badges()
- has_related()
- delete_related_badge()
 2018-11-19 11:08:00 +08:00
Andrew Nicols
de79a81f5b Merge branch 'MDL-63468-master-v1' of git://github.com/lameze/moodle 2018-11-19 10:33:23 +08:00
Jake Dallimore
d2708759d8 MDL-64034 core_message: return conversationid in search_messages() 2018-11-19 10:23:15 +08:00
Simey Lameze
62b6e6f20d MDL-63468 mod_quiz: fix stats report visual style 2018-11-19 10:16:16 +08:00
Andrew Nicols
ff85fe3e53 Merge branch 'MDL-63793-master' of git://github.com/peterRd/moodle 2018-11-19 09:57:50 +08:00
Andrew Nicols
73fda8faeb Merge branch 'MDL-63913-master' of https://github.com/snake/moodle 2018-11-19 09:56:48 +08:00
Jake Dallimore
33022ee1d5 MDL-63913 core_message: add method to get unread conversation counts 2018-11-19 09:48:58 +08:00
Peter
11988d74b4 MDL-63793 block_myoverview: Persist the user's paging limit preference 
* providers for paging preferences
* Moved the user pref persistence to the factory
* Added client defined namespace in config
* Define custom client events in the client instead of passing to the
  factory
 2018-11-19 09:43:00 +08:00
Eloy Lafuente (stronk7)
01acb1ea90 Moodle release 3.6beta v3.6.0-beta 2018-11-18 12:38:48 +01:00
Jun Pataleta
9d10c33989 Merge branch 'MDL-64066' of git://github.com/stronk7/moodle 2018-11-18 01:02:24 +08:00
Eloy Lafuente (stronk7)
85ad2e6dff MDL-64066 behat: increase data export sizes, we were hitting them 
With MDL-63660 we changed to a bundled moodle.css approach, that
made dowloaded exports size to increase. Although the expected
sizes already were raised in the issue, it seems that some of
them were not enough, so increasing a little bit more.

Side note, we have MDL-63399 about to try to change these tests...
 2018-11-17 12:41:26 +01:00
Eloy Lafuente (stronk7)
6905c1c3fe MDL-64066 behat: more fixes to dialog names, old "add" steps 2018-11-17 12:10:37 +01:00
Eloy Lafuente (stronk7)
1a82729734 MDL-64066 behat: fix missing quote preventing jobs to complete 2018-11-17 00:16:18 +01:00
Luca Bösch
104cc0e3b1 MDL-63768 atto_link: dialog auto width. 2018-11-16 17:29:28 +01:00
Luca Bösch
2e477f03cc MDL-63487 badges: Style "◀ Award badge" and "Revoke badge ▶" buttons 2018-11-16 17:29:17 +01:00
Juan Leyva
904c37c6c8 MDL-63394 mod_quiz: Do not fail overdue if there is a grace period 2018-11-16 16:56:40 +01:00
Juan Leyva
a28c222e63 MDL-64060 message: Use error string identifier instead full message 
The conversationdoesntexist string does not exists but it is better to use an error string catchable by an external client.
 2018-11-16 13:20:11 +01:00
Eloy Lafuente (stronk7)
8907290a46 on-demand release 3.6dev+ 2018-11-16 12:03:18 +01:00
Eloy Lafuente (stronk7)
303d597523 NOBUG: Fixed SVG browser compatibility 2018-11-16 12:03:16 +01:00
Jan Dageförde
f11a7d6a05
MDL-63696 oauth2: Store system account access tokens in DB 2018-11-16 11:43:16 +01:00
Jun Pataleta
bf3c9536ac Merge branch 'MDL-63999-master' of git://github.com/lameze/moodle 2018-11-16 14:36:14 +08:00
Andrew Nicols
e151cbd971 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-16 14:15:16 +08:00
Ryan Wyllie
d3d95d5dc2 MDL-63303 message: fix bugs in message drawer part 4 
* Add clarification to delete messages lang strings
* Stop message polling when sending a message to fix UI bug
* Publish update last message event when polling finds more messages
* Remove logged in user from group conversation participants list
* Use user object to fetch user preferences to reduce DB calls
* Remove animated slide transitions because the browser breaks when
  showing some conversations
 2018-11-16 14:10:10 +08:00
Simey Lameze
b8c0534515 MDL-63999 calendar: double escape event name on templates 2018-11-16 13:56:54 +08:00
Mihail Geshoski
329f1f23ff MDL-63969 core_course: Store favourite courses in the course context 
The course favourites were previously set in the system context which
is not right as they should be stored in the course context.
 2018-11-16 12:20:17 +08:00
Mihail Geshoski
214696b04f MDL-63969 core_course: Update course privacy provider unit tests 2018-11-16 12:19:46 +08:00
Mihail Geshoski
4f8c9232f1 MDL-63969 core_course: Include core_favourites subsystem in provider 2018-11-16 12:18:58 +08:00