Commit graph

16731 commits

Author SHA1 Message Date
Dan Poltawski
a7ef012dc4 Merge branch 'wip-mdl-48096' of https://github.com/rajeshtaneja/moodle 2015-03-31 08:57:59 +01:00
Rajesh Taneja
4df12b9372 MDL-48096 scorm: Include section number in cm 2015-03-31 15:51:47 +08:00
David Monllao
bdece5fc27 Merge branch 'MDL-49474' of git://github.com/jmvedrine/moodle 2015-03-31 10:14:45 +08:00
David Monllao
b51ff393cd Merge branch 'MDL-6340' of git://github.com/timhunt/moodle 2015-03-31 08:44:01 +08:00
Andrew Nicols
73edc9b12e Merge branch 'master_MDL-46805' of https://github.com/danmarsden/moodle 2015-03-31 08:15:23 +08:00
Dan Marsden
ef88aa2938 MDL-46805 SCORM: AICC restricts allowed characters in the username 2015-03-31 10:38:16 +13:00
Matteo Scaramuccia
97cc12349e MDL-43818 SCORM: unable to download the Package via URL. 2015-03-30 20:37:02 +02:00
Dan Poltawski
1ca32101fe Merge branch 'MDL-18966' of git://github.com/jmvedrine/moodle 2015-03-30 15:03:10 +01:00
Dan Poltawski
a29c948c0d Merge branch 'master_MDL-48096' of git://github.com/danmarsden/moodle 2015-03-30 13:48:35 +01:00
Eloy Lafuente (stronk7)
862ce9fdee Merge branch 'wip-mdl-49708' of https://github.com/rajeshtaneja/moodle 2015-03-30 13:27:03 +02:00
Jean-Michel Vedrine
c7d1a37bdb MDL-18966 mod_lesson: Save attempts of practice lessons 2015-03-30 12:58:17 +02:00
Dan Poltawski
38b3dc4bb1 Merge branch 'MDL-25721_master' of git://github.com/markn86/moodle 2015-03-30 10:50:44 +01:00
Rajesh Taneja
bf38226162 MDL-49708 behat: Resize window back to default
Leaving window size to large fails in chrome
Reset it to default size works to ensure stamp
is visible by selenium driver
2015-03-30 17:29:33 +08:00
Rajesh Taneja
c71512d8b8 MDL-49708 behat: Fix chromedriver failure
Chromedriver tries to click in center of link
As these links wrap on next line it fails to
click on links on small screen
2015-03-30 12:33:21 +08:00
David Monllao
06cf88f8c4 Merge branch 'mdl36506-master' of git://github.com/tlock/moodle 2015-03-30 10:31:44 +08:00
Jean-Michel Vedrine
7e0551fc45 MDL-48880 mod_lesson: clean lesson_branch when a page is deleted 2015-03-29 21:46:05 +02:00
Jean-Michel Vedrine
4948b68ffe MDL-49474 mod_lesson: intro and introformat missing from backup/restore 2015-03-29 21:33:18 +02:00
Jean-Michel Vedrine
e8a434b373 MDL-26689 mod_lesson: deprecate lesson dependency 2015-03-27 20:38:03 +01:00
Juan Leyva
ebfa74c799 MDL-49502 forum: Unit tests for forum_view 2015-03-27 11:33:35 +01:00
Juan Leyva
449a6304d4 MDL-49502 forum: Add the new function to the mobile service 2015-03-27 11:33:34 +01:00
Juan Leyva
4a1e44a155 MDL-49502 forum: New external function view_forum 2015-03-27 11:33:34 +01:00
Mark Nelson
810920b15d MDL-25721 core_question: added ability to order questions by dates 2015-03-26 16:21:27 -07:00
Juan Leyva
51c378b116 MDL-49502 forum: New API function forum_view 2015-03-26 21:21:10 +01:00
M Kassaei
1700bd4dea MDL-40992 quiz: let students to redo questions within an attempt 2015-03-26 17:46:47 +00:00
Tim Hunt
bb93fc24aa MDL-6340 quiz: avoid reusing random questions between attempts
There are several improvements over what we had before:

