moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55288 commits 37 branches 540 tags 1.3 GiB
Commit graph

12553 commits

Author SHA1 Message Date
Dan Poltawski
d6c94cf4eb MDL-33069 assignment: change pluralname to (2.2) 2012-05-17 17:28:26 +08:00
Frederic Massart
096d4d8767 MDL-29924 Glossary: Entry attachments displayed in Moodle dialogue 2012-05-17 15:12:22 +08:00
Dan Poltawski
aa141671a3 Merge branch 'MDL-31814' of git://github.com/timhunt/moodle 2012-05-17 14:11:14 +08:00
Sam Hemelryk
b945325339 Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle 2012-05-17 14:49:03 +12:00
Sam Hemelryk
72f1957393 Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign 2012-05-17 14:24:40 +12:00
Damyon Wiese
d37ec15ca1 MDL-32903: Remove unused variable $tempsettings from mod_assign 
This was left over from when I removed all the pass by reference calls.
 2012-05-17 08:30:54 +08:00
Sam Hemelryk
bcc52e748a Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle 2012-05-17 12:27:50 +12:00
Sam Hemelryk
536e3203e7 Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign 2012-05-17 11:54:07 +12:00
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle 
Conflicts:
	course/lib.php
	theme/base/style/course.css
 2012-05-17 10:55:35 +12:00
Juho Viitasalo
e566bfa1ae MDL-31850 wiki: extra whitespace removed from form 2012-05-16 03:43:17 -07:00
Aparup Banerjee
485e67982c Merge branch 'MDL-32633' of git://github.com/timhunt/moodle 2012-05-16 15:59:07 +08:00
Aparup Banerjee
9e66e96049 Merge branch 'MDL-31657' of git://github.com/scriby/moodle 2012-05-16 14:32:51 +08:00
Aparup Banerjee
ca91bdcdf7 MDL-32921 lti : reused a moodle_url. 2012-05-16 13:49:32 +08:00
Aparup Banerjee
184287f0ce Merge branch 'MDL-32921' of git://github.com/scriby/moodle 2012-05-16 13:48:42 +08:00
Sam Hemelryk
19d1525f6b Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle 2012-05-16 13:14:59 +12:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
Sam Hemelryk
3cb5b9ccf6 Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle 2012-05-16 09:12:17 +12:00
Tim Hunt
4267fc5272 MDL-32727 quiz upgrade: sort out potential unique key violations 
... before trying to create the unique index that should be there.
The violations may come from old buggy code.

We do two things.
1. First we delete all previews.
2. Then, if there are still problems, we renumber attempts to eliminate
the duplicates.
 2012-05-15 15:23:53 +01:00
Damyon Wiese
bf78ebd650 MDL-32932: Add quickgrading support to mod_assign 2012-05-15 13:33:59 +08:00
Damyon Wiese
a769a00157 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-15 12:27:27 +08:00
Aparup Banerjee
c459e91789 Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle 2012-05-15 11:03:07 +08:00
Dan Marsden
0ae299769c MDL-32794 SCORM prevent items in tree that have no navigation from triggering a navigation change. 2012-05-15 09:36:35 +12:00
Dan Poltawski
bf9b08dd5e Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle 2012-05-14 14:26:29 +08:00
Dan Poltawski
ec3f19bddb Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle 2012-05-14 14:23:41 +08:00
Dan Poltawski
a225149c9a Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle 2012-05-14 14:12:30 +08:00
Dan Poltawski
b728070f5d Merge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign 2012-05-14 14:08:27 +08:00
Dan Poltawski
77acdb26f2 Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle 2012-05-14 14:06:37 +08:00
Dan Poltawski
3359a6fe07 Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle 2012-05-14 13:36:11 +08:00
Damyon Wiese
5b12114476 MDL-32895: Improvements to assignment upgrade tool for large numbers of assignments. 
* Form to control the perpage variable for the upgradable assignments table.
    * Set timeout and increase memory limit for batch upgrades
    * Output/renderer pages to the upgrade progress is progressively displayed
    * Cleanup of relative includes in assignmentupgrade tool
    * More verbose errors reported for failed upgrades
 2012-05-14 12:53:21 +08:00
Damyon Wiese
3b6bbd767b MDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission screen. 2012-05-14 11:39:42 +08:00
Damyon Wiese
12945803b8 MDL-32904: Fix incorrect call to update_record (not causing an error) 2012-05-14 11:34:08 +08:00
Damyon Wiese
b11808c7d6 MDL-32909: assign_user_get_grades does not need to lookup context and was doing it wrong 
cmidnumber is not the same as coursemodule->id
 2012-05-14 11:29:43 +08:00
Damyon Wiese
c45261df97 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-14 11:23:40 +08:00
Sam Hemelryk
86558590a4 Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle 2012-05-14 14:52:10 +12:00
Dan Poltawski
e87a7c65f1 Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle 2012-05-14 10:41:46 +08:00
Dan Poltawski
41ea0d3cc2 Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle 2012-05-14 10:28:05 +08:00
Adrian Greeve
0ba303e85f MDL-32126 - data - Fix of an error when sorting by other criteria. 2012-05-14 07:27:01 +08:00
Petr Skoda
7edfd54fcf MDL-32915 fix bogus open div in basic chat ui 2012-05-13 10:24:43 +02:00
Petr Skoda
d59ef9c5ab MDL-32926 exorcise setUser(2) evil from phpunit 2012-05-12 21:42:07 +02:00
David Mudrak
d20bffa2fd MDL-32714 workshop: fixed SQL to load assessment form fields 
Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
 2012-05-12 10:27:34 +02:00
Tim Hunt
62a3bfb37e MDL-32633 quiz editing: recreate grade item when max changed from 0 2012-05-11 20:23:37 +01:00
Dan Poltawski
93f11331e4 MDL-31458 forum: email subjects containing ampersand are sent as & 2012-05-11 15:25:26 +08:00
Frederic Massart
50a8374ef8 MDL-30649 Glossary : Fixed floating element breaking HTML 2012-05-11 10:53:22 +08:00
Ankit Agarwal
3afe75a79c MDL-31902 general: Removing deprecated functions 2012-05-11 10:30:40 +08:00
Rajesh Taneja
5d8215ccf4 MDL-31941 chat: removed chat_get_participants, deprecated function 2012-05-11 09:21:04 +08:00
Chris Scribner
bc2a92aeda MDL-32921: Fixing an issue with adding LTI tool providers from the admin UI 2012-05-10 12:07:13 -04:00
Chris Scribner
66c1441213 MDL-31657: Remove some unused LTI localization strings 2012-05-10 09:43:23 -04:00
Andrew Robert Nicols
96c8f933fd MDL-32641 Ensure that the form change protector does not kick in when adding/editing feedback questions 2012-05-10 12:15:24 +01:00
Ankit Agarwal
99c4dcd3e2 MDL-31944 feedback: remove deprecated function feedback_get_participants() 2012-05-10 15:16:47 +08:00
Dan Poltawski
b84eb3cf20 Merge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign 2012-05-10 14:24:20 +08:00