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

91475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AMOS bot
dce0a6dfb0 Automatically generated installer lang files 2018-11-13 00:07:31 +00:00
Andrew Nicols
951000c250 Merge branch 'master_MDL-63953' of https://github.com/danmarsden/moodle 2018-11-13 07:47:45 +08:00
David Monllao
06a0161ad1 Merge branch 'MDL-63729-master' of git://github.com/dpalou/moodle 2018-11-12 17:44:18 +01:00
David Monllao
e1266eaf4b MDL-63724 messaging: Prefix field with the table alias 2018-11-12 16:26:14 +01:00
Bas Brands
356bfb698f MDL-63663 core_my: prevent page jumps on load 
equal size loading placeholders
added list view and summary view placeholders for myoverview
 2018-11-12 15:44:37 +01:00
David Monllao
388628823e Merge branch 'MDL-63855-master' of git://github.com/bmbrands/moodle 2018-11-12 13:27:08 +01:00
Eloy Lafuente (stronk7)
49971e66f7 Merge branch 'MDL-63907-master' of git://github.com/cescobedo/moodle 2018-11-12 12:07:45 +01:00
Eloy Lafuente (stronk7)
610883c007 Merge branch 'MDL-63929-master' of git://github.com/jleyva/moodle 2018-11-12 12:02:51 +01:00
David Monllao
754ff36d1d Merge branch 'MDL-63925-master' of git://github.com/mickhawkins/moodle 2018-11-12 11:57:42 +01:00
David Monllao
f04e51cfca Merge branch 'MDL-63940-master-recaptchaurl' of git://github.com/mudrd8mz/moodle 2018-11-12 10:42:36 +01:00
Sara Arjona
d9552c3c33 MDL-63901 core_message: Fix error when the conversation does not exist 
Create a conversation instead of throwing an exception to get the
behaviour working as it was before.
The string lang 'conversationdoesntexist' can be removed because
it was added in MDL-63466 and it's not used anywhere more.
 2018-11-12 10:15:59 +01:00
David Monllao
c83676101f Merge branch 'MDL-63823-master' of git://github.com/lameze/moodle 2018-11-12 10:09:33 +01:00
Bas Brands
a6501e9694 MDL-63855 core_my: no vertical scroll card blocks 
card desks using class .dashboard-card-deck.one-row should not
show a vertical scrollbar
 2018-11-12 10:03:34 +01:00
David Monllao
623995e589 Merge branch 'MDL-63968-master' of git://github.com/andrewnicols/moodle 2018-11-12 10:02:17 +01:00
Damyon Wiese
eac24f2b71 Merge branch 'MDL-63945_master' of git://github.com/markn86/moodle 2018-11-12 16:36:57 +08:00
Damyon Wiese
160e77f9d0 MDL-63716 course: less user_accesstime_log() calls 
We should only call this function when a user actually views a course. It is not called
automatically when a course context is validated from a webservice. It is called directly
from the core_course_view_course webservice.
 2018-11-12 16:11:15 +08:00
Bas Brands
c412ddc829 MDL-63923: core_my: card sizes clean and boost 
Cards should have a minimum size of 250px wide
 2018-11-12 09:04:56 +01:00
Mark Nelson
d15c1e77b0 MDL-63945 core_message: fixed discrepancy between helpers 2018-11-12 15:30:30 +08:00
Damyon Wiese
b0f45a8b8f Merge branch 'MDL-63724-master-3' of https://github.com/snake/moodle 2018-11-12 14:16:31 +08:00
Damyon Wiese
75e6661940 Merge branch 'MDL-63909_master' of git://github.com/markn86/moodle 2018-11-12 14:01:01 +08:00
Damyon Wiese
6cfba4a1c6 MDL-63864 message: Contact request fix 
The contactrequestid was removed from the api, so now we search by both
the userid from and the userid to.
 2018-11-12 13:38:33 +08:00
