49600 Commits

Author SHA1 Message Date
Petr Skoda
9845bd201f MDL-29914 remove unused CodeSniffer lib 2011-10-25 09:14:29 +02:00
Eloy Lafuente (stronk7)
3a81b37617 emergency release 2.2dev 2011-10-20 00:53:26 +02:00
Eloy Lafuente (stronk7)
3cb206f575 MDL-29496 course search - emergency regression fix 2011-10-20 00:49:02 +02:00
Eloy Lafuente (stronk7)
401d480d81 weekly release 2.2dev 2011-10-19 18:44:16 +02:00
Eloy Lafuente (stronk7)
4b8a3a7b41 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-10-19 18:41:14 +02:00
Sam Hemelryk
7229f239f3 MDL-28945 course_reports: Fixed up pagination issue 2011-10-19 16:50:23 +13:00
Sam Hemelryk
9a23f94bd9 MDL-26953 theme_nonzero: Quick fix to incorrect left position 2011-10-19 16:26:31 +13:00
Eloy Lafuente (stronk7)
2c6da73106 MDL-29602 unittest - fixing other tests to work with new accesslib 2011-10-19 01:37:30 +02:00
Eloy Lafuente (stronk7)
c2551ed593 Merge branch 'w41_MDL-29602_m22_accesslib' of git://github.com/skodak/moodle 2011-10-18 13:15:13 +02:00
sam marshall
f2b1537bd3 MDL-29719 Category page typo fix 2011-10-18 11:43:01 +02:00
Eloy Lafuente (stronk7)
92e0466957 Merge branch 'MDL-29627' of git://github.com/timhunt/moodle 2011-10-18 11:22:15 +02:00
Eloy Lafuente (stronk7)
bca8b79e2a Merge branch 'MDL-28491' of git://github.com/timhunt/moodle 2011-10-18 11:08:15 +02:00
Eloy Lafuente (stronk7)
36903cece3 Merge branch 'wip-MDL-29496-master' of git://github.com/phalacee/moodle 2011-10-18 11:00:04 +02:00
Eloy Lafuente (stronk7)
fc0aebb595 MDL-29496 unittests - verify COALESCE() cross-db compatibility 2011-10-18 15:58:56 +08:00
Tim Hunt
0e2274c382 MDL-28491 fix notice because $page was undefined. 2011-10-18 08:40:02 +01:00
Tim Hunt
e4df79dd9c MDL-29627 quiz access rules: quiz edit settings was broken with no custom rules installed.
Thanks to Apu for reporting this.
2011-10-18 08:22:05 +01:00
Aparup Banerjee
77c3e9d0c6 MDL-29768 Language : fixed installation undefined debugstringids notice 2011-10-18 11:19:43 +08:00
Sam Hemelryk
f856216cb1 Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution 2011-10-18 14:31:34 +13:00
Eloy Lafuente (stronk7)
065d6d80a2 Merge branch 'MDL-29627' of git://github.com/timhunt/moodle 2011-10-18 01:44:58 +02:00
Tim Hunt
613002ced4 MDL-29627 quiz access rules: fix two little problems found during integration.
Missing include was breaking unit tests if they were run separately.

