Dan Poltawski [Tue, 12 Jun 2012 09:18:18 +0000 (17:18 +0800)]
Merge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:16:40 +0000 (17:16 +0800)]
Merge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 12 Jun 2012 09:10:54 +0000 (17:10 +0800)]
Merge branch 'w24_MDL-33182_m23_mnetstrict' of git://github.com/skodak/moodle
Petr Skoda [Sun, 10 Jun 2012 08:00:24 +0000 (10:00 +0200)]
MDL-33182 fix mnet enrol E_STRICT issue
Dan Poltawski [Tue, 12 Jun 2012 09:00:09 +0000 (17:00 +0800)]
Merge branch 'MDL-33393' of git://github.com/timhunt/moodle
Conflicts:
mod/quiz/lang/en/quiz.php
Dan Poltawski [Tue, 12 Jun 2012 07:57:58 +0000 (15:57 +0800)]
Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 12 Jun 2012 07:55:26 +0000 (15:55 +0800)]
Merge branch 'wip-MDL-33156-master' of https://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:54:10 +0000 (13:54 +0800)]
Merge branch 'wip-MDL-33005-master' of https://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:45:10 +0000 (13:45 +0800)]
Merge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:41:54 +0000 (13:41 +0800)]
MDL-33572 - assign: fixed syntax probblem found immediately after integration
Grr. shouldn't have escaped our review.
Dan Poltawski [Tue, 12 Jun 2012 05:38:34 +0000 (13:38 +0800)]
Merge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Tue, 12 Jun 2012 05:36:15 +0000 (13:36 +0800)]
Merge branch 'w23_MDL-33543_m23_datastrict' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:18:51 +0000 (13:18 +0800)]
MDL-32937 - scorm: switch commenting style to //
Frederic Massart [Mon, 11 Jun 2012 05:32:46 +0000 (13:32 +0800)]
MDL-33598 Messaging: students can change their assignment notification preferences
Dan Poltawski [Tue, 12 Jun 2012 05:05:47 +0000 (13:05 +0800)]
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)]
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
Aparup Banerjee [Tue, 12 Jun 2012 03:25:17 +0000 (11:25 +0800)]
Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle
Aparup Banerjee [Tue, 12 Jun 2012 03:09:51 +0000 (11:09 +0800)]
Merge branch 'MDL-31863' of git://github.com/mouneyrac/moodle
Marina Glancy [Thu, 31 May 2012 08:15:14 +0000 (16:15 +0800)]
MDL-33446 Editor form field can filter return types
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 01:01:04 +0000 (03:01 +0200)]
on-demand release 2.3dev
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 00:55:03 +0000 (02:55 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 00:37:04 +0000 (02:37 +0200)]
MDL-32117 equella: make it core plugin
Eloy Lafuente (stronk7) [Mon, 11 Jun 2012 23:40:14 +0000 (01:40 +0200)]
MDL-32117 equella: add missing MOODLE_INTERNAL + phpdocs tidy
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 00:22:26 +0000 (02:22 +0200)]
Merge branch 'equella' of git://github.com/danpoltawski/moodle
Barbara Ramiro [Mon, 11 Jun 2012 11:37:33 +0000 (19:37 +0800)]
MDL-33005 Replaced drag and drop arrow with animated gif
Barbara Ramiro [Mon, 11 Jun 2012 08:28:54 +0000 (16:28 +0800)]
MDL-33156 Customized 16px icons and generic image icons
Jerome Mouneyrac [Mon, 11 Jun 2012 06:12:00 +0000 (14:12 +0800)]
MDL-31863 fix responseerror when no files are found
Aparup Banerjee [Thu, 7 Jun 2012 03:49:08 +0000 (11:49 +0800)]
MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time.
Yang Yang [Tue, 5 Jun 2012 01:42:30 +0000 (13:42 +1200)]
MDL-31863 Web service : added modified to parameters and modifiedtime to description
Aparup Banerjee [Mon, 11 Jun 2012 05:55:20 +0000 (13:55 +0800)]
Merge branch 'MDL-33548' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 11 Jun 2012 05:34:47 +0000 (13:34 +0800)]
MDL-34400 Libraries : maintained naming rule by removing stray mod_ function and class prefixes from activity modules.
This rule @ http://docs.moodle.org/dev/Activity_modules still stands for now.
Eloy Lafuente (stronk7) [Sun, 10 Jun 2012 03:40:35 +0000 (05:40 +0200)]
MDL-33455 restore: process grade_grades only if user matches.
Note this has been applied both to individual activities grade_grades
and to general ones.
Dan Poltawski [Mon, 11 Jun 2012 02:07:26 +0000 (10:07 +0800)]
MDL-32117 - equella: prevent errors when no username
Christopher Tombleson [Fri, 8 Jun 2012 11:52:46 +0000 (23:52 +1200)]
MDL-32937 Add drag and drop support to SCORM
Petr Skoda [Sun, 10 Jun 2012 08:05:59 +0000 (10:05 +0200)]
MDL-33543 fix mod_data E_STRICT issue when adding fields with file size limits
Eloy Lafuente (stronk7) [Sun, 10 Jun 2012 02:57:40 +0000 (04:57 +0200)]
MDL-33630 backup: invalidate ids cache on temptable drop.
AMOS bot [Sat, 9 Jun 2012 00:31:15 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Fri, 8 Jun 2012 17:32:26 +0000 (19:32 +0200)]
Merge branch 'w23_MDL-33595_m23_phpunitinit' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Fri, 8 Jun 2012 15:08:18 +0000 (17:08 +0200)]
Merge branch 'MDL-33471' of git://github.com/timhunt/moodle
Tim Hunt [Fri, 8 Jun 2012 14:49:19 +0000 (15:49 +0100)]
MDL-33471 quiz cron: better mtrace output for overdue handling
Petr Skoda [Fri, 8 Jun 2012 09:50:03 +0000 (11:50 +0200)]
MDL-33595 fix recent initial PHPUnit init regression
Eloy Lafuente (stronk7) [Fri, 8 Jun 2012 08:55:39 +0000 (10:55 +0200)]
MDL-33465 fix incorrect merge conflict resolution
Dan Marsden [Fri, 8 Jun 2012 08:33:38 +0000 (20:33 +1200)]
MDL-33515 SCORM - attempts grading setting is confusing - last attempt is really last completed attempt.
Dan Poltawski [Fri, 8 Jun 2012 07:54:31 +0000 (15:54 +0800)]
MDL-33465 - bump version number for new log entry defintion
Dan Poltawski [Fri, 8 Jun 2012 07:51:41 +0000 (15:51 +0800)]
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Fri, 8 Jun 2012 07:48:18 +0000 (15:48 +0800)]
MDL-33465 course: COALESCE is not cross-db compatible while using fields of different datatypes
Dan Poltawski [Fri, 8 Jun 2012 07:25:40 +0000 (15:25 +0800)]
Revert "MDL-31863 Web service : added modified to parameters and modifiedtime to description"
This reverts commit
25ccaf54949cfafc1f61572dba203a3a76700089.
Dan Poltawski [Fri, 8 Jun 2012 07:25:34 +0000 (15:25 +0800)]
Revert "MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time."
This reverts commit
130d3fbf964f2efbcc6fee3855edb7bc0a2af744.
Dan Poltawski [Fri, 8 Jun 2012 05:39:17 +0000 (13:39 +0800)]
Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign
Jason Fowler [Fri, 8 Jun 2012 02:31:02 +0000 (10:31 +0800)]
MDL-33594 - Glossary - fixing portfolio exports
Dan Poltawski [Fri, 8 Jun 2012 05:31:31 +0000 (13:31 +0800)]
MDL-33594 mod_data: use filelib rather than speciifc internal file
Dan Poltawski [Fri, 8 Jun 2012 03:40:56 +0000 (11:40 +0800)]
Merge branch 'MDL-33587-delete-alias' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 8 Jun 2012 02:47:31 +0000 (10:47 +0800)]
MDL-32783 quiz overdue handling: improve lang string
And remove a stray #
Dan Poltawski [Fri, 8 Jun 2012 02:36:17 +0000 (10:36 +0800)]
Merge branch 'MDL-32783' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jun 2012 23:56:06 +0000 (01:56 +0200)]
Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle
Sam Hemelryk [Thu, 7 Jun 2012 23:53:43 +0000 (11:53 +1200)]
Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jun 2012 23:43:40 +0000 (01:43 +0200)]
Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle
Sam Hemelryk [Thu, 7 Jun 2012 22:23:16 +0000 (10:23 +1200)]
Merge branch 'MDL-33080' of git://github.com/stronk7/moodle
Sam Hemelryk [Thu, 7 Jun 2012 22:20:43 +0000 (10:20 +1200)]
Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jun 2012 22:04:19 +0000 (00:04 +0200)]
Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
Sam Hemelryk [Thu, 7 Jun 2012 21:34:19 +0000 (09:34 +1200)]
MDL-30506 navigation: Fixed up reference handling issue and added docs post integration
Sam Hemelryk [Thu, 7 Jun 2012 21:04:46 +0000 (09:04 +1200)]
Merge branch 'MDL-30506' of git://github.com/jonof/moodle
Tim Hunt [Thu, 7 Jun 2012 18:17:07 +0000 (19:17 +0100)]
MDL-32783 quiz overdue handling: enforce end of grace period
The summary page was not enforcing the end of the grace period. If the
user had the summary page open, then they coudl still stubmit after the
end of the grace period.
Also, the editing form was not validating that the quiz grace period was
greater than quiz|graceperiodmin in the quiz configuration, and that
should be checked, so I added it.
I fear that processattempt.php is becoming very spaghetti-like with all
the timing rules, it really needs to be refactored, but not 2 weeks
before the 2.3 release. (When refactoring, we really need unit tests for
this.)
Tim Hunt [Thu, 7 Jun 2012 16:33:46 +0000 (17:33 +0100)]
MDL-33393 quiz overdue handling: improve strings and add help
David Mudrak [Thu, 7 Jun 2012 16:02:12 +0000 (18:02 +0200)]
MDL-33587 Delete the reference properly in stored_file::delete()
David Mudrak [Thu, 7 Jun 2012 15:37:25 +0000 (17:37 +0200)]
MDL-33587 Improve stored_file::delete_reference() method
David Mudrak [Thu, 7 Jun 2012 14:29:09 +0000 (16:29 +0200)]
MDL-33587 Throw coding exception when trying to unlink a non-reference file
David Mudrak [Thu, 7 Jun 2012 14:21:41 +0000 (16:21 +0200)]
MDL-33587 Add unit tests for stored_file::delete_reference()
The first unit test forces the File API to be more picky as any sane
core API should be. The second one illustrates the buggy behaviour of
the current implementation of delete_reference(). They both fail at the
moment, of course...
Dan Poltawski [Thu, 7 Jun 2012 15:15:45 +0000 (23:15 +0800)]
Merge branch 'MDL-33577' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 14:23:38 +0000 (22:23 +0800)]
Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 14:14:28 +0000 (22:14 +0800)]
Merge branch 'MDL-33565' of git://github.com/timhunt/moodle
Andrew Robert Nicols [Wed, 23 May 2012 08:49:31 +0000 (09:49 +0100)]
MDL-33292 Consume the new ability to move dialogues in chooser dialogues
Dan Poltawski [Thu, 7 Jun 2012 13:49:14 +0000 (21:49 +0800)]
Merge branch 'MDL-33517' of git://github.com/timhunt/moodle
Andrew Robert Nicols [Wed, 23 May 2012 08:49:06 +0000 (09:49 +0100)]
MDL-33292 Add ability to move (drag) M.core.dialogue
Andrew Robert Nicols [Thu, 7 Jun 2012 13:46:21 +0000 (14:46 +0100)]
MDL-33588 Ensure that a drop target is defined before checking a drop group
Damyon Wiese [Wed, 6 Jun 2012 07:49:37 +0000 (15:49 +0800)]
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.
Tim Hunt [Thu, 7 Jun 2012 11:55:53 +0000 (12:55 +0100)]
MDL-33532 quiz editing: let uses enter locale floats.
So, for example, Croatian users can set the maximum grade to 65,5.
Tim Hunt [Thu, 7 Jun 2012 11:32:41 +0000 (12:32 +0100)]
MDL-33577 qtype_multianswer: Fix strict syntax warning.
Dan Poltawski [Thu, 7 Jun 2012 10:11:10 +0000 (18:11 +0800)]
Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle
Barbara Ramiro [Fri, 1 Jun 2012 13:55:02 +0000 (21:55 +0800)]
MDL-33482 Replaced modchooser with chooserdialouge and cleaned codes
Andrew Robert Nicols [Fri, 1 Jun 2012 08:57:24 +0000 (09:57 +0100)]
MDL-33482 Replaced modchooser with chooserdialogue
Barbara Ramiro [Fri, 1 Jun 2012 06:59:03 +0000 (14:59 +0800)]
MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow
Dan Poltawski [Thu, 7 Jun 2012 09:33:39 +0000 (17:33 +0800)]
Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 7 Jun 2012 09:25:59 +0000 (17:25 +0800)]
Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle
Petr Skoda [Thu, 7 Jun 2012 09:00:20 +0000 (11:00 +0200)]
MDL-33583 really keep all automated backup files when told to do so
Petr Skoda [Thu, 7 Jun 2012 08:49:48 +0000 (10:49 +0200)]
MDL-30725 save automated external only backups directly to ext storage, do not pollute file pool
This solution is based on code by Tony Levi, thanks!
Dan Poltawski [Thu, 7 Jun 2012 08:38:10 +0000 (16:38 +0800)]
MDL-33551 googleapi: allow multiple uploads in one session
We need to clear state between multiple uploads
Andrew Robert Nicols [Thu, 7 Jun 2012 08:17:40 +0000 (09:17 +0100)]
MDL-33535 Correct typo in glossary documentation link
Dan Poltawski [Thu, 7 Jun 2012 06:29:08 +0000 (14:29 +0800)]
Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 7 Jun 2012 06:04:08 +0000 (14:04 +0800)]
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
Conflicts:
backup/moodle2/restore_stepslib.php
Dan Poltawski [Thu, 7 Jun 2012 05:33:22 +0000 (13:33 +0800)]
Merge branch 'MDL-33467' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 05:02:38 +0000 (13:02 +0800)]
Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle
Aparup Banerjee [Thu, 7 Jun 2012 03:59:13 +0000 (11:59 +0800)]
Merge branch 'MDL-31863' of git://github.com/nebgor/moodle
Aparup Banerjee [Thu, 7 Jun 2012 03:49:08 +0000 (11:49 +0800)]
MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time.
Yang Yang [Tue, 5 Jun 2012 01:42:30 +0000 (13:42 +1200)]
MDL-31863 Web service : added modified to parameters and modifiedtime to description
Damyon Wiese [Thu, 7 Jun 2012 02:52:05 +0000 (10:52 +0800)]
MDL-33475: Fix javascript error when advanced grading is used in mod_assign
Damyon Wiese [Thu, 7 Jun 2012 02:18:53 +0000 (10:18 +0800)]
MDL-33572: Make the display of the "graded" status consistent in mod_assign
Do not display "graded" when the grade is set to -1.
Damyon Wiese [Tue, 5 Jun 2012 06:58:13 +0000 (14:58 +0800)]
MDL-33498: Correct use of unformat_float for mod_assign decimal grades
This was affecting locales that use , instead of . in floating point numbers.
Tim Hunt [Wed, 6 Jun 2012 18:57:47 +0000 (19:57 +0100)]
MDL-33565 setuplib: better error if you pass an object as $debuginfo
This changes makes sure the error is triggerd when the exception is
thrown, so that the problem code is in the stack-trace. Before, the
error happend in the exception hander, so you could not see the code
that caused the problem.
Tim Hunt [Wed, 6 Jun 2012 19:21:33 +0000 (20:21 +0100)]
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.