Dan Poltawski
bdc518b507
MDL-35073 badges: fix duplicate indexes
2013-04-05 15:27:32 +08:00
Damyon Wiese
a8fdb36cf2
MDL-36804 Assignment attempt history: Fix warning on saving a new grade.
...
This is a fix for the case when there is a submission but no grade.
2013-04-05 10:03:00 +08:00
Eloy Lafuente (stronk7)
577173a51f
Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle
2013-04-05 03:21:52 +02:00
Damyon Wiese
6aa38ef89a
Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
2013-04-05 09:19:09 +08:00
Eloy Lafuente (stronk7)
6481aafbb8
MDL-38852 repository_recent: add missing type.
2013-04-05 03:06:15 +02:00
Eloy Lafuente (stronk7)
c5f4080a10
Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle
2013-04-05 02:51:48 +02:00
Eloy Lafuente (stronk7)
dbc5692fc5
Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle
2013-04-05 02:48:37 +02:00
Eloy Lafuente (stronk7)
8f3885f23d
Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle
2013-04-05 02:46:15 +02:00
Marina Glancy
97d5e39c49
MDL-38708 Changed test to be more accurate
2013-04-05 10:52:09 +11:00
Andrew Robert Nicols
b0fb4c12d7
MDL-38667 JavaScript: Don't use -min files for YUI CSS
2013-04-04 17:18:56 +02:00
Eloy Lafuente (stronk7)
c001c51a26
Merge branch 'MDL-36570' of git://github.com/colchambers/moodle
2013-04-04 16:59:34 +02:00
Tim Hunt
c7fbfe46f9
MDL-38538 question autosave: fix sequencecheck handling.
2013-04-04 15:32:32 +01:00
Colin Chambers
11a66e2c5a
MDL-36570 Grouped question type answer fields now display errors
2013-04-04 15:29:39 +01:00
Tim Hunt
e3485c5f75
MDL-38538 quiz autosave: fix JavaScript errors.
...
1. Make cancelling the delay more robust.
2. Ignore changes in flag state. They are already saved using AJAX.
3. Typo that caused an error when there was no TinyMCE on the page.
2013-04-04 12:32:54 +01:00
Tim Hunt
aa81e35847
MDL-38209 quiz css: fix minor regression.
2013-04-04 11:17:39 +01:00
Colin Chambers
c3f21ec516
MDL-36570 Added missing calculatedmulti fields
2013-04-04 11:17:33 +01:00
Dan Poltawski
83e353fae9
MDL-38886 course: missing setType calls when adding a new category
2013-04-04 17:22:28 +08:00
Dan Poltawski
d60ee78a5f
MDL-38883 calendar: fix missing setType
...
Also remove duplicate sesskey definition (this is done by formslib
internally)
2013-04-04 17:17:37 +08:00
Aparup Banerjee
37240ce5c6
Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
version.php
2013-04-04 15:07:01 +08:00
Dan Poltawski
b7d20148a1
MDL-38897 formslib: add unit tests for setType debugging
2013-04-04 14:59:21 +08:00
Dan Poltawski
48056d5459
MDL-38885 - don't test for setType in display() itself
...
Doing it in _process_submission is enough.
2013-04-04 14:58:14 +08:00
Damyon Wiese
6ed18a6828
Merge branch 'MDL-38633' of git://github.com/stronk7/moodle
2013-04-04 14:26:15 +08:00
Dan Poltawski
589fe9c85d
Merge branch 'MDL-38590_master-fix-behat' of git://github.com/dmonllao/moodle
2013-04-04 14:05:17 +08:00
David Monllao
b0f0995b09
MDL-38590 behat: Fixing broken behat test
2013-04-04 13:54:40 +08:00
David Monllao
b82e0c17fb
MDL-38691 behat: Fixing behat tests
2013-04-04 13:52:24 +08:00
Damyon Wiese
57bc1beb1b
MDL-37009 Course - Fix typo in new lang string.
2013-04-04 11:24:13 +08:00
Damyon Wiese
200571507f
Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle
2013-04-04 11:22:20 +08:00
Dan Poltawski
f88ff0e7cf
Merge branch 'MDL-38861' of git://github.com/stronk7/moodle
2013-04-04 11:00:01 +08:00
Damyon Wiese
1b774df9a7
MDL-35073 Open badges - close session before making curl request to check backpack server.
2013-04-04 10:39:51 +08:00
Damyon Wiese
b38f932abf
Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle
2013-04-04 10:34:50 +08:00
Eloy Lafuente (stronk7)
0c7ad0ab13
Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle
2013-04-04 01:15:34 +02:00
Eloy Lafuente (stronk7)
1b882ab87b
Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle
2013-04-04 01:14:36 +02:00
Eloy Lafuente (stronk7)
33871fbf3e
Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle
2013-04-04 01:07:23 +02:00
Eloy Lafuente (stronk7)
5c98b64b00
Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle
2013-04-04 01:04:00 +02:00
Eloy Lafuente (stronk7)
235fc2562c
Merge branch 'MDL-38667-m' of git://github.com/andrewnicols/moodle
2013-04-04 01:02:20 +02:00
Eloy Lafuente (stronk7)
a37a698417
Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle
2013-04-04 00:53:05 +02:00
Eloy Lafuente (stronk7)
75fb383260
Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle
...
Conflicts:
mod/glossary/mod_form.php
2013-04-04 00:51:47 +02:00
Eloy Lafuente (stronk7)
68a6d3cd9f
Merge branch 'MDL-38645-master' of git://github.com/FMCorz/moodle
2013-04-04 00:34:24 +02:00
Eloy Lafuente (stronk7)
76d86181a3
Merge branch 'wip-mdl-38494' of git://github.com/rajeshtaneja/moodle
2013-04-03 23:45:40 +02:00
Eloy Lafuente (stronk7)
1ca5ce1b33
Merge branch 'MDL-36570' of git://github.com/timhunt/moodle
2013-04-03 23:09:19 +02:00
Eloy Lafuente (stronk7)
896efbeadb
Merge branch 'MDL-38756-m' of git://github.com/andrewnicols/moodle
2013-04-03 21:59:18 +02:00
Eloy Lafuente (stronk7)
0e864c3f21
Merge branch 'MDL-38733-workshop-rubric-css' of git://github.com/mudrd8mz/moodle
2013-04-03 20:06:49 +02:00
Eloy Lafuente (stronk7)
2a5e0d6321
Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle
2013-04-03 19:48:02 +02:00
Eloy Lafuente (stronk7)
7191a59fc9
Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle
2013-04-03 17:12:04 +02:00
Eloy Lafuente (stronk7)
6b117438b9
Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle
2013-04-03 16:48:42 +02:00
Eloy Lafuente (stronk7)
ad46ea0b2f
MDL-38861 upload users: add missing setType() calls.
2013-04-03 16:18:38 +02:00
Dan Poltawski
626403eb73
Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle
2013-04-03 20:22:03 +08:00
Eloy Lafuente (stronk7)
57902e2738
Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle
2013-04-03 13:33:16 +02:00
Eloy Lafuente (stronk7)
c9f8620492
Merge branch 'MDL-26956' of git://github.com/timhunt/moodle
2013-04-03 13:20:23 +02:00
Tim Hunt
d2e32121b0
MDL-26956 user selector: fix regressions sam caused.
2013-04-03 11:44:23 +01:00