60796 Commits

Author SHA1 Message Date
Damyon Wiese
5091b20052 MDL-39041 Assignment - Fix regression in "allow submission changes".
A typo was introduced in the assignment attempt history feature that broke
unlock submissions. This was detected by the new behat test in MDL-38970 (yay).
2013-04-10 11:30:41 +08:00
Damyon Wiese
f8ddbd24d7 Merge branch 'MDL-38935' of git://github.com/timhunt/moodle 2013-04-10 11:17:31 +08:00
Dan Poltawski
ac208538b7 Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle 2013-04-10 11:11:47 +08:00
Dan Poltawski
7f2ac368e8 Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle 2013-04-10 11:09:05 +08:00
Dan Poltawski
bf11c1d128 Merge branch 'MDL-22153' of git://github.com/stronk7/moodle 2013-04-10 10:58:32 +08:00
Dan Poltawski
cfaacebb01 Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle 2013-04-10 10:55:45 +08:00
Dan Poltawski
fbd90ba191 Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle 2013-04-10 10:37:29 +08:00
Dan Poltawski
0bedc806f9 Merge branch 'MDL-38999' of git://github.com/stronk7/moodle 2013-04-10 10:35:40 +08:00
Andrew Davis
63354ab50d MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores 2013-04-10 08:05:50 +08:00
Yuliya Bozhko
04da1a5ac2 Fix error when awarding a badge from recipients page 2013-04-10 11:00:08 +12:00
Andrew Nicols
2637886eda MDL-38904 Theme: Correct data-target for navbar 2013-04-09 23:50:52 +01:00
Andrew Nicols
7e98ebd5ca MDL-38904 Theme/JavaScript: Tidy up bootstrap JS 2013-04-09 23:50:51 +01:00
Petr Škoda
70faad655a MDL-38912 fix incorrect timeout reset 2013-04-10 00:06:34 +02:00
Eloy Lafuente (stronk7)
e6c7a5887b Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle 2013-04-09 23:43:46 +02:00
Eloy Lafuente (stronk7)
3621633194 Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle 2013-04-09 23:42:59 +02:00
Matteo Scaramuccia
67dfcb3df6 MDL-39061 Cache: (trivial) incorrect MD sublisting 2013-04-09 23:40:18 +02:00
Eloy Lafuente (stronk7)
8516f270c6 Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle 2013-04-09 23:30:43 +02:00
Eloy Lafuente (stronk7)
696facb159 Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle 2013-04-09 23:30:30 +02:00
Eloy Lafuente (stronk7)
b896844942 Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle 2013-04-09 23:29:59 +02:00
Eloy Lafuente (stronk7)
5bd80500f2 Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:44 +02:00
Eloy Lafuente (stronk7)
d2f77303b0 Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:32 +02:00
Eloy Lafuente (stronk7)
a9aa326ea9 Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:21 +02:00
David Mudrák
5be1be85f4 MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form 2013-04-09 21:46:18 +02:00
Eloy Lafuente (stronk7)
6bb78aedee Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle 2013-04-09 20:24:17 +02:00
Eloy Lafuente (stronk7)
d06700cbd6 Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle 2013-04-09 20:23:38 +02:00
Eloy Lafuente (stronk7)
f7f8ca2420 Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle 2013-04-09 20:22:59 +02:00
Eloy Lafuente (stronk7)
a2027b873b Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle 2013-04-09 20:00:34 +02:00
Eloy Lafuente (stronk7)
c1fc4ba397 Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle 2013-04-09 19:59:45 +02:00
Eloy Lafuente (stronk7)
26b7bea2c0 Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle 2013-04-09 19:55:29 +02:00
Eloy Lafuente (stronk7)
275c2c9f8a Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle 2013-04-09 19:40:39 +02:00
Eloy Lafuente (stronk7)
668aaeb8f3 MDL-26649 forms: temp disable problematic call
The new version of the dateselector is causing JS to stop
working completely in a lot of forms, so I've disabled
temporarily the ofending call to allow other stuff to be
integrated and tested.
2013-04-09 19:37:08 +02:00
sam marshall
fba5cbd356 MDL-39000 Conditional activities: Section condition restore errors 2013-04-09 17:42:32 +01:00
Eloy Lafuente (stronk7)
441b165c12 Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle 2013-04-09 17:36:57 +02:00
David Mudrák
803738ea41 MDL-39056 Use new version of API when fetching available updates info 2013-04-09 17:07:30 +02:00
Eloy Lafuente (stronk7)
f57832826b Merge branch 'MDL-38792' of https://github.com/ppichet/moodle 2013-04-09 14:33:31 +02:00
Eloy Lafuente (stronk7)
77b0357faf MDL-38887 block nav: reshifter module 2013-04-09 10:28:24 +02:00
David Monllao
9bfdaaa541 MDL-38938 behat: New test
According to MDLQA-38, a teacher can
choose whether to allow duplicate
entries in a glossary.
2013-04-09 16:02:16 +08:00
David Monllao
00d373efc5 MDL-38938 behat: Step definition to add glossary entries 2013-04-09 16:01:43 +08:00
Dan Poltawski
ca0b1f57fc Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle 2013-04-09 15:39:57 +08:00
Damyon Wiese
92674e324e Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle 2013-04-09 15:13:21 +08:00
David Monllao
3d7848c584 MDL-38950 behat: New tests
According to MDLQA-1765, a selected
file can be cancelled. Also adding
a test for repository_recent.
2013-04-09 15:02:11 +08:00
David Monllao
a2fd9c6fe4 MDL-38950 behat: Step definition to add files from recent files repo 2013-04-09 15:01:16 +08:00
David Monllao
0b297fdc37 MDL-38950 behat: File manager elements contextual menu
Modified to work with both file manager elements
and file/folder elements inside modal windows.
2013-04-09 14:59:31 +08:00
Dan Poltawski
ad84f8f9ac Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle 2013-04-09 14:58:47 +08:00
Dan Poltawski
0ae1b8a294 Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle 2013-04-09 14:57:08 +08:00
Mark Nelson
f40df210ab MDL-26649 forms: added a calendar icon that will display the calendar pop-up when clicked rather than the select boxes triggering the event 2013-04-09 14:52:57 +08:00
Dan Poltawski
33815b4b7e Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 14:49:07 +08:00
Petr Škoda
6f55ce1893 MDL-38927 use role->localname to get real role name 2013-04-09 08:31:25 +02:00
Aparup Banerjee
45edc14126 Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle 2013-04-09 14:30:52 +08:00
Aparup Banerjee
eeb47dbd30 Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle 2013-04-09 14:21:22 +08:00