16644 Commits

Author SHA1 Message Date
David Monllao
0adf7044ff MDL-46805 mod_scorm: Re-fix as previous object was removed in 2.8 2015-04-02 11:09:30 +02:00
Rajesh Taneja
e43bf473fa MDL-46805 scorm: Set user_id if scorm|aiccuserid config is set 2015-04-02 11:09:29 +02:00
Rajesh Taneja
345c6a1ac0 MDL-49513 behat: Updated step name to match new step 2015-04-02 11:08:21 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api
Added a new set to set config using set_config() api
to make steps faster and more efficient
2015-04-01 14:25:23 +08:00
David Monllao
a647e1f053 Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2015-04-01 11:49:31 +08:00
Andrew Nicols
2b53b13ff7 MDL-49627 core: Update uses of generate_image_thumbnail
This removes the need to write tempfiles in these locations.
2015-04-01 11:05:19 +08:00
David Monllao
4d9dda2389 Merge branch 'MDL-40992' of git://github.com/timhunt/moodle 2015-04-01 08:00:43 +08:00
Dan Poltawski
f31c4f27f3 Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle 2015-03-31 20:10:27 +01:00
Tim Hunt
5e63b335fe MDL-40992 quiz: option to let students redo questions within an attempt
This feature is designed for use on pracice or formative quizzes.
It is available for quizzes that use Interactive or Immediate feedback
behaviour.

If the teacher turns this on in the quiz settings, then once a student
has finished a question, they get a 'Redo question' button beside the
question. If they click it, then the question they finished is replaced
by a new one so they can try again to practise that particul skill or
bit of knowledge a bit more.

When randomisation is involved, the studnets will be given a question or
variant that they have not seen before if possible.
2015-03-31 14:12:48 +01:00
Dan Poltawski
deadda2f86 Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle
Conflicts:
	mod/lesson/db/upgrade.php
	mod/lesson/version.php
2015-03-31 11:21:11 +01:00
Dan Poltawski
4e664d1689 Merge branch 'MDL-26689' of git://github.com/jmvedrine/moodle 2015-03-31 10:46:30 +01:00
Dan Poltawski
7e5c5b83c1 Merge branch 'm29_MDL-43818_Unable_Download_Package_Via_URL' of https://github.com/scara/moodle 2015-03-31 09:27:46 +01:00
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