Commit graph

1490 commits

Author SHA1 Message Date
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
feb09881fb Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle 2013-11-04 15:13:42 +11:00
Damyon Wiese
0d0b93ce2f Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle 2013-11-04 10:49:06 +08:00
David Monllao
92bfad6b1b MDL-42663 mod_lesson: Move definitions to show_clock()
Seems that the required data is not always set
before timer.js is included.
2013-11-01 16:37:45 +08:00
Mark Nelson
66dbecef8a MDL-42429 mod_lesson: removed unnecessary conditional check causing a PHP notice 2013-11-01 16:22:49 +08:00
Prateek Sachan
3266d14bbe MDL-38850: Fixed Horizontal bar issue in lesson 2013-10-28 11:03:17 +08:00
Marina Glancy
78135fd2ec MDL-42400 mod_lesson: data generator for lesson 2013-10-26 14:00:25 +11:00
rwijaya
bc8a409c1f MDL-38664 Lesson mod: code improvement for lesson re-attempt page 2013-10-21 13:47:22 +08:00
Joseph Rézeau
b882b8c678 MDL-38664 Lesson mod: fixed re-attempt unseen page 2013-10-21 13:43:05 +08:00
Sam Hemelryk
c0382dd012 Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle 2013-09-10 15:44:49 +12:00
Helen Foster
86698a4c72 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:31:35 +02:00
Andrew Davis
974beea10a MDL-40735 mod_lesson: fixed up a header and stripped out hardcoded formatting 2013-09-02 12:38:20 +07:00
Jean-Michel Vedrine
efbe07b03c MDL-38505 Permit lesson to import images in question text 2013-08-23 07:54:57 +02:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c.
2013-08-21 13:42:30 +08:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Jean-Michel Vedrine
2f04508377 MDL-39691 Lesson - Email graded essays not working 2013-08-11 08:18:42 +02:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Sam Hemelryk
206f18c836 Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle 2013-08-06 17:31:14 +12:00
David Monllao
3897608152 MDL-39635 behat: XPath cleanups
- Escaping steps arguments redirected to other steps
- Adding normalized-space() in all contains() assertions
- General xpaths review
- Convering provided xpath text strings to xpath literals
  to avoid problems with arguments containing both single
  quotes and double quotes
2013-07-19 10:02:36 +02:00
Damyon Wiese
84c5f6416e MDL-35851 lesson: Handle importing questions into an empty lesson.
Also - make sure the page we are updating belongs to the lesson.
2013-07-18 16:45:44 +08: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
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
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
eebc821c83 MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links 2013-07-16 09:52:25 +08:00
Rossiani Wijaya
a4a2ddfbf1 MDL-39546 Lesson module: removed duplicate to decode special characters 2013-07-02 09:37:12 +12:00
Rossiani Wijaya
f6b6cef8c0 MDL-39546 Lesson module: fixed matching question issues. 2013-07-02 09:37:01 +12:00
Dan Poltawski
e9d011250e Merge branch 'MDL-40110_master' of git://github.com/dmonllao/moodle 2013-06-17 17:02:11 +08:00
Rossiani Wijaya
f2a41c5136 MDL-39369: Lesson module: change settype PARAM_TEXT to PARAM_NOTAGS 2013-06-13 15:34:18 +08:00
Rossiani Wijaya
a015bc030c MDL-39369: Lesson module: fix setType() properly 2013-06-13 15:26:13 +08:00
David Monllao
e03ed0e134 MDL-40110 behat: AM/PM strings are OS-dependant, removing this part from tests 2013-06-10 11:21:04 +08:00
David Monllao
69a397cd2c MDL-39795 behat: Adapting features to consider spaces 2013-05-27 14:24:20 +08:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Sam Hemelryk
635d8bc84b Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-10 16:23:26 +12:00
Rossiani Wijaya
89aa433fbd MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers 2013-05-10 11:14:52 +08:00
Eloy Lafuente (stronk7)
1065589db1 Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle 2013-05-10 02:31:50 +02:00
Eloy Lafuente (stronk7)
d560159df6 Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-09 15:47:38 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
Rossiani Wijaya
3b3e7fd11c MDL-39488 Lesson Module: Improve code performance 2013-05-08 13:53:38 +08:00
Rossiani Wijaya
51fce0f6e0 MDL-39488 Lesson Module: Fixed PHP error matching question,
if one or more options have not been selected.
2013-05-08 13:53:38 +08:00
Joseph Rézeau
b0e9cdd45b MDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more options have not been selected "
Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
2013-05-08 13:53:31 +08:00
Eloy Lafuente (stronk7)
fc076898c7 Merge branch 'MDL-39437' of git://github.com/rwijaya/moodle 2013-05-07 15:50:29 +02:00
David Monllao
fd70acae15 MDL-39437 mod_lesson: Expanding form fieldsets before clicking elements 2013-05-07 11:11:17 +08: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
Damyon Wiese
da97cfe35e Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle 2013-05-06 21:57:19 +08:00
Damyon Wiese
e1cd72ec72 Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle 2013-05-03 15:37:57 +08:00
Rossiani Wijaya
343a48256a MDL-38717: Lesson mod: fixed behat script to accomodate the fix of settype() 2013-05-02 15:26:35 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
Rossiani Wijaya
747d5b1cf6 MDL-38714 Lesson module: add setType for hidden and text inputs 2013-05-01 11:39:31 +08:00
Sam Hemelryk
d25103c4ef Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle
Conflicts:
	mod/wiki/mod_form.php
2013-05-01 11:15:24 +12:00