Andrew Nicols
6d0a43deb9 Merge branch 'MDL-63763-master' of https://github.com/nwp90/moodle 2018-11-12 10:32:32 +08:00
Andrew Nicols
e926b4d046 MDL-63968 message: Correct use of get_in_or_equal 2018-11-12 10:32:06 +08:00
Jake Dallimore
2553e9db8e MDL-63724 core_message: add send_messages_to_conversation() web service 2018-11-12 10:09:27 +08:00
Jake Dallimore
86e274d929 MDL-63724 core_message: move message redirection into helper function 2018-11-12 10:09:27 +08:00
Jake Dallimore
52f9cf205e MDL-63724 core_message: add send_message_to_conversation() to api 2018-11-12 10:09:27 +08:00
Jake Dallimore
b30f4d6d58 MDL-63724 core_message: buffering support for conv messages in manager 
We need to be able to delay calling all member processors with localised
event data if a DB transaction is taking place. This code treats a
conversation message as a single item of work to be buffered, and stores
all localised eventdata, and processorlists for later reference. When
processing the buffer, we pass off all localised eventdata items to
their respective member's processors, before firing a single event.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
0eddf920be MDL-63724 core_message: add conversation support to message_send() 
Added a test confirming that processors are called for each member
and that a single event is fired.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
9581bc3c00 MDL-63724 core_message: add send_message_to_conversation() to manager 2018-11-12 10:09:27 +08:00
Jake Dallimore
aa083ab95f MDL-63724 core_message: add new group_message_sent event 2018-11-12 10:09:27 +08:00
Jake Dallimore
947d32895e MDL-63724 core_message: split up event and processor code in the manager 
This was couple before, but we're going to want this to be separate for
group conversation messages, where we'll call many users' processors,
but only create a single 'group_message_sent' event.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
9f82758c01 MDL-63724 core_message: fix method signature for can_contact_user() 
This method required objects, but only used their ids, so has been
changed to require only ids.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
8e3bf150d9 MDL-63724 core_message: add can_send_message_to_conversation() to api 2018-11-12 10:09:27 +08:00
Damyon Wiese
080cc5b671 Merge branch 'MDL-63864_master' of git://github.com/markn86/moodle 2018-11-12 10:02:25 +08:00
Andrew Nicols
fa54c160f9 Merge branch 'MDL-63838-master' of git://github.com/vmdef/moodle 2018-11-12 09:54:59 +08:00
Simey Lameze
2d18a4a89f MDL-63823 tool_lpimportcsv: supress progress bar debugging 2018-11-12 09:53:07 +08:00
Andrew Nicols
e2a8ebddb5 Merge branch 'MDL-63850_master' of git://github.com/markn86/moodle 2018-11-12 07:53:09 +08:00
Dan Marsden
93bddb2734 MDL-63953 mod_scorm: Use correct value for first attempt. 2018-11-12 09:51:15 +13:00
Eloy Lafuente (stronk7)
208950cff0 on-demand release 3.6dev+ 2018-11-10 12:53:31 +01:00
Eloy Lafuente (stronk7)
3b1e59e3e1 NOBUG: Fixed SVG browser compatibility 2018-11-10 12:53:29 +01:00
Eloy Lafuente (stronk7)
42155e2501 Merge branch 'MDL-63960-master' of git://github.com/andrewnicols/moodle 2018-11-10 10:27:35 +01:00
Andrew Nicols
c083d1ad1e MDL-63960 dataprivacy: Do not perform strict type checks for id 
When inherit is specified in the data registry it is stored as a
string and we cannot perform a strict comparison with it.

We should still compare strict comparison checks against null, or false,
but not for the NOTSET (0) or INHERIT values (-1).
 2018-11-10 15:34:21 +08:00
Andrew Nicols
35afa11801 Merge branch 'MDL-63919' of git://github.com/stronk7/moodle 2018-11-10 10:59:25 +08:00
Eloy Lafuente (stronk7)
d01d9e2c0e Merge branch 'MDL-63596-master' of git://github.com/andrewnicols/moodle 2018-11-10 03:49:14 +01:00
Andrew Nicols
2986a99153 MDL-63596 backup: Add missing include 2018-11-10 10:46:38 +08:00
Eloy Lafuente (stronk7)
baf3fd4177 MDL-63919 tool_dataprivacy: admin & notify fixes 
This includes the following:

1) Replace $ADMIN->id by get_admin()->id. The former doesn't exist.
2) Only change the notify parameter when it has not been specified
   at creation time (null). If specified, observe it.
3) Set the current user in tests to admin, able to create those
   requests.
 2018-11-10 02:22:12 +01:00
Eloy Lafuente (stronk7)
5c0f8dcddf Merge branch 'MDL-63596-master' of git://github.com/andrewnicols/moodle 2018-11-09 19:32:23 +01:00
dpalou
5bb1889f43 MDL-63729 badges: Return new DB tables data in WS 2018-11-09 12:39:53 +01:00
dpalou
18d27ac2eb MDL-63729 badges: Return new fields in badge table in WS 2018-11-09 12:11:04 +01:00
dpalou
c776e1dd40 MDL-63729 badges: Create an exporter for badge info 2018-11-09 12:09:45 +01:00