Eloy Lafuente (stronk7)
df27efbd46
Merge branch 'wip-mdl-32759-warning' of git://github.com/rajeshtaneja/moodle
2012-08-22 02:33:34 +02:00
Eloy Lafuente (stronk7)
b85b7b34b2
Merge branch 'MDL-34702' of git://github.com/timhunt/moodle
2012-08-22 02:10:22 +02:00
Eloy Lafuente (stronk7)
9075481920
Merge branch 'MDL-34795' of git://github.com/srynot4sale/moodle
2012-08-22 02:04:47 +02:00
Eloy Lafuente (stronk7)
a477affda0
Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle
2012-08-22 01:58:13 +02:00
Eloy Lafuente (stronk7)
41624a5682
Merge branch 'w34_MDL-34776_m24_notinsql' of git://github.com/skodak/moodle
2012-08-22 01:55:34 +02:00
Eloy Lafuente (stronk7)
479fa62207
MDL-34866 whitespace fix
2012-08-22 01:48:45 +02:00
Eloy Lafuente (stronk7)
1f0f592cea
Merge branch 'MDL-34866' of git://github.com/rlorenzo/moodle
2012-08-22 01:47:20 +02:00
Dan Marsden
f518ff588d
MDL-34994 mod_choice: fix restore of user responses - use correct optionid
2012-08-22 09:01:54 +12:00
Eloy Lafuente (stronk7)
dd12051df2
Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle
2012-08-21 22:24:20 +02:00
Eloy Lafuente (stronk7)
77dd8ab1de
Merge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle
2012-08-21 21:18:15 +02:00
Tim Hunt
172238f435
MDL-35000 quiz: Complete activity report broken by bad require.
...
Fix the stupid error that caused this. Also, make all the other
require_once calls in the file consistent.
2012-08-21 18:01:32 +01:00
Tim Hunt
d869de66a6
MDL-34733 quiz 'secure' mode: finish review link broken in previews
...
This fix a small API change in mod_quiz_renderer::finish_review_link.
At least the required change is an improvement, since it gives the
renderer more flexibility.
2012-08-21 12:08:57 +01:00
Dan Poltawski
d81c02feef
Merge branch 'w34_MDL-34876_m24_tinymceuninstall' of git://github.com/skodak/moodle
2012-08-21 15:44:46 +08:00
Petr Škoda
2cd58c83ea
MDL-34876 improve coding style
2012-08-21 09:40:10 +02:00
Juho Viitasalo
9ce8411317
Changed two notification to output correctly
2012-08-21 15:33:39 +08:00
Aparup Banerjee
9949e91a57
MDL-34991 Messaging : Fixed rendering of notifications with CRLF to go through text_to_html() in message notifications view page.
2012-08-21 15:23:56 +08:00
Dan Poltawski
9e5680f100
MDL-34648 - increment version number
2012-08-21 14:40:51 +08:00
Dan Poltawski
f418f82e52
Merge branch 'MDL-34648-master' of git://github.com/FMCorz/moodle
2012-08-21 14:39:54 +08:00
Dan Poltawski
5d9e2ab19e
Merge branch 'MDL-34691_assign_overdue_by' of https://github.com/SWiT/moodle
2012-08-21 14:36:41 +08:00
Adrian Greeve
2b7ece005e
MDL-6424 - blocks - Adding a warning screen when the user clicks the delete link.
2012-08-21 14:31:24 +08:00
Dan Poltawski
b6476885a4
Merge branch 'wip-mdl-34293' of git://github.com/rajeshtaneja/moodle
2012-08-21 13:56:58 +08:00
Rajesh Taneja
4625404451
MDL-34293 Themes: Added tbody to flexible table
2012-08-21 13:50:38 +08:00
Frederic Massart
ad778c84e8
MDL-34648 Course: Added capability to control sections moving
2012-08-21 13:31:19 +08:00
Dan Poltawski
509b17c71d
Merge branch 'MDL-32705' of git://github.com/timhunt/moodle
2012-08-21 12:37:43 +08:00
Dan Poltawski
828ecbaf13
Merge branch 'MDL-34569_accessibility' of git://github.com/rwijaya/moodle
2012-08-21 12:35:05 +08:00
Dan Poltawski
34f5898f5e
Merge branch 'MDL-34118' of git://github.com/timhunt/moodle
2012-08-21 12:29:16 +08:00
Dan Poltawski
3a66d4255d
MDL-31341 mod_assign: fixup minor coding style issues
2012-08-21 12:18:40 +08:00
Dan Poltawski
94fb9f9fae
Merge branch 'MDL-31341' of git://github.com/netspotau/moodle-mod_assign
2012-08-21 12:13:51 +08:00
Dan Poltawski
6c6604350d
Merge branch 'w34_MDL-34901_m24_useraccess' of git://github.com/skodak/moodle
2012-08-21 12:02:17 +08:00
Dan Poltawski
74c0bc34d7
Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle
2012-08-21 11:59:14 +08:00
Dan Poltawski
92158c9b4a
Merge branch 'wip-mdl-32797' of git://github.com/rajeshtaneja/moodle
2012-08-21 11:48:58 +08:00
Dan Poltawski
29e8b15d83
MDL-34808 qformat_examview - increment version
2012-08-21 11:05:22 +08:00
Dan Poltawski
6a721e3ebb
Merge branch 'MDL-34808' of git://github.com/jmvedrine/moodle
2012-08-21 11:00:38 +08:00
Dan Poltawski
8cf68e0d5c
Merge branch 'MDL-34887' of git://github.com/raymondAntonio/moodle
2012-08-21 10:53:53 +08:00
David Monllao
649ac85dec
MDL-31496 mod_data Replacing inline styles for CSS classes in templates and browse view
2012-08-21 10:40:29 +08:00
Dan Poltawski
d642260cfe
Merge branch 'w34_MDL-34954_m24_subplugins' of git://github.com/skodak/moodle
2012-08-21 10:34:28 +08:00
Dan Poltawski
115728888a
MDL-34738 qformat_blackboard - increment version number
2012-08-21 09:56:29 +08:00
Dan Poltawski
2a455e13e7
Merge branch 'MDL-34738' of git://github.com/jmvedrine/moodle
2012-08-21 09:39:50 +08:00
Eloy Lafuente (stronk7)
70d6e4c123
Merge branch 'MDL-34941' of https://github.com/mouneyrac/moodle
2012-08-21 02:42:33 +02:00
Eloy Lafuente (stronk7)
fffb9b9064
Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle
2012-08-21 02:39:10 +02:00
Eloy Lafuente (stronk7)
ee998a687c
Merge branch 'MDL-34889' of git://github.com/timhunt/moodle
2012-08-21 02:24:50 +02:00
Eloy Lafuente (stronk7)
2bdbe66264
Merge branch 'MDL-34810' of git://github.com/timhunt/moodle
2012-08-21 01:36:15 +02:00
Eloy Lafuente (stronk7)
afe404068d
Merge branch 'MDL-29847' of git://github.com/timhunt/moodle
2012-08-21 01:28:34 +02:00
Eloy Lafuente (stronk7)
57733008c9
Merge branch 'MDL-31957-master' of git://github.com/sammarshallou/moodle
2012-08-21 01:21:18 +02:00
Eric Merrill
13f87cb21e
MDL-34985 gradebook Fixing issue where default parent in Full View Add Category could be inconsistent.
...
Turns out the correct default was already computed, but was not being applied to the setting.
2012-08-20 17:09:40 -04:00
Eloy Lafuente (stronk7)
2672817478
Merge branch 'w34_MDL-34960_m24_gmapsv2drop' of git://github.com/skodak/moodle
2012-08-20 20:34:13 +02:00
Eloy Lafuente (stronk7)
5bed363980
Merge branch 'w34_MDL-34959_m24_gmapsv3' of git://github.com/skodak/moodle
2012-08-20 20:28:59 +02:00
Eloy Lafuente (stronk7)
fae6f7cad0
Merge branch 'w34_MDL-34868_m24_gmapsv2' of git://github.com/skodak/moodle
2012-08-20 20:17:27 +02:00
Eloy Lafuente (stronk7)
040d4c63be
Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle
2012-08-20 16:34:18 +02:00
Eloy Lafuente (stronk7)
53db05a507
Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle
2012-08-20 16:28:09 +02:00