Commit graph

60382 commits

Author SHA1 Message Date
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
Dan Poltawski
8971ddd5a9 MDL-38741 qtype_truefalse: fix missing setType call 2013-04-04 16:32:46 +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
Dan Poltawski
ce5bb3a912 MDL-38741 qtype_calculatesimple: missing setType call 2013-04-04 11:57:46 +08:00
Dan Poltawski
dfd89b0bb9 MDL-38741 qtype_calculatedmulti: fix missing setType 2013-04-04 11:49:19 +08:00
Dan Poltawski
1e988d262b MDL-38741 qtype_calculate: fix missing setType 2013-04-04 11:45:11 +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
AMOS bot
a2c27c823a Automatically generated installer lang files 2013-04-04 00:36:08 +00: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
Tim Hunt
000fbcf2bd MDL-38538 quiz autosave: fix language string.
This feature does not actually provide spiritual salvation.
2013-04-03 11:23:41 +01:00
Dan Poltawski
aed60c64af Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 17:32:15 +08:00
Damyon Wiese
e84900648b MDL-36804 Assign attempt history: Fix course unit tests
Handle missing attemptreopenmethod in add/update instance.
2013-04-03 17:31:12 +08:00
Dan Poltawski
369496c31e Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-03 17:22:38 +08:00
Dan Poltawski
41b9392daa Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle 2013-04-03 16:50:43 +08:00
Aparup Banerjee
b8eb2f3dc6 Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle 2013-04-03 16:48:53 +08:00
Dan Poltawski
71573249ae Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 16:47:15 +08:00
Damyon Wiese
c9c34c7a65 MDL-36804 Assign attempt history - Add missing index to upgrade step. 2013-04-03 16:44:31 +08:00
Aparup Banerjee
7a2a430aa5 Merge branch 'MDL-38809' of git://github.com/timhunt/moodle 2013-04-03 16:32:42 +08:00
Dan Poltawski
5cc929bc12 Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle 2013-04-03 16:27:16 +08:00
Dan Poltawski
5e45f6a569 Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 16:18:50 +08:00