1. We track all the questions seen in the the student's previous
quiz attempts, so that when they start a new quiz attempt, they get
questions they have not seen before if possible.

2. When there are no more unseen questions, we start repeating, but
always taking from the questions with the fewest attempts so far.

3. A similar logic is applied with variants within one question.

There is lots of credit to go around here. Oleg Sychev's students Alex
Shkarupa, Sergei Bastrykin and Darya Beda all worked on this over
several years, helping to clarify the problem and shape the best
solution. In the end, their various attempts were rewritten into this
final patch by me.
2015-03-26 17:45:49 +00:00
Juan Leyva
0be81772f0 MDL-49617 webservices: Additional tests for the new function 2015-03-26 15:55:23 +01:00
Juan Leyva
4e2e3c9528 MDL-49617 webservices: Return additional fields in get_assignments WS 2015-03-26 15:55:22 +01:00
David Monllao
b7bfbfee2c MDL-49470 mod_lesson: Triggering just 1 event 2015-03-25 15:33:07 +08:00
Dan Poltawski
422c29d339 Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle 2015-03-24 15:12:24 +00:00
David Monllao
6f27fbb435 Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2015-03-24 17:55:42 +08:00
Juan Leyva
067b3fda6a MDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses 2015-03-24 10:46:36 +01:00
Juan Leyva
a090259eaa MDL-49337 webservices: Include the new WS in the mobile app service 2015-03-24 10:46:36 +01:00
Juan Leyva
5c438daad5 MDL-49337 webservices: mod_data services file definition 2015-03-24 10:46:35 +01:00
Juan Leyva
2ab3481990 MDL-49337 webservices: New WS mod_data_get_databases_by_courses 2015-03-24 10:46:35 +01:00
David Monllao
a2be9de182 Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle
Conflicts:
	mod/lesson/version.php
2015-03-24 13:25:26 +08:00
David Monllao
bedf3a0a39 MDL-49470 mod_lesson: Adding text space + unit test refinement 2015-03-24 11:59:05 +08:00
Stephen Bourget
14cdeb7ba9 MDL-49470 Lesson: Add page moved event
Conflicts:
	mod/lesson/version.php
2015-03-24 11:05:56 +08:00
Tim Lock
2a3e6f87da MDL-36506 mod_book: Skip legacy files migration if missing a CM record 2015-03-24 12:45:51 +10:30
Eloy Lafuente (stronk7)
6ae45106fc Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle 2015-03-24 01:51:44 +01:00
Eloy Lafuente (stronk7)
20e955a18e Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle 2015-03-24 01:38:15 +01:00
Eloy Lafuente (stronk7)
e448df5ec9 Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle 2015-03-24 00:39:12 +01:00
Eloy Lafuente (stronk7)
0b8cb023c1 Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle 2015-03-24 00:30:16 +01:00
Dan Marsden
7a0d8e725c MDL-48096 scorm: Make exit activity link return to correct section 2015-03-24 11:40:27 +13:00
Dan Poltawski
6b578e9611 Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle 2015-03-23 11:25:55 +00:00
Dan Poltawski
ab5b4d80c5 Merge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite-Rennes2/moodle 2015-03-23 11:03:28 +00:00
Marina Glancy
8eb35d9826 MDL-13831 workshop: process gradepass only if set 2015-03-23 16:52:20 +08:00
David Monllao
ef4b8bb98b Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle 2015-03-23 11:51:09 +08:00
Marina Glancy
c977b35059 MDL-13831 grades: allow to set gradepass in mod_form 2015-03-23 11:11:37 +08:00
Gregory Faller
8164fad49d MDL-13831 course: add gradepass field to mod_form 2015-03-23 10:56:56 +08:00
Dan Marsden
b6906055ca MDL-49054 scorm: Remove some old debugging code. 2015-03-23 08:56:33 +13:00