mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
72,022 Commits 36 Branches 519 Tags
Commit Graph

195 Commits

Author SHA1 Message Date
Andrew Nicols
b4d70adb9e Merge branch 'MDL-43163' of git://github.com/jmvedrine/moodle 2015-01-20 11:23:41 +08:00
Jean-Michel Vedrine
59f1c9f5a8 MDL-43386 Lesson: Grade essay student response formatting not correct 2015-01-18 20:36:46 +01:00
Jean-Michel Vedrine
f47c365a48 MDL-43163 mod_lesson: Coding style problem: ->BOX 2015-01-16 15:09:15 +01: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
261b858985 Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle 2015-01-15 08:32:42 +00: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
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
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
Jean-Michel Vedrine
0d4705c76a MDL-38222 mod_lesson: Error in Lesson Cluster for Unseen Questions 2014-12-25 21:21:41 +01:00
Jean-Michel Vedrine
25345cb4cd MDL-48244 Lesson: add custom end of lesson reached completion rule 2014-12-21 16:23:49 +01:00
Jean-Michel Vedrine
50d70c5caf MDL-27930 Lesson: the count-down timer does not work 2014-11-04 15:12:42 +01:00
Jean-Michel Vedrine
0abc18cf4d MDL-32870 Lesson: No HTML editor for questions answers and responses 2014-10-04 15:13:01 +02:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses" 
This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
 2014-10-02 09:09:16 +01:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00
Marina Glancy
a128a24fca Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle 2014-05-05 10:18:03 +08:00
Adrian Greeve
0aec842e58 MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade. 2014-05-02 16:09:06 +08:00
Adrian Greeve
20685b287d MDL-45127 mod_lesson: Updated question edit screen with more help text. 
Unless the custom scores is selected in the lesson settings the score section
in the question settings will be disabled. A help link has been added with
a description similar to this one.
 2014-05-02 16:09:05 +08:00
Krister Viirsaar
c6ac68eead MDL-42635 lesson: Fixed error message 2014-04-30 09:51:10 +08:00
Sam Hemelryk
9b24f68bde MDL-41177 mod_lesson: unified @package use 2014-02-16 11:51:23 +13:00
Damyon Wiese
c98ee8cdc0 Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle 2014-01-14 13:59:26 +08:00
Frederic Massart
582ba677fd MDL-43371 mod_lesson: Remove files upon page or module deletion 2014-01-09 16:20:20 +01:00
Mark Nelson
00c027c7e3 MDL-40054 mod_lesson: replaced 'end' add_to_log call with an event 2014-01-02 19:52:49 -08:00
Mark Nelson
9c192d812b MDL-40054 mod_lesson: replaced 'start' add_to_log call with an event 2014-01-02 19:52:48 -08:00
Prateek Sachan
3266d14bbe MDL-38850: Fixed Horizontal bar issue in lesson 2013-10-28 11:03:17 +08:00
Sam Hemelryk
206f18c836 Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle 2013-08-06 17:31:14 +12:00
Damyon Wiese
afe36b8411 MDL-35851 Lesson: Check/fix the page order every time the pages are loaded 2013-07-17 13:04:04 +08:00
prateeksachan
9ac3d68648 MDL-40420: timemodified field update when lesson_page is updated 2013-07-17 07:22:37 +05:30
Damyon Wiese
d33d712541 MDL-35851 lesson: removed expensive upgrade step. 
Just deal with the bad data when displaying the lesson instead.

Conflicts:

	mod/lesson/db/upgrade.php
 2013-07-16 14:05:07 +08:00
Rossiani Wijaya
a015bc030c MDL-39369: Lesson module: fix setType() properly 2013-06-13 15:26:13 +08:00
Eloy Lafuente (stronk7)
fc076898c7 Merge branch 'MDL-39437' of git://github.com/rwijaya/moodle 2013-05-07 15:50:29 +02:00
Rossiani Wijaya
7f8ce0257b MDL-39437 lesson mod: rename add a question page section name to avoid conflict in behat 2013-05-07 11:05:58 +08:00
Rossiani Wijaya
747d5b1cf6 MDL-38714 Lesson module: add setType for hidden and text inputs 2013-05-01 11:39:31 +08:00
Rossiani Wijaya
ecea65cace MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase. 2013-03-25 14:07:18 +08:00
Rossiani Wijaya
b0ff0e9aae MDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses 2013-01-15 11:17:55 +08:00
Rossiani Wijaya
fcb88d7d6d MDL-34050 Lesson module: Fixed undefined variable for $qtype 2013-01-14 10:16:35 +08:00
Joseph Rézeau
58b72abc6a MDL-34050: Lesson module: fixed matching answer format to use text 2013-01-14 10:16:34 +08:00
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Ankit Agarwal
5918e3715e MDL-34467 lesson: Repalce all instances of get_context_instanc() with respective context_XXX::instance() 2012-07-27 13:26:35 +08:00
Andrew Davis
1812ea3e06 MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size() 2012-06-14 09:19:25 +07:00
Dan Poltawski
a225149c9a Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle 2012-05-14 14:12:30 +08:00
sam marshall
8b7d95b625 MDL-29624 Media embedding system, part 3: resource module (and URL, lesson) 
This change makes the resource module use the new API when it embeds media
files (audio/video/Flash), and removes the resourcelib library functions
which were previously used for this.

The old API is still used for embedding non-media files such as PDFs and
HTML.

The URL and Lesson module both used copy/paste duplicates of a section of
resource module code which called the removed functions. I have changed
these too. As a bonus this significantly reduces the duplication involved.
 2012-05-09 18:29:31 +01:00
Rossiani Wijaya
272bc0a6ed MDL-24401: fixed string for adding content page 2012-05-09 14:19:49 +08:00
Rossiani Wijaya
0f6e2f02aa MDL-32172 Lesson Module: add variable initialization for 2012-03-23 15:36:39 +08:00
Petr Skoda
0ed6f71232 MDL-32094 fix E_STRICT issues in lesson API 
It is not possible to change method signatures in PHP...
 2012-03-18 18:36:04 +01:00
Rossiani Wijaya
05db3cc7e5 MDL-29542 lesson module: changing qtype param type to INT 2011-10-21 12:38:29 +08:00
Sam Hemelryk
1bbe222d53 Merge branch 'MDL-29296' of git://github.com/rwijaya/moodle 2011-10-03 17:08:21 +13:00
Aparup Banerjee
260316ce48 Merge branch 'MDL-29230' of git://github.com/rwijaya/moodle 2011-09-27 14:52:00 +08:00
Rossiani Wijaya
0343553fbc MDL-29296 lesson mod: fixed regression for continue button on last lesson page. 2011-09-26 16:41:49 +08:00