Commit graph

58031 commits

Author SHA1 Message Date
Dan Poltawski
1b01909597 Merge branch 'w47_MDL-36547_m24_sectiongen' of git://github.com/skodak/moodle 2012-11-21 15:26:15 +08:00
Barbara Ramiro
dcb9160579 MDL-36630 usability: 16x16 version of drag and drop icon 2012-11-21 15:22:26 +08:00
Dan Poltawski
3866195155 Merge branch 'MDL-30884' of git://github.com/timhunt/moodle 2012-11-21 15:19:15 +08:00
Dan Poltawski
e5556885eb Merge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle 2012-11-21 15:15:23 +08:00
Frederic Massart
58e4233ecb MDL-36639 blog: Resized associated module icon 2012-11-21 13:59:57 +08:00
Dan Poltawski
c9f5160438 Merge branch 'MDL-36720-updates-via-https' of git://github.com/mudrd8mz/moodle 2012-11-21 13:48:04 +08:00
Damyon Wiese
34b8f3a83d MDL-35963: Assignment - do not accept empty submissions 2012-11-21 13:46:50 +08:00
Mark Nelson
1d747df105 MDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanager for all supported browsers 2012-11-21 12:04:35 +08:00
Dan Poltawski
8068fcb5b6 Merge branch 'MDL-35675-master' of git://github.com/FMCorz/moodle 2012-11-21 12:02:48 +08:00
Dan Poltawski
77f948a2f7 Merge branch 'MDL-36289' of git://github.com/netspotau/moodle-mod_assign 2012-11-21 12:00:28 +08:00
Damyon Wiese
37eb2caa40 MDL-36012: Assignment, Accessibility - Add user information to alt text for grade icon in grading table. 2012-11-21 11:57:47 +08:00
Dan Poltawski
31112f3bab Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle 2012-11-21 11:56:44 +08:00
Dan Poltawski
e4837b8a25 Merge branch 'MDL-30377_master' of git://github.com/markn86/moodle 2012-11-21 11:52:32 +08:00
Dan Poltawski
77307db208 Merge branch 'MDL-36170_master' of https://github.com/jfilip/moodle 2012-11-21 11:47:17 +08:00
Rossiani Wijaya
46ac70b24c MDL-36549 Lesson module: fixed strict standards errors 2012-11-21 11:22:23 +08:00
Damyon Wiese
11b2094968 MDL-36184: Assignment quickgrading should only update lastmodified dates for modified submissions 2012-11-21 11:10:12 +08:00
Aparup Banerjee
9cae08dac4 MDL-36614 fixed version upgrade conflict (git why you no tell me about conflict!) 2012-11-21 10:49:44 +08:00
Aparup Banerjee
6bf410ed4b Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	calendar/lib.php (MDL-36615)
	calendar/managesubscriptions_form.php (MDL-36352)
2012-11-21 10:29:04 +08:00
Adrian Greeve
c600a85c5e MDL-36551 - mod_data: Onsite presets now retain the advanced search template.
Presets that were saved to the site would lose the advanced search template when being used.
The previous check was put in place to see if the advanced search template existed or not (presets pre 1.9),
This checked external files properly but not onsite files.

