moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 18:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77418 commits 37 branches 544 tags 1.3 GiB
Commit graph

77418 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
d3c65e8c60 Merge branch 'MDL-53207' of https://github.com/dg711/moodle 2016-03-21 09:31:07 +08:00
David Monllao
b756bd551a Merge branch 'MDL-52924-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2016-03-21 09:25:19 +08:00
Dan Poltawski
52c6e158e0 Merge branch 'MDL-53548-master' of https://github.com/sammarshallou/moodle 2016-03-21 09:20:33 +08:00
Dan Poltawski
ef67e6c5f8 Merge branch 'MDL-53412-master' of git://github.com/merrill-oakland/moodle 2016-03-21 08:57:22 +08:00
David Monllao
7960ad0571 Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle 2016-03-21 08:42:58 +08:00
David Monllao
e787e681fc Merge branch 'MDL-49934-master' of git://github.com/jleyva/moodle 2016-03-21 08:39:15 +08:00
dg711
c55494fef7 MDL-53207 message: display stock pic for msg from\to unreal user 2016-03-19 23:36:41 +05:30
sam marshall
f3474e2216 MDL-53548 Accessibility: Block show/hide keyboard access broken 2016-03-18 13:44:50 +00:00
Eloy Lafuente (stronk7)
fed66ad9e2 weekly release 3.1dev 2016-03-17 14:00:25 +01:00
Eloy Lafuente (stronk7)
9ea396b8bd Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-03-17 14:00:20 +01:00
David Monllao
8454494abc Merge branch 'm31_MDL-48680_Add_Score_Status_Events' of git://github.com/scara/moodle 2016-03-17 16:34:44 +08:00
Eric Merrill
5dc4624ced MDL-53412 search: Correctly handle Solr over SSL 2016-03-17 01:13:15 -04:00
David Monllao
5a3ddfd2e2 Merge branch 'wip-mdl-46891-m' of git://github.com/rajeshtaneja/moodle 2016-03-17 12:45:47 +08:00
Rajesh Taneja
8c66773dac MDL-46891 behat: Allow replacing string in profile for parallel run 
Adding a replace with run process in profile
should be allowed
 2016-03-17 12:20:22 +08:00
Dan Poltawski
922c611ff4 Merge branch 'MDL-51374_multiple-connections' of git://github.com/dmonllao/moodle 2016-03-17 10:50:06 +08:00
Dan Poltawski
6f1cd967b5 Revert "MDL-52133 mod_assign: Pass userid param when saving grade" 
This reverts commit b2b4f7c485.
 2016-03-17 09:31:08 +08:00