Missing breaks in one switch.
2011-10-18 00:39:22 +01:00
Eloy Lafuente (stronk7)
b0ef6d0420 NOBUG: Minibump to get css/js pruned everywhere 2011-10-18 01:37:09 +02:00
Eloy Lafuente (stronk7)
c6015af280 Merge branch 'MDL-28613' of git://github.com/timhunt/moodle 2011-10-18 01:35:34 +02:00
Eloy Lafuente (stronk7)
c78238f151 Merge branch 'MDL-28614' of git://github.com/timhunt/moodle 2011-10-18 00:58:09 +02:00
Tim Hunt
6fd1995d3b MDL-28614 questions: remove another obsolete editing_head_contributions fn. 2011-10-17 23:53:53 +01:00
Sam Hemelryk
4f50a62635 Merge branch 'MDL-29501-master' of git://github.com/sammarshallou/moodle 2011-10-18 11:38:26 +13:00
Sam Hemelryk
e797476fd2 MDL-29695 enrol-cohort: Minor code improvement 2011-10-18 11:02:00 +13:00
Ruslan Kabalin
543009cba4 MDL-29695 cohorts: Add pagination and search to cohorts adminstartion page 2011-10-18 10:54:59 +13:00
Ruslan Kabalin
22a811be2d MDL-29695 enrol: cohort: Add pagination and search to quickenrolment interface 2011-10-18 10:54:51 +13:00
Eloy Lafuente (stronk7)
ebb9cd230b Merge branch 'MDL-28614' of git://github.com/timhunt/moodle 2011-10-17 23:09:03 +02:00
Eloy Lafuente (stronk7)
cb284e953c Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle 2011-10-17 21:24:39 +02:00
Tim Hunt
1b796a2700 MDL-28491 diplay the quiz navigation on the summary page.
This makes the UI more consistent as you work through the quiz. The improvement is more noticable in some themes than others.
2011-10-17 12:06:44 +01:00
Tim Hunt
46e40567fa MDL-28614 qtypes: get_editing_head_contributions not used any more. Remove from base class. 2011-10-17 11:42:41 +01:00
Tim Hunt
891df4a949 MDL-28613 question CSS. Some text in the grey info box is the wrong size.
Note that according to http://www.quirksmode.org/css/contents.html, the > CSS selector works in IE 7+, so is probably now safe to use.
2011-10-17 11:28:49 +01:00
Eloy Lafuente (stronk7)
a598a8d4b1 Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle 2011-10-17 12:05:05 +02:00
sam marshall
7fb4699266 MDL-29719 Option to display course shortname alongside fullname on course lists 2011-10-17 10:50:59 +01:00
Eloy Lafuente (stronk7)
22ca3e49e0 NOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435) 2011-10-17 10:19:59 +02:00
Sam Hemelryk
ff90023b00 Merge branch 'MDL-28170' of git://github.com/stronk7/moodle 2011-10-17 18:52:23 +13:00
Sam Hemelryk
22ca670f88 Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle 2011-10-17 17:37:49 +13:00
Sam Hemelryk
5f6de5dc6b Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle 2011-10-17 17:31:52 +13:00
Sam Hemelryk
d97505d2a3 Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle 2011-10-17 17:28:32 +13:00
Sam Hemelryk
a6ec1940c8 Merge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle 2011-10-17 16:25:33 +13:00
Sam Hemelryk
f7e8e43f2d Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle 2011-10-17 15:21:45 +13:00
Sam Hemelryk
b55853ff63 Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle 2011-10-17 13:54:03 +13:00
Sam Hemelryk
92fe97f922 Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements 2011-10-17 13:18:30 +13:00
Eloy Lafuente (stronk7)
77c36d4ce8 MDL-28170 environment - add new 2.2 section
nothing changes from 2.1 as far as it was agreed that this will be
the last version supporting 1.9 upgrade. See issue for details.
2011-10-17 02:09:46 +02:00
Sam Hemelryk
f35c45006a MDL-19488 mod_feedback: Coding style improvement 2011-10-17 11:12:33 +13:00
Sam Hemelryk
629aa44873 Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle 2011-10-17 11:07:25 +13:00
Eloy Lafuente (stronk7)
e02ddb9be8 Merge branch 'MDL-28219d' of git://github.com/bostelm/moodle 2011-10-16 21:16:38 +02:00
Eloy Lafuente (stronk7)
6966fea5f8 Merge branch 'MDL-27351' of git://github.com/nebgor/moodle 2011-10-16 19:21:57 +02:00
Eloy Lafuente (stronk7)
3452a2db90 Merge branch 'MDL-28436' of git://github.com/nebgor/moodle 2011-10-16 19:13:00 +02:00