Now checks are being done on both internal and external preset files.
2012-11-21 09:57:34 +08:00
Damyon Wiese
be79d93fae MDL-36167: Assignment quickgrading fix when there is no grade (ensure feedback still saves)
This patch modifies the previous on by Luke Tucker so that the lastmodified hidden field
is always added to the quickgrading form even if there is no grade for the assignment. This
ensures that the lastmodified checks still work (to prevent teachers overwriting each
others feedback) and feedback is saved when there is no grade.
2012-11-21 09:26:48 +08:00
Luke Tucker
90387b1094 MDL-36167: Update all users in assignment quickgrade form to ensure feedback is saved 2012-11-21 09:26:48 +08:00
Eloy Lafuente (stronk7)
d937f597e7 Merge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle 2012-11-21 00:55:18 +01:00
Sam Hemelryk
82053086bc Merge branch 'wip-MDL-28583-master' of git://github.com/marinaglancy/moodle 2012-11-21 09:15:34 +13:00
Sam Hemelryk
d540132fb5 Merge branch 'MDL-25552_master' of git://github.com/markn86/moodle 2012-11-21 09:00:35 +13:00
David Mudrák
40a9c2e531 MDL-36720 Fetch available updates info via HTTPS 2012-11-20 15:51:35 +01:00
Petr Škoda
5689fb0bc8 MDL-36719 try to work around course format caching issue in installer 2012-11-20 15:41:06 +01:00
Petr Škoda
e271f71da4 MDL-36719 update $SITE caches in rebuild_course_cache() 2012-11-20 15:39:43 +01:00
Justin Filip
e08bb715e7 MDL-36170 - mod/data - Don't display the blocks editing button within table HTML, use a standard API to create it. 2012-11-20 09:01:29 -05:00
Tim Hunt
e498f21421 MDL-30884 quiz: ARIA attribute for the coutdown timer. 2012-11-20 13:18:02 +00:00
Petr Škoda
40b9c0694c MDL-36436 use hacky aspect ratio to work around IE9 issues 2012-11-20 13:01:27 +01:00
Petr Škoda
741797453b MDL-36436 add simple svg hacking tool for icon designers
This should solve some IE9 issues with icon cut-off.
2012-11-20 13:00:53 +01:00
Petr Škoda
3a7bc16ad7 MDL-36701 support for PHPUnit installation via Composer packaging system
See http://getcomposer.org/doc/00-intro.md
2012-11-20 11:27:35 +01:00
Mark Nelson
684c3be721 MDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletion of a file 2012-11-20 17:43:50 +08:00
Aparup Banerjee
4bb2e5c4b2 Merge branch 'wip-mdl-36707' of git://github.com/rajeshtaneja/moodle 2012-11-20 16:22:27 +08:00
Dan Poltawski
c796b506be Merge branch 'MDL-33863' of git://github.com/timhunt/moodle 2012-11-20 16:15:16 +08:00
Dan Poltawski
7a12ad1286 Merge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle 2012-11-20 16:09:49 +08:00
Dan Poltawski
3a31c0349a Merge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle 2012-11-20 16:07:59 +08:00
Dan Poltawski
30e0a6e5ba Merge branch 'MDL-36659-master' of git://github.com/FMCorz/moodle 2012-11-20 16:06:08 +08:00
Dan Poltawski
dab8ed3b24 Merge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle 2012-11-20 16:04:08 +08:00
Dan Poltawski
bdd3779064 Merge branch 'w47_MDL-36703_m24_enrolgenerator' of git://github.com/skodak/moodle 2012-11-20 16:01:41 +08:00
Dan Poltawski
109473368d Merge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com/scara/moodle 2012-11-20 15:57:53 +08:00
Dan Poltawski
f132526512 Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle 2012-11-20 15:31:27 +08:00
Dan Poltawski
3d51f11c9a Merge branch 'MDL-36679-master' of github.com:damyon/moodle 2012-11-20 15:25:20 +08:00
Dan Poltawski
9d1989daa7 Merge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle 2012-11-20 15:15:43 +08:00
Dan Poltawski
430f5aaac0 Merge branch 'MDL-36646' of git://github.com/timhunt/moodle 2012-11-20 15:06:21 +08:00
Dan Poltawski
941cf79fdc Merge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle 2012-11-20 15:03:39 +08:00
Dan Poltawski
91b0d0b75a Merge branch 'MDL-36571' of git://github.com/timhunt/moodle 2012-11-20 14:59:34 +08:00
Frederic Massart
f19d57e514 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:58:33 +08:00
Dan Poltawski
4dc87c7730 Merge branch 'MDL-36564-master-int' of git://github.com/FMCorz/moodle 2012-11-20 14:46:54 +08:00
Dan Poltawski
7a39c933b9 Merge branch 'MDL-36548_master' of git://github.com/pauln/moodle 2012-11-20 14:44:35 +08:00