Commit graph

12718 commits

Author SHA1 Message Date
Dan Poltawski
620ecd38d2 Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle 2012-06-07 18:11:10 +08:00
Barbara Ramiro
89e00e91cd MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow 2012-06-07 18:09:14 +08:00
Dan Poltawski
644495114e Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign 2012-06-07 17:33:39 +08:00
Dan Poltawski
a6eecb7c9d Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle 2012-06-07 17:25:59 +08:00
Andrew Robert Nicols
7ccec1e2cf MDL-33535 Correct typo in glossary documentation link 2012-06-07 09:17:40 +01:00
Dan Poltawski
c9978ce67b Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle 2012-06-07 14:29:08 +08:00
Damyon Wiese
eba009ea63 MDL-33475: Fix javascript error when advanced grading is used in mod_assign 2012-06-07 10:52:05 +08:00
Damyon Wiese
2d8a9ce96c MDL-33572: Make the display of the "graded" status consistent in mod_assign
Do not display "graded" when the grade is set to -1.
2012-06-07 10:22:46 +08:00
Damyon Wiese
4913af936f MDL-33498: Correct use of unformat_float for mod_assign decimal grades
This was affecting locales that use , instead of . in floating point numbers.
2012-06-07 09:27:59 +08:00
Andreas Grabs
e7fc2ff42e MDL-27675 - Feedback module abuses data_submitted 2012-06-06 23:17:35 +02:00
Tim Hunt
ee326d5e7d MDL-33548 quiz manual grading: check the grade is in range.
To do this nicely, I refactored some code out of the quiz manual grading
report.
2012-06-06 20:21:33 +01:00
Tim Hunt
f02a91fc50 MDL-33517 quiz: revise timelimit help string.
Thanks Helen.
2012-06-06 19:24:48 +01:00
Petr Skoda
3269c859bf MDL-33555 fix invalid FK in mod_assign
There is no need to upgrade DB because we create only indexes now.
2012-06-06 10:54:40 +02:00
Dan Poltawski
de6a0dfd3d Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign 2012-06-06 16:09:15 +08:00
Damyon Wiese
509e59ca38 MDL-33547: Fix for mod_assign portfolio export for a list of files.
This will fix any submission or feedback plugin using render_area_files
to show a list of files.
2012-06-06 15:49:37 +08:00
Dan Poltawski
7f04dd633f Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle 2012-06-06 13:20:59 +08:00
Frederic Massart
a8608cba3f MDL-33088 Glossary: disabled filtering on concepts in recent activity block 2012-06-06 12:57:02 +08:00
Aparup Banerjee
bfcf1a449c Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle 2012-06-06 11:07:08 +08:00
Dan Poltawski
c89331a4ca Merge branch 'MDL-33119' of git://github.com/timhunt/moodle 2012-06-06 10:31:12 +08:00
Frederic Massart
50d24a3c85 MDL-32325 Glossary: Entrylist print version is XHTML compliant 2012-06-06 09:55:36 +08:00
Jason Fowler
abaf245f10 MDL-33527 - Database - Fixing the ability to export database entries 2012-06-06 09:13:26 +08:00
Sam Hemelryk
f064f0fd15 Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle 2012-06-06 11:50:19 +12:00
Sam Hemelryk
f48de74428 Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle 2012-06-06 10:06:17 +12:00
Dan Poltawski
a16757ed9c Merge branch 'MDL-33042-master-1' of git://git.luns.net.uk/moodle 2012-06-05 12:52:39 +08:00
Dan Poltawski
ac0ad29c6f Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign 2012-06-05 12:03:56 +08:00
Dan Poltawski
f7091beef4 Merge branch 'MDL-33485' of git://github.com/timhunt/moodle 2012-06-05 10:16:44 +08:00
Dan Poltawski
92c1f40445 MDL-31460 mod_forum: fix trailing whitespace 2012-06-05 09:34:26 +08:00
Dan Poltawski
50bc155cce Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle 2012-06-05 09:33:38 +08:00
Andrew Davis
74a37e1deb MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete 2012-06-04 09:16:21 +07:00
Eloy Lafuente (stronk7)
34570f86bc MDL-33480 book print tool: display intro images properly 2012-06-04 01:46:53 +02:00
Petr Skoda
b208ded6cf MDL-33103 fix mod_data E_STRICT issue in import 2012-06-02 21:39:18 +02:00
Dan Poltawski
578d7f3dbd MDL-33487 - mod_forum: incorrect param ordering
Thanks to Garret Gengler for spotting it.
2012-06-01 23:35:26 +08:00
Tim Hunt
9378c99b02 MDL-33119 quiz complete report: fix placeholders in attempt string. 2012-06-01 08:45:41 -06:00
Tim Hunt
fc86f69b52 MDL-33485 quiz manual grading report: fix SQL typo. 2012-06-01 08:11:48 -06:00
Eloy Lafuente (stronk7)
dac01a7444 Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle 2012-05-31 16:14:57 +02:00
Aparup Banerjee
ffbe29a6bd Merge branch 'MDL-33140' of git://github.com/timhunt/moodle 2012-05-31 14:15:19 +08:00
Tim Hunt
602a76d86a MDL-33140 quiz browser security: block copy/paste more 2012-05-30 14:48:39 -06:00
Dan Poltawski
2605112e0b Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle 2012-05-30 14:14:50 +08:00
Sam Hemelryk
378eb6f6a2 Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"
This reverts commit a09a9be812, reversing
changes made to 08e0aaa173.
2012-05-30 16:34:11 +12:00
Dan Poltawski
d88f1a51fc Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 11:45:32 +08:00
Sam Hemelryk
6fbe06e530 Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 15:26:27 +12:00
Dan Poltawski
7e82553331 Merge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle 2012-05-30 09:38:22 +08:00
Damyon Wiese
0047693f09 MDL-33385: Assignment plugin settings not visible in admin tree.
* Also fixes a regression where file_submissions were not set to default for new installs.
2012-05-30 09:01:11 +08:00
Damyon Wiese
7ee1548acb MDL-33414: The setting $showviewlink needs to be passed by reference
This was preventing the view full submission/feedback link from appearing
everywhere in the assignment when the submission/feedback content had been
truncated in the summary because it was too long (or too many files)
2012-05-30 08:37:56 +08:00
kordan
311300e208 MDL-3389 mod_book: changed "Summary" to "Description" in mod_form 2012-05-29 19:23:33 +02:00
Dan Poltawski
e73b42ca57 Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle 2012-05-29 14:57:05 +08:00
Martin Dougiamas
5fece0f28d MDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page 2012-05-29 12:58:24 +08:00
Sam Hemelryk
849b9a6af7 MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts 2012-05-29 16:44:28 +12:00
Ruslan Kabalin
c1d09c6fa3 MDL-33042: Assign: get rid of email statements in messaging functions 2012-05-28 11:48:18 +01:00
Ruslan Kabalin
599f7a279c MDL-33045: Assign: remove references to old assignment in URLs 2012-05-28 10:53:40 +01:00