mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 05:52:51 +02:00
Code Issues Projects Releases Wiki Activity
91,465 Commits 36 Branches 527 Tags
Commit Graph

25209 Commits

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
f89055372e MDL-64018 core_message: deprecated get_contacts web service 2018-11-21 11:09:11 +08:00
Jun Pataleta
a7ca299373 Merge branch 'MDL-63663-master' of git://github.com/bmbrands/moodle 2018-11-20 11:59:29 +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
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
Damyon Wiese
a356db0db2 Merge branch 'MDL-63973-master' of https://github.com/snake/moodle 2018-11-19 16:28:13 +08:00
Damyon Wiese
365dce5fad Merge branch 'MDL-63696-master' of https://github.com/Dagefoerde/moodle 2018-11-19 14:51:46 +08:00
David Monllao
b46c7d5d9f Merge branch 'MDL-63768-master' of https://github.com/lucaboesch/moodle 2018-11-19 06:06:20 +01: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
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
ff85fe3e53 Merge branch 'MDL-63793-master' of git://github.com/peterRd/moodle 2018-11-19 09:57:50 +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
Luca Bösch
104cc0e3b1 MDL-63768 atto_link: dialog auto width. 2018-11-16 17:29:28 +01:00
Jan Dageförde
f11a7d6a05
MDL-63696 oauth2: Store system account access tokens in DB 2018-11-16 11:43:16 +01: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
Eloy Lafuente (stronk7)
75bedeafe4 Merge branch 'MDL-64012' of https://github.com/timhunt/moodle 2018-11-16 01:02:44 +01:00
Jun Pataleta
7a99ff70b9 Merge branch 'MDL-63811' of git://github.com/aolley/moodle 2018-11-15 17:09:28 +08:00
Ryan Wyllie
c75559cfff MDL-63303 message: move message drawer to end of <body> 
Fix some of the behat tests that are looking for generic button
names that match some of the buttons in the message drawer which
happen to appear earlier in the DOM.
 2018-11-15 14:43:22 +08:00
Ryan Wyllie
a111ab44af MDL-63303 message: fix bugs in message drawer part 2 
* Added missing icon mappings for font-awesome
* Fixed focus on dialogue button when it opens
* Fixed UI updates on user block / unblock
* Fix jQuery syntax error when sending message with quotes
* Fix message/index.php opening drawer when no conversation found
* Fix placeholders rendered for new requests
 2018-11-15 14:43:21 +08:00
Ryan Wyllie
f074d6f086 MDL-63303 message: remove behat tests for messaging 2018-11-15 14:43:21 +08:00
Ryan Wyllie
5005d8cfb4 MDL-63303 message: add message drawer (boost only) 2018-11-15 14:43:21 +08:00
Ryan Wyllie
b3bbd4a0e1 MDL-63303 message: fix get_conversations external func 2018-11-15 14:40:12 +08:00
Ryan Wyllie
569c0bae9c MDL-63303 message: add get_conversation_between_users external func 2018-11-15 14:40:12 +08:00
Ryan Wyllie
4e3130269c MDL-63303 message: add get_conversation to message api 2018-11-15 14:40:12 +08:00
Ryan Wyllie
8350978aa1 MDL-63303 message: add get_member_info external function 2018-11-15 14:40:12 +08:00
Ryan Wyllie
9e189a914d MDL-63303 core_favourites: add get and count functions 2018-11-15 14:40:11 +08:00
Ryan Wyllie
7b91dcf264 MDL-63303 core: add new icons for messaging 2018-11-15 14:40:11 +08:00
Ryan Wyllie
456e6d8145 MDL-63303 core: allow subsystems to add nav bar and top of body content 2018-11-15 14:40:11 +08:00
Ryan Wyllie
c912cd7324 MDL-63303 core: add debug info to exceptions 2018-11-15 14:40:11 +08:00
Ryan Wyllie
9d199fd2e7 MDL-63303 javascript: fix bug in auto_rows.js allowing it to shrink 2018-11-15 14:40:11 +08:00
Damyon Wiese
02c4de86ea Merge branch 'MDL-63283-master-2' of https://github.com/snake/moodle 2018-11-15 10:43:03 +08:00
Jake Dallimore
267b4f03e7 MDL-63283 core_message: skip processors in non-individual conversations 
Disable the processor for messages being sent to conversation types
other than individual.
 2018-11-15 10:37:33 +08:00
Andrew Nicols
46b9a5c49c MDL-53566 core: Make context freeze test compat with clean 2018-11-15 07:39:23 +08:00
Tim Hunt
0f98afefdf MDL-64012 filters: activity name autolinking fails for names with () 2018-11-14 16:04:31 +00:00
David Monllao
f2d83f50e1 Merge branch 'MDL-61990' of https://github.com/timhunt/moodle 2018-11-14 12:09:34 +01:00
Damyon Wiese
89ffc1ee0e Merge branch 'MDL-53566-master' of git://github.com/andrewnicols/moodle 2018-11-14 15:04:01 +08:00
Andrew Nicols
9d76566ffc MDL-53566 core: Rename locking to freezing in UI 2018-11-14 12:37:56 +08:00
Eloy Lafuente (stronk7)
b4c33348ff MDL-53566 core: add back upgrade code removed @ 0616f04 by mistake 2018-11-14 01:04:46 +01:00
Eloy Lafuente (stronk7)
d27e49448f Merge branch 'MDL-53566-master' of git://github.com/andrewnicols/moodle 2018-11-13 23:55:38 +01:00
Tim Hunt
166c43d86c MDL-61990 outputrequirementslib: improve debug message 2018-11-13 17:11:17 +00:00
Andrew Nicols
bb41db9ce0 MDL-53566 core: Allow admins more control over locking 
This change allows sites to configure locking such that it does not
apply to administrators at all.
 2018-11-13 21:17:40 +08:00
Andrew Nicols
6a89b6c8f0 MDL-53566 core: Move managecontextlocking to module 
This will allow the capability to be applied at a range of contexts and
not just the system, making the system much more definable to a range of
users.
 2018-11-13 21:17:40 +08:00
Andrew Nicols
56db1a2d7c MDL-53566 core: Remove unused ancestorlocked field 
This was originalyl intended as a performance improvement, but the
parent is already stored, and once calculated the value of locked is
already returned.
 2018-11-13 21:17:40 +08:00
Andrew Nicols
0333213585 MDL-53566 core: Add behat test for context loking 2018-11-13 21:17:40 +08:00
Andrew Nicols
3a8cf5e67d MDL-53566 core: Add UI for context locking 2018-11-13 21:17:40 +08:00
Andrew Nicols
0616f045c3 MDL-53566 core: Add support for context locking 
This chagne adds support for a new feature known as Context Locking.
This allows a context to be locked, thereby removing all write
capabilities for all users (including admin) for that context, and all
child contexts.
 2018-11-13 21:17:40 +08:00
Andrew Nicols
ba20486ffe Merge branch 'MDL-63716-master' of git://github.com/damyon/moodle 2018-11-13 11:20:54 +08:00
David Monllao
e1266eaf4b MDL-63724 messaging: Prefix field with the table alias 2018-11-12 16:26:14 +01:00