mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
77,695 Commits 36 Branches 519 Tags
Commit Graph

17720 Commits

Author SHA1 Message Date
David Monllao
8c16f34c88 Merge branch 'wip-MDL-53227-master' of git://github.com/marinaglancy/moodle 2016-03-22 13:00:30 +08:00
Eloy Lafuente (stronk7)
55e90f2270 Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle 2016-03-22 03:16:51 +01:00
Eloy Lafuente (stronk7)
675c6d4b54 Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle 2016-03-22 00:45:48 +01:00
Eloy Lafuente (stronk7)
8eb8e5df83 Merge branch 'MDL-48307-master' of git://github.com/marinaglancy/moodle 2016-03-22 00:28:02 +01:00
Tim Hunt
0c8a90d7cb MDL-53507 quiz editing: was possible to lose questions 
If you dragged a question to the top of the quiz, it could
disappear. Several other cases of dragging questions to the
same place in sequence, but to a different page/section were
also failing, and have been fixed.
 2016-03-21 23:14:53 +00:00
Eloy Lafuente (stronk7)
b1871ae68b MDL-53034 mod_quiz: version mini-bump 2016-03-21 23:01:46 +01:00
Eloy Lafuente (stronk7)
5032fb4f54 Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle 2016-03-21 22:58:28 +01:00
Eloy Lafuente (stronk7)
3720f100ea Merge branch 'MDL-52888-master' of git://github.com/jleyva/moodle 2016-03-21 22:40:43 +01:00
Eloy Lafuente (stronk7)
7cc45b2e72 Merge branch 'MDL-52868-master' of git://github.com/jleyva/moodle 2016-03-21 22:20:00 +01:00
Dan Poltawski
26f59e5080 Merge branch 'MDL-52863-master' of git://github.com/jleyva/moodle 2016-03-21 17:42:19 +08:00
Dan Poltawski
f6a0594e7e Merge branch 'MDL-52852-master' of git://github.com/jleyva/moodle 2016-03-21 17:27:20 +08:00
Dan Poltawski
121b46e033 Merge branch 'MDL-52830-master' of git://github.com/jleyva/moodle 2016-03-21 17:09:15 +08:00
Dan Poltawski
00a6c59936 MDL-52813 mod_quiz: bump version 
Diverge from stable branching
 2016-03-21 17:05:05 +08:00
Brendan Heywood
318e5cb302 MDL-53562 forum: Fixed missing forum subject Re: prefix 2016-03-21 19:41:40 +11:00
Dan Poltawski
2569face4e Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle 2016-03-21 16:37:57 +08:00
Willem Roes
96f56b6e29 MDL-52646 mod_scorm: fix missing launch_data for SCORM 2004 2016-03-21 09:00:50 +01:00
Cameron Ball
3e3f624549 MDL-53393 libraries: Upgrade Html2Text to 4.0.1 2016-03-21 12:05:33 +08:00
Dan Poltawski
ac3d7aacfc Merge branch 'MDL-53489' of git://github.com/timhunt/moodle 2016-03-21 11:02:03 +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
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
Juan Leyva
48abca7996 MDL-53034 mod_quiz: New WS mod_quiz_get_quiz_feedback_for_grade 2016-03-18 09:56:31 +01:00
Juan Leyva
3e5c19a0ed MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt_review 2016-03-18 09:50:06 +01:00
Juan Leyva
d9ef6ae0c2 MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt_summary 2016-03-18 09:49:29 +01:00
Juan Leyva
899983ee58 MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt 2016-03-18 09:27:43 +01:00
Marina Glancy
372a92a7dc MDL-50941 mod_feedback: change default legnth for shorttext to 255 2016-03-18 08:18:54 +08:00
Marina Glancy
5e9b2eda3c MDL-45274 mod_feedback: show heading on non-respondents page 2016-03-18 07:56:50 +08:00
Marina Glancy
4832a0b3dd MDL-53227 mod_feedback: merge files complete_guest.php and complete.php 
Simplify access check, add behat tests
 2016-03-18 07:54:59 +08:00
Juan Leyva
3589b6591a MDL-52868 mod_quiz: New Web Service mod_quiz_get_attempt_review 2016-03-17 17:15:52 +01:00
Juan Leyva
98e6869088 MDL-52863 mod_quiz: New Web Service mod_quiz_process_attempt 2016-03-17 16:49:40 +01:00
Juan Leyva
4911b5b254 MDL-52863 mod_quiz: Move processattempt.php code to new API 2016-03-17 16:49:39 +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
Dan Poltawski
6f1cd967b5 Revert "MDL-52133 mod_assign: Pass userid param when saving grade" 
This reverts commit b2b4f7c4853d1e38e3f6248a98a66afc4b801f48.
 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
94ffadcdcd Merge branch 'MDL-52788-master' of git://github.com/jleyva/moodle 2016-03-16 14:47:07 +08:00
John Okely
a7be136f20 MDL-52821 lti: Remove summary from unit test 2016-03-16 13:24:22 +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
Eloy Lafuente (stronk7)
3edc162611 Merge branch 'MDL-53354-master' of git://github.com/merrill-oakland/moodle 2016-03-16 01:09:45 +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
Tim Hunt
7308acffa0 MDL-53489 quiz editing: fix display of long section headings 2016-03-15 18:35:35 +00: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
David Monllao
e022b79164 Merge branch 'm31_MDL-48680_Add_Score_Status_Events' of https://github.com/scara/moodle 2016-03-15 14:56:50 +08:00
Andrew Nicols
295ab83d2e Merge branch 'MDL-53351-master-lti-notice' of git://github.com/mudrd8mz/moodle 2016-03-15 12:48:06 +08:00
Juan Leyva
8e76a2fadb MDL-49934 assign: Allow admins, managers to use get_assignments ws 2016-03-14 10:09:54 +01:00