Commit graph

12718 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
98cef39d28 MDL-32709 book: Add some missing MOODLE_INTERNALs 2012-05-20 21:47:38 +02:00
Eloy Lafuente (stronk7)
3542c4f4a9 MDL-32709 book: general comments and phpdocs cleanup 2012-05-20 21:47:29 +02:00
Eloy Lafuente (stronk7)
e81c01b676 Subtree merged git://github.com/skodak/moodle-mod_book.git (master branch) into mod/book 2012-05-20 21:43:40 +02:00
Vadim Dvorovenko
5429460127 MDL-26562 2012-05-20 19:44:32 +07:00
Petr Skoda
103f34d88d MDL-32379 fix forum cron user caching 2012-05-19 18:56:19 +02:00
Adrian Greeve
0a498686c0 MDL-32126 replaced _order with sortorder to make sorting work in oracle 2012-05-18 11:37:21 +02:00
Dan Poltawski
eeba64d02e MDL-32727 - quiz: fix incorrect variable name in upgrade 2012-05-18 15:08:07 +08:00
Dan Poltawski
ad10c481e1 Merge branch 'MDL-33048' of git://github.com/timhunt/moodle 2012-05-18 12:12:51 +08:00
Sam Hemelryk
d5e6fe3ecc Merge branch 'MDL-32727' of git://github.com/timhunt/moodle
Conflicts:
	mod/quiz/db/upgrade.php
2012-05-18 16:07:20 +12:00
Dan Poltawski
82258830b7 Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 11:23:47 +08:00
Dan Poltawski
7e89cbe0ac Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle 2012-05-18 10:30:22 +08:00
Dan Poltawski
33e693b5e1 Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 10:05:32 +08:00
Sam Hemelryk
67cfce0245 Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle 2012-05-18 10:48:23 +12:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
2012-05-18 00:27:04 +08:00
Tim Hunt
36e48cb82f MDL-33048 quiz / my moodle: fatal error due to missing include. 2012-05-17 16:06:41 +01:00
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