Andrew Nicols
48a9ef9e96 MDL-53509 mod_forum: Stop over-escaping quoted variables 
{{# quote }}<a href=\"foo\">{{/ quote }}

becomes:

    "<a href=\\"foo\\">"

This causes a mustache syntax error.

The quote helper negates the need to escape quotes in normal use, e.g.:

    {{# quote }}<a href="foo">{{/ quote }}

which instead becomes:

    "<a href=\"foo\">"
 2016-03-17 08:33:48 +08:00
Matteo Scaramuccia
beafa1c376 MDL-48680 mod_scorm: Fixed the missing keys when updating a record. 
Thanks to Rajesh Taneja for his testing.
 2016-03-16 23:39:16 +01:00
Juan Leyva
bdf1ac2796 MDL-52924 mod_assign: New WS mod_assign_get_submission_status 2016-03-16 17:23:20 +01:00
Juan Leyva
3216f6160b MDL-52924 mod_assign: Move renderables creation to methods 2016-03-16 17:23:19 +01:00
David Monllao
a696bb9ebd MDL-51374 dml: Identifying the cache with connection data 2016-03-16 17:17:39 +08:00
David Monllao
94ffadcdcd Merge branch 'MDL-52788-master' of git://github.com/jleyva/moodle 2016-03-16 14:47:07 +08:00
Andrew Nicols
3e9cf4f941 Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle 2016-03-16 13:53:57 +08:00
David Monllao
f18561a2e2 MDL-51374 dml: simpledata to temp_tables cache 2016-03-16 13:43:36 +08:00
John Okely
a7be136f20 MDL-52821 lti: Remove summary from unit test 2016-03-16 13:24:22 +08:00
Andrew Nicols
0758e02e84 Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle 2016-03-16 12:23:41 +08:00
Eric Merrill
0aa3fedb23 MDL-53354 search: Fix unit test call to commit 2016-03-16 12:07:44 +08:00
John Okely
2a5bb939c2 MDL-52821 lti: Change tool_consumer_instance_description to site fullname 
And change tool_consumer_instance_name to site shortname
 2016-03-16 12:04:09 +08:00
Andrew Nicols
83fc2cbd0d MDL-52574 core: Remove ASC/DESC when adding params from sort 2016-03-16 10:58:04 +08:00
David Monllao
ad90c7a5d5 MDL-51374 dml: Delete selectively instead of purge for tmptables 2016-03-16 10:48:41 +08:00
David Monllao
ef474575e1 Merge branch 'MDL-51374-master-new' of git://github.com/lameze/moodle 
Conflicts:
	lib/db/caches.php
 2016-03-16 10:13:14 +08:00
David Monllao
5162ffec0d Merge branch 'wip-MDL-52869-master' of https://github.com/marinaglancy/moodle 2016-03-16 10:05:52 +08:00
Andrew Nicols
0eb474ec49 Merge branch 'MDL-51828-master' of git://github.com/FMCorz/moodle 2016-03-16 10:03:12 +08:00
David Monllao
4235b98110 Merge branch 'wip-MDL-53026-master' of https://github.com/marinaglancy/moodle 2016-03-16 10:00:28 +08:00
Frederic Massart
e357d799cd MDL-51828 repository_wikimedia: Always use PNG for SVG files 2016-03-16 09:52:09 +08:00
Eloy Lafuente (stronk7)
3edc162611 Merge branch 'MDL-53354-master' of git://github.com/merrill-oakland/moodle 2016-03-16 01:09:45 +01:00
Andrew Nicols
c7f04791f3 MDL-52386 auth_ldap: Typo fix for suspended user 2016-03-16 08:03:05 +08:00
Andrew Nicols
baa536188b Merge branch 'MDL-52386-master' of git://github.com/cameron1729/moodle 2016-03-16 07:50:10 +08:00
Eloy Lafuente (stronk7)
987226c090 Merge branch 'MDL-53139' of https://github.com/dg711/moodle 2016-03-16 00:12:18 +01:00
Eloy Lafuente (stronk7)
1e60d7e482 Merge branch 'MDL-53430-master' of git://github.com/merrill-oakland/moodle 2016-03-16 00:03:31 +01:00
Eloy Lafuente (stronk7)
1d57167f15 Merge branch 'mdl-53133-master' of git://github.com/deraadt/moodle 2016-03-15 23:52:19 +01:00
Dan Poltawski
4539892cda MDL-53149 mod_data: update backup and webservices for timemodified 
Amended to add support for standard restore apply_date_offset().
 2016-03-15 23:41:55 +01:00
Dan Poltawski
b174e9efa6 MDL-53149 mod_data: add timemodified field to db schema 2016-03-15 23:31:32 +01:00
Eloy Lafuente (stronk7)
e44c0acf01 Merge branch 'MDL-53323' of https://github.com/mr-russ/moodle 2016-03-15 19:43:26 +01:00
AMOS bot
d376282647 Automatically generated installer lang files 2016-03-16 00:04:06 +08:00
Marina Glancy
f59f89b4a8 MDL-52869 course: use inplace_editable for activity names 2016-03-15 17:19:38 +08:00
Andrew Nicols
37f9c6a2d6 Merge branch 'MDL-53301_master' of git://github.com/dmonllao/moodle 2016-03-15 15:50:15 +08:00
David Monllao
8ea783f315 Merge branch 'MDL-53057-master' of git://github.com/FMCorz/moodle 2016-03-15 15:19:01 +08:00
David Monllao
016208776f Merge branch 'MDL-53179' of https://github.com/andrewhancox/moodle 2016-03-15 15:07:46 +08:00
David Monllao
858ad11363 MDL-48680 scorm: Marking cmielement_submitted as abstract 2016-03-15 15:01:57 +08:00