Commit graph

1524 commits

Author SHA1 Message Date
David Monllao
bdece5fc27 Merge branch 'MDL-49474' of git://github.com/jmvedrine/moodle 2015-03-31 10:14:45 +08:00
Jean-Michel Vedrine
c7d1a37bdb MDL-18966 mod_lesson: Save attempts of practice lessons 2015-03-30 12:58:17 +02: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
David Monllao
b7bfbfee2c MDL-49470 mod_lesson: Triggering just 1 event 2015-03-25 15:33:07 +08: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
Mohamed Alsharaf
324954141e MDL-35482 lesson: return to previous page after edit and page save 2015-03-20 12:01:24 +13:00
Jean-Michel Vedrine
4b570f7144 MDL-48715 mod_lesson: completion rules must not be dependent 2015-03-19 12:24:55 +01:00
Dan Poltawski
2e796a1615 Revert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle"
This reverts commit 94d0be7840, reversing
changes made to f51ef4d102.
2015-03-19 12:24:54 +01:00
Dan Poltawski
7eb98397dc Revert "MDL-49121 mod_lesson: Fixed typo in link creation"
This reverts commit feb8ca8c72dcf429d3c06df6587b57221ae615f4.
2015-03-19 12:24:52 +01:00
Rajesh Taneja
909064a1ce MDL-49121 mod_lesson: Fixed typo in link creation 2015-03-19 12:24:50 +01:00
Stephen Bourget
e0f7b96347 MDL-49430 Lesson: Add restarted and resumed events 2015-03-18 13:30:29 -04:00
David Monllao
7794f80126 Merge branch 'MDL-48715' of git://github.com/jmvedrine/moodle 2015-03-18 08:31:03 +08:00
Jean-Michel Vedrine
10e2355f8c MDL-48715 mod_lesson: use only one field for time spent rule 2015-03-17 20:47:01 +01:00
Dan Poltawski
94d0be7840 Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle 2015-03-17 11:14:21 +00:00
Eloy Lafuente (stronk7)
f51ef4d102 Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle 2015-03-17 12:03:50 +01:00
Stephen Bourget
d27e9a2cdb MDL-49296 Lesson: Add titles to action links 2015-03-16 20:33:22 -04:00
Dan Poltawski
4501ee4b16 Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle 2015-03-16 21:05:56 +00:00
Jean-Michel Vedrine
b7a2633d7d MDL-48715 mod_lesson: behat test for time spent completion condition 2015-03-15 15:25:30 +01:00
Jean-Michel Vedrine
d0445cf70d MDL-48715 mod_lesson: add a time spent custom completion rule 2015-03-15 15:24:55 +01:00
Matt Switlik
4ac4a9cc52 MDL-49121 mod/lesson: master optimize lesson report and fixed for coding guidelines 2015-03-13 09:04:03 -04:00
Jean-Michel Vedrine
5b0af6e4b1 MDL-39262 mod_lesson: disable shortforms in lesson question display 2015-03-08 11:06:53 +01:00
Jean-Michel Vedrine
400fa4a1b5 MDL-48965 mod_lesson: avoid short answer question without any answers 2015-03-07 22:04:27 +01:00
Rajesh Taneja
4ba58b4540 MDL-48962 mod_lesson: New lesson should not be timed 2015-03-05 14:55:18 +08:00
Rajesh Taneja
8b88ba475e MDL-48962 mod_lesson: Fixed behat with new timeout setting and string 2015-03-05 14:55:18 +08:00
Eloy Lafuente (stronk7)
d687c29f26 Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-05 00:24:49 +01:00
Jean-Michel Vedrine
5df7f12398 MDL-48912 mod_lesson: fix problems found during testing 2015-03-04 21:50:33 +01:00
Eloy Lafuente (stronk7)
0967a20d02 Merge branch 'MDL-48962' of git://github.com/jmvedrine/moodle 2015-03-04 00:00:16 +01:00
Eloy Lafuente (stronk7)
3d944d37dd Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-03 19:30:00 +01:00
Eloy Lafuente (stronk7)
6442803f76 MDL-48984 mod_lesson: explicitly close some recordsets 2015-03-03 12:52:40 +01:00
Eloy Lafuente (stronk7)
6230f717bf Merge branch 'MDL-48984' of git://github.com/jmvedrine/moodle 2015-03-03 12:52:20 +01:00
Dan Poltawski
6a4caa0128 Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle
Conflicts:
	mod/lesson/version.php
	mod/lesson/db/upgrade.php
	mod/lesson/db/install.xml
2015-03-03 11:40:17 +00:00
Jean-Michel Vedrine
a1300e98bb MDL-48984 mod_lesson: some lesson_answers answers should be plain text
Branch tables jump descriptions, short answer question answers
and numerical question answers should be plain text, and no editor
should be available here.
2015-03-03 08:24:24 +01:00
Jean-Michel Vedrine
70206b2f72 MDL-48912 mod_lesson: Deprecate essayemailmessage string 2015-02-27 21:15:28 +01:00
Jean-Michel Vedrine
cb69eb8a00 MDL-48912 mod_lesson: Essay page title disclosed to student 2015-02-27 21:15:27 +01:00
Jean-Michel Vedrine
a1acc00177 MDL-48962 mod-lesson: maxtime should use a duration form element 2015-02-26 10:28:42 +01:00
Stephen Bourget
60742fdad1 MDL-34006 Lesson: Behat tests 2015-02-25 10:22:59 -05:00
Stephen Bourget
6695d5947f MDL-34006 Lesson: Resume lesson loads wrong page. 2015-02-25 10:22:41 -05:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Stephen Bourget
1cf8ca343f MDL-49183 Lesson: Add additional events 2015-02-19 21:16:26 -05:00
David Monllao
c1d1c435f7 MDL-48883 mod_lesson: Updating mod_lesson version
Updating it to today's date instead of using
stable branches version convention.
2015-02-18 12:30:15 +08:00
David Monllao
caaeabd0f4 Merge branch 'MDL-48883_m29v5' of git://github.com/sbourget/moodle 2015-02-18 12:26:40 +08:00
Eloy Lafuente (stronk7)
40156b3bec Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle 2015-02-17 21:14:50 +01:00
Andrew Nicols
719f7345ee Merge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle 2015-02-17 14:35:38 +08:00
Jean-Michel Vedrine
fc16a1acba MDL-48709 mod_lesson: subclusters are not working 2015-02-14 18:26:03 +01:00
David Monllao
667ef02858 MDL-18553 mod_lesson: Requiring just the grade constants 2015-02-13 10:40:47 +08:00