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

91451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jun Pataleta
1cc37dc523 Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle 2018-11-20 11:20:23 +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
Andrew Nicols
237786f159 Merge branch 'MDL-63913-master' of https://github.com/snake/moodle 2018-11-19 14:59:39 +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