Commit graph

13753 commits

Author SHA1 Message Date
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle
Conflicts:
	mod/scorm/module.js
2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle 2013-04-19 15:11:33 +01:00
Damyon Wiese
dd3b3a81d1 Merge branch 'MDL-39167' of git://github.com/timhunt/moodle 2013-04-19 13:13:28 +08:00
Sam Hemelryk
2b2b967ecb MDL-38646 mod_folder: improved upgrade of showexpanded 2013-04-19 16:28:29 +12:00
Sam Hemelryk
a03fdbb099 Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle 2013-04-19 16:23:21 +12:00
Sam Hemelryk
52b4bd37e7 Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle 2013-04-19 14:41:25 +12:00
Sam Hemelryk
4d35c88e10 Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle 2013-04-19 13:53:55 +12:00
Sam Hemelryk
ff76b6044b Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle 2013-04-19 13:48:32 +12:00
Rex Lorenzo
57e228045b MDL-38646 folder: change column from show_expanded to showexpanded 2013-04-18 17:28:35 -07:00
Davo Smith
c4dccb99fb MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility 2013-04-18 12:44:24 +01:00
Tim Hunt
d823a63db0 MDL-39167 quiz access rules: need to validate their settings.
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
2013-04-17 14:24:38 +01:00
Dan Poltawski
51850ccaf8 Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle 2013-04-17 12:37:23 +01:00
Dan Poltawski
0107a90fe8 Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle 2013-04-17 12:32:39 +01:00
Frederic Massart
ad4bbda9eb MDL-38573 choice: Reformat settings form 2013-04-17 15:54:59 +08:00
Mark Nelson
4a8a72656d MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning 2013-04-17 15:20:41 +08:00
Damyon Wiese
78d9d52a0a MDL-38710 assign: Fix one typo and change one param to PARAM_BOOL 2013-04-17 13:50:33 +08:00
Dan Poltawski
9231cd8826 MDL-38710 assign: convert selectedusers to PARAM_SEQUENCE
This param type is more appropiate.
2013-04-17 13:50:23 +08:00
Dan Poltawski
68d646f3eb MDL-38710 assign: fix missing setType calls 2013-04-17 13:50:23 +08:00
Dan Poltawski
dfd24d622f Merge branch 'MDL-39140_m25' of git://github.com/sbourget/moodle 2013-04-16 13:46:51 +01:00
Dan Poltawski
342b1901ac Merge branch 'MDL-39029' of git://github.com/jacks92/moodle 2013-04-16 13:30:10 +01:00
Dan Poltawski
f7f1465f91 Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-16 13:26:34 +01:00
Damyon Wiese
6a508eaccf Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle 2013-04-16 15:56:10 +08:00
Eloy Lafuente (stronk7)
4af6e51309 Merge branch 'master_MDL-37844' of git://github.com/danmarsden/moodle 2013-04-16 01:14:06 +02:00
Stephen Bourget
01b3704f1b MDL-39140 mod_folder: Fix missing call to setType() 2013-04-15 17:59:25 -04:00
Dan Poltawski
1184c3da23 MDL-39135 assign_feedback: fix missing renderer argument
assign_user_summary expects extra profile fields
2013-04-15 14:57:00 +01:00
Dan Poltawski
e5e5097081 NOBUG - reduce whitespace errors a little 2013-04-15 13:29:14 +01:00
Dan Poltawski
7e155b96fb Merge branch 'wip-MDL-38309-m25' of git://github.com/marinaglancy/moodle 2013-04-15 10:24:20 +01:00
Rossiani Wijaya
167b2c3d1e MDL-39081 workshop mod: fixed missing setType error 2013-04-15 15:42:22 +08:00
Marina Glancy
a5f82c5b21 MDL-38309 Substitute usage of print_tabs() with renderable tabtree 2013-04-15 12:13:13 +10:00
Damyon Wiese
986adc066c MDL-39092 Yuilib - remove more -coverage.js files
Also slight tweak to the readme for someone who does not know shifter.
2013-04-15 09:02:11 +08:00
Eloy Lafuente (stronk7)
35bff0716d Merge branch 'MDL-38947_master' of git://github.com/dmonllao/moodle 2013-04-15 02:22:23 +02:00
Eloy Lafuente (stronk7)
ef6fbe9eef Merge branch 'MDL-38948_master' of git://github.com/dmonllao/moodle 2013-04-15 02:22:06 +02:00
Eloy Lafuente (stronk7)
e9324d0863 Merge branch 'MDL-38949_master' of git://github.com/dmonllao/moodle 2013-04-15 02:19:58 +02:00
Eloy Lafuente (stronk7)
252612a670 Merge branch 'MDL-38962_master' of git://github.com/dmonllao/moodle 2013-04-15 02:08:35 +02:00
Eloy Lafuente (stronk7)
068fc30fa5 Merge branch 'MDL-38960_master' of git://github.com/dmonllao/moodle 2013-04-15 01:59:21 +02:00
Eloy Lafuente (stronk7)
7fc82aec49 Merge branch 'MDL-39089_master' of git://github.com/dmonllao/moodle 2013-04-15 01:57:01 +02:00
David Monllao
9fb5894e79 MDL-38947 behat: New test
According to MDLQA-73, in a lesson
activity, students can navigate through
a series of pages in various ways
depending upon their answers to questions.
2013-04-14 15:02:39 +08:00
David Monllao
51434146e4 MDL-38948 behat: New test
According to MDLQA-76, a teacher can
set a time limit for a lesson activity.
2013-04-14 13:03:27 +08:00
David Monllao
e2e4813b0d MDL-38949 behat: New test
According to MDLQA-81, a teacher can
password protect a lesson and/or set
available from and deadline dates.
2013-04-14 11:09:03 +08:00
Petr Škoda
0ac97084fa MDL-34674 use browser built-in spell checking in all browsers except < IE10 2013-04-12 11:33:23 +02:00
David Monllao
1e31fc1724 MDL-38962 behat: New test
According to MDLQA-112, there is a choice
of formats for editing a wiki page.
2013-04-12 14:26:28 +08:00
David Monllao
3de2643218 MDL-38960 behat: New test
According to MDLQA-111, a history of each
wiki page is available.
2013-04-12 13:22:59 +08:00
David Monllao
83cfd14444 MDL-38089 mod_wiki: Fix incorrect links 2013-04-12 12:14:13 +08:00
Dan Poltawski
47df95c362 Merge branch 'MDL-39054' of git://github.com/jacks92/moodle 2013-04-12 11:08:28 +08:00
Matteo Scaramuccia
5ecd13bc66 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-04-11 22:44:29 +02:00
Eloy Lafuente (stronk7)
2087fa6223 Merge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle 2013-04-11 16:32:32 +02:00
Eloy Lafuente (stronk7)
bd3d4c9e8d Merge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle 2013-04-11 16:30:08 +02:00
Eloy Lafuente (stronk7)
33fcbe89d4 Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle 2013-04-11 16:11:40 +02:00
Jayesh Anandani
6b7a020b23 MDL-39029 quiz password: autofocus feature added 2013-04-11 17:26:58 +05:30
Jayesh Anandani
620233b8fb MDL-39054 quiz statistics: move hard-coded text to lang file 2013-04-11 16:41:43 +05:30