Commit graph

1437 commits

Author SHA1 Message Date
Stephen Bourget
9e84423b79 MDL-38277 Lesson: Fix strings on activity report 2015-01-15 12:41:57 -05:00
Dan Poltawski
63cc7cfc61 Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle
Conflicts:
	mod/lesson/upgrade.txt
2015-01-15 08:34:58 +00:00
Dan Poltawski
02362f4414 Merge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle 2015-01-15 08:33:29 +00:00
Dan Poltawski
594276893e Merge branch 'MDL-39103-master' of git://github.com/xow/moodle
Conflicts:
	mod/lesson/lib.php
2015-01-15 08:33:27 +00:00
Dan Poltawski
584e582bfc Merge branch 'MDL-45784-master' of git://github.com/xow/moodle 2015-01-15 08:32:45 +00:00
Dan Poltawski
db387f25de Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:44 +00:00
Dan Poltawski
d55a433d6c Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle 2015-01-15 08:32:43 +00:00
Dan Poltawski
8c9390c5eb Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00:00
Dan Poltawski
261b858985 Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00:00
Andrew Nicols
26a1fbbd15 Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:32:38 +00:00
Stephen Bourget
002da93948 MDL-48813 Lesson: Removed unused GROUPMEMBERSONLY 2015-01-12 10:49:41 -05:00
Stephen Bourget
8eef88589a MDL-48750 Lesson: Behat test for lesson attempt info
behat test provided by Jean-Michel Vedrine
2015-01-10 17:13:17 -05:00
Jean-Michel Vedrine
91d9008108 MDL-40326 mod_lesson: progress bar is not reset by course reset 2015-01-10 18:54:54 +01:00
Jean-Michel Vedrine
a30e935aa7 MDL-31774 mod_lesson: Wrong jumps in lessons with mutiple clusters 2015-01-10 18:30:06 +01:00
Stephen Bourget
ca3327133b MDL-36824 Lesson: Media File should be displayed as a block 2015-01-09 18:15:27 -05:00
Stephen Bourget
c1500a8270 MDL-48750 Lesson: Fix attempt info displayed by course overview block 2015-01-09 09:10:11 -05:00
Jean-Michel Vedrine
5ca2e765fa MDL-14730 mod_lesson: allow linking to pages inside a lesson 2015-01-09 11:33:35 +01:00
Jean-Michel Vedrine
0fe6a900ac MDL-47931 mod_lesson: remove the useless grade_item_delete function 2015-01-08 21:28:28 +01:00
Jean-Michel Vedrine
2d586d1d85 MDL-48675 mod_lesson: behat tests for pages edition 2015-01-08 20:59:59 +01:00
Jean-Michel Vedrine
a748983aa2 MDL-48675 mod_lesson: Error displayed while editing content page jumps
This change also fix MDL-32343 and MDL-31778 related to problems
when editing cluster pages.
2015-01-08 20:58:15 +01:00
John Okely
43fd794963 MDL-45784 lesson: Remove preview link for students viewing lesson
Credit to Pete Jones for the fix.
2015-01-08 13:26:53 +08:00
Eloy Lafuente (stronk7)
ae3663a082 Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle 2015-01-07 17:15:52 +01:00
Helen Foster
b7853012b8 MDL-48748 lang: Merge English strings from the en_fix language pack 2015-01-06 21:53:17 +01:00
Jean-Michel Vedrine
b9c86823c7 MDL-48034 mod_lesson: grade capability missing RISK_XSS 2015-01-06 12:50:40 +00:00
Dan Poltawski
9157b842c4 Merge branch 'MDL-46015' of git://github.com/jmvedrine/moodle 2015-01-06 11:57:58 +00:00
Dan Poltawski
ada0fc253c Merge branch 'MDL-47070' of git://github.com/jmvedrine/moodle 2015-01-06 11:26:41 +00:00
John Okely
02ff22e925 MDL-39103 lesson: Fix lesson administration block
Credit to Joseph Rézeau for the fix
2015-01-06 14:51:53 +08:00
David Monllao
0953e38792 Merge branch 'MDL-38222' of git://github.com/jmvedrine/moodle 2015-01-06 12:27:04 +08:00
Andrew Nicols
19e819bad4 Merge branch 'MDL-48707' of git://github.com/jmvedrine/moodle 2015-01-06 11:49:57 +08:00
Andrew Nicols
fefd49f70e MDL-20304 lesson: Uncomment tests following MDL-48631 2015-01-06 10:37:17 +08:00
Andrew Nicols
fc8925206e Merge branch 'MDL-20304-master' of git://github.com/danpoltawski/moodle 2015-01-06 10:37:10 +08:00
Jean-Michel Vedrine
b5914b61da MDL-47070 mod_lesson: useless db query that should be deleted 2015-01-01 22:07:59 +01:00
Lloyd Powell
ed9b45ecf1 MDL-43898 lesson: Fix for positioning of blocks on continue.php 2014-12-31 09:09:05 +00:00
Jean-Michel Vedrine
2e6b9f5c9b MDL-48631 mod_lesson: tables 'grade' item have incorrect precision 2014-12-29 10:46:19 +01:00
Eugene Venter
53339437cd MDL-46015 lesson: Optimise report - use recordsets
Change-Id: I61f3ed30c6dbd8f88d1dfb1adfe2fc291853e0e1
2014-12-28 11:00:57 +01:00
Jean-Michel Vedrine
a174a0ac23 MDL-48707 mod_lesson: ignore plugins question types during import 2014-12-26 08:28:36 +01:00
Jean-Michel Vedrine
0d4705c76a MDL-38222 mod_lesson: Error in Lesson Cluster for Unseen Questions 2014-12-25 21:21:41 +01:00
Dan Poltawski
3f6d5ea621 MDL-20304 lesson: add behat test for practice lessons 2014-12-23 16:51:53 +00:00
Jean-Michel Vedrine
25345cb4cd MDL-48244 Lesson: add custom end of lesson reached completion rule 2014-12-21 16:23:49 +01:00
Dan Poltawski
9bb712a047 MDL-20304 lesson: do not display gradebook link when in practice mode
Practice mode means the grades do not go to the gradebook, so do not
display the gradebook link at the end of the lesson
2014-12-17 15:58:31 +00:00
Atanas Atanasov
33ce9e581a MDL-20304 lesson: do not send practice lesson grades to gradebook 2014-12-17 14:17:50 +00:00
Eloy Lafuente (stronk7)
bd5745341e Merge branch 'MDL-48473' of git://github.com/jmvedrine/moodle 2014-12-16 01:12:56 +01:00
Dan Poltawski
2d562cfc6d Merge branch 'MDL-36673' of git://github.com/jmvedrine/moodle 2014-12-15 11:54:06 +00:00
Jean-Michel Vedrine
b63c745ec6 MDL-48473 mod_lesson: test fill in the blank question 2014-12-11 21:44:43 +01:00
Jean-Michel Vedrine
cb9af73037 MDL-48473 mod_lesson: fill in the blank shortanswer option 2014-12-11 21:12:43 +01:00
Dan Poltawski
23da79a464 MDL-45679 mod_lesson: do not overqualify styles 2014-12-09 12:34:54 +00:00
Joseph Rezeau
4627726954 MDL-36673 mod_lesson: slideshow mode not working 2014-12-05 18:42:03 +01:00
Jean-Michel Vedrine
cfcfd7045f MDL-45679 mod_lesson: Essay grading page has no mark for essay status 2014-12-05 15:02:32 +01:00
Jean-Michel Vedrine
762ee1393b MDL-48342 Question: qformat_default::readquestion is broken 2014-11-28 15:47:39 +01:00
Dan Poltawski
b56f00d057 Merge branch 'MDL-41155-master' of git://github.com/gurgus/moodle 2014-11-25 13:18:13 +00:00