Commit graph

56823 commits

Author SHA1 Message Date
Juho Viitasalo
1923720566 Changed two notification to output correctly 2012-08-21 15:36:34 +08:00
Dan Poltawski
5a566ceac7 Merge branch 'MDL-34691_assign_overdue_by_23' of https://github.com/SWiT/moodle into MOODLE_23_STABLE 2012-08-21 14:37:10 +08:00
Dan Poltawski
82157094e5 Merge branch 'MDL-32705_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-21 12:37:54 +08:00
Dan Poltawski
115ad6cc9e Merge branch 'MDL-34569_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-08-21 12:35:14 +08:00
Eric Merrill
35870a76db MDL-34363 gradebook Adding check to prevent incorrect override when a blank feedback is submitted. 2012-08-21 00:26:55 -04:00
Dan Poltawski
f6376dcbae Merge branch 'w34_MDL-34901_m23_useraccess' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-21 12:02:25 +08:00
Dan Poltawski
ed22220593 Merge branch 'MDL-34742-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-21 11:59:30 +08:00
Dan Poltawski
8172f3b2d3 MDL-34808 qformat_examview - increment version 2012-08-21 11:05:58 +08:00
Dan Poltawski
b02734b77d Merge branch 'MDL-34808_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE 2012-08-21 11:00:49 +08:00
Raymond Wijaya
8c74ab8623 MDL-34887: Add hyperlinks to names in the Assignment's grading table 2012-08-21 10:58:09 +08:00
David Monllao
b16b42e9e2 MDL-31496 mod_data Replacing inline styles for CSS classes in templates and browse view 2012-08-21 10:49:03 +08:00
David Monllao
d1e338c98b MDL-31496 mod_data Replacing inline styles for CSS classes in text inputs 2012-08-21 10:49:03 +08:00
David Monllao
108dd3376c MDL-31496 mod_data Replacing inline styles for CSS classes in search containers 2012-08-21 10:49:03 +08:00
David Monllao
a415852d2b MDL-31496 mod_data Replacing inline styles for CSS classes in textarea elements 2012-08-21 10:49:03 +08:00
Dan Poltawski
b747690361 MDL-34738 qformat_blackboard - increment version number 2012-08-21 09:55:50 +08:00
Dan Poltawski
d73f22d94e Merge branch 'MDL-34738_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE 2012-08-21 09:42:12 +08:00
Eloy Lafuente (stronk7)
181884b480 Merge branch 'MDL-34941-MOODLE_23_STABLE' of https://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2012-08-21 02:43:10 +02:00
Eloy Lafuente (stronk7)
9b7738c8fb Merge branch 'w34_MDL-34912_m23_description' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-21 02:39:58 +02:00
Eloy Lafuente (stronk7)
a130109013 Merge branch 'MDL-34889_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-21 02:25:28 +02:00
Eloy Lafuente (stronk7)
ac97fc2122 Merge branch 'MDL-34810_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-21 01:36:36 +02:00
Eloy Lafuente (stronk7)
9da82e9ba3 Merge branch 'MDL-29847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-21 01:28:50 +02:00
Eloy Lafuente (stronk7)
0c6800e771 Merge branch 'MDL-31957-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2012-08-21 01:23:05 +02:00
Eric Merrill
2d0a11ee94 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:13:10 -04:00
Eloy Lafuente (stronk7)
3dd2dce1cb Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-20 20:30:27 +02:00
Eloy Lafuente (stronk7)
1c5f24e089 Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-20 20:18:03 +02:00
Eloy Lafuente (stronk7)
331d346e8f Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-20 16:35:20 +02:00
Eloy Lafuente (stronk7)
8ee474b89e Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-20 16:28:21 +02:00
Jason Ilicic
3f7df55d1c MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter. 2012-08-20 14:00:26 +02:00
Nathan Mares
c6d7689621 MDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3
Amended by stronk7@moodle.org to use uppercase SQL keywords.
2012-08-20 13:28:37 +02:00
Jean-Michel Vedrine
2e941f3356 MDL-34808 load sample xml file from fixtures in tests 2012-08-20 10:47:31 +02:00
Dan Poltawski
bab65024ad Merge branch 'MDL-33362-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE 2012-08-20 16:01:21 +08:00
Dan Poltawski
dcf82e6079 Merge branch 'MDL-34779-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE 2012-08-20 15:59:00 +08:00
Jean-Michel Vedrine
f3ad0ed27d MDL-34738 load sample dat file in tests 2012-08-20 09:52:53 +02:00
Michael de Raadt
b8cc020064 MDL-34779 settings: Updating lang string corrposnding to the fullnamedisplay setting 2012-08-20 15:44:42 +08:00
Dan Poltawski
fc08030d8e Merge branch 'w34_MDL-34873_m23_tagstrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-20 15:21:26 +08:00
Dan Poltawski
21fcca106d Merge branch 'MDL-34957_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2012-08-20 14:23:28 +08:00
Dan Poltawski
7bb562cdf0 Merge branch 'MDL-34937_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-20 14:19:30 +08:00
Raymond Wijaya
ae21b71925 MDL-34377: Fix: assignments overview page shows a unset due date as Epoch and counts draft submissions 2012-08-20 14:11:59 +08:00
Ankit Agarwal
9ff0c0bb84 MDL-33362 book: Parse links to book modules from 1.9 backups 2012-08-20 12:59:19 +08:00
Dan Poltawski
0ec0602415 Merge branch 'MDL-34535-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE 2012-08-20 12:06:56 +08:00
Dan Poltawski
e013292e25 Merge branch 'wip-MDL-31810-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2012-08-20 12:01:32 +08:00
Dan Poltawski
f6aabcf0ed Merge branch 'wip-mdl-31734-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2012-08-20 11:57:21 +08:00
Dan Poltawski
67f0e8fe87 Merge branch 'MDL-30405-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-20 11:39:59 +08:00
Dan Poltawski
854bec4500 Merge branch 'MDL-30370_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE 2012-08-20 11:22:26 +08:00
Frederic Massart
70746c433c MDL-34756 Unit Tests: Move backup helper tests 2012-08-20 10:26:16 +08:00
Andrew Davis
39e39bd437 MDL-34406 message: removed an unnecessary string creation 2012-08-20 10:13:53 +08:00
Petr Škoda
db6842cca3 MDL-34893 use standard options in Hint_ResultPrinter
This is a very nasty hack!
2012-08-19 22:10:37 +02:00
Petr Škoda
7e84ef4fea MDL-34959 add Google Maps API V3 support 2012-08-19 19:53:06 +02:00
Petr Škoda
778947cd65 MDL-34868 update deprecated Google maps API V2 key info 2012-08-19 18:21:37 +02:00
Jean-Michel Vedrine
1ff3389a54 MDL-34808 qformat examview Add phpunit tests to examview import format 2012-08-19 16:35:21 +02:00