Barbara Ramiro [Wed, 13 Jun 2012 06:59:46 +0000 (14:59 +0800)]
MDL-33005 Drag and drop animation revised to play once only
Dan Poltawski [Wed, 13 Jun 2012 07:03:07 +0000 (15:03 +0800)]
Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 13 Jun 2012 06:08:36 +0000 (14:08 +0800)]
Merge branch 'master_MDL-33477' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 13 Jun 2012 06:02:05 +0000 (14:02 +0800)]
Merge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 13 Jun 2012 03:40:39 +0000 (15:40 +1200)]
Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 13 Jun 2012 03:32:54 +0000 (15:32 +1200)]
Merge branch 'MDL-32573' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 13 Jun 2012 03:28:39 +0000 (11:28 +0800)]
Merge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Wed, 13 Jun 2012 03:24:07 +0000 (15:24 +1200)]
Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 13 Jun 2012 02:12:21 +0000 (10:12 +0800)]
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
Dan Marsden [Wed, 13 Jun 2012 02:09:41 +0000 (14:09 +1200)]
MDL-33477 Advanced grading Marking Guide - fix lang
Dan Poltawski [Wed, 13 Jun 2012 02:07:32 +0000 (10:07 +0800)]
Merge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 12 Jun 2012 05:40:34 +0000 (13:40 +0800)]
MDL-33664 Hub: required renderer is passed to backup->display and huburl is initalised before use.
Damyon Wiese [Thu, 7 Jun 2012 04:00:34 +0000 (12:00 +0800)]
MDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 22:54:21 +0000 (00:54 +0200)]
MDL-33682 backup: keep old behavior, aka, use section number on empty section name.
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 22:37:42 +0000 (00:37 +0200)]
Merge branch 'MDL-33682' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 22:06:26 +0000 (00:06 +0200)]
Merge branch 'MDL-33681' of git://github.com/timhunt/moodle
Dan Marsden [Tue, 12 Jun 2012 21:59:11 +0000 (09:59 +1200)]
MDL-32937 SCORM: better lang for dnd interface
Aparup Banerjee [Tue, 12 Jun 2012 17:59:33 +0000 (01:59 +0800)]
Merge branch 'MDL-33610' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 12 Jun 2012 17:46:17 +0000 (01:46 +0800)]
Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle
Tim Hunt [Tue, 12 Jun 2012 16:46:47 +0000 (17:46 +0100)]
MDL-33682 backup: cope with sections called '0'
It was not previously possible to have a section called 0 because of
bugs in the standard course formats, but we hit this with the OU course
format. You got an exception because backup settings tested to see if
their lable was empty, which means a section name of '0' was fatal.
Should work now.
Tim Hunt [Tue, 12 Jun 2012 16:45:40 +0000 (17:45 +0100)]
MDL-33681 course: cannot have a section called '0'.
No reason to prevent this. It is just a matter of doing a proper test,
rather than the sloppy PHP !empty().
Dan Poltawski [Tue, 12 Jun 2012 14:15:09 +0000 (22:15 +0800)]
MDL-32573 - repository: make instance_config_form static
Andrew Robert Nicols [Tue, 12 Jun 2012 10:48:18 +0000 (11:48 +0100)]
MDL-33675 Add updated help texts for modules to appear in activity chooser
Dan Poltawski [Tue, 12 Jun 2012 10:36:08 +0000 (18:36 +0800)]
Merge branch 'MDL-33676' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 10:33:54 +0000 (12:33 +0200)]
Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jun 2012 10:31:27 +0000 (12:31 +0200)]
Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle
Barbara Ramiro [Fri, 8 Jun 2012 10:25:41 +0000 (18:25 +0800)]
MDL-33676 Activity chooser dialogue background set to transparent for IE
Dan Poltawski [Tue, 12 Jun 2012 09:38:25 +0000 (17:38 +0800)]
Merge branch 'MDL-33612' of git://github.com/timhunt/moodle
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
Petr Skoda [Tue, 12 Jun 2012 08:13:17 +0000 (10:13 +0200)]
MDL-33204 disable yui_combo slasharguments by default for now
Petr Skoda [Tue, 12 Jun 2012 08:13:01 +0000 (10:13 +0200)]
MDL-33636 add more yui caching goodness
Ankit Agarwal [Mon, 11 Jun 2012 05:18:11 +0000 (13:18 +0800)]
MDL-33123 book: Fixing numbering issue with hidden sub-chapters
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 [Wed, 6 Jun 2012 06:07:25 +0000 (14:07 +0800)]
MDL-33452 It must not possible to create an alias to another alias
- if the downloaded file is an alias we pretend that we operate with its source
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
Andrew Robert Nicols [Mon, 11 Jun 2012 11:41:25 +0000 (12:41 +0100)]
MDL-33608 Correct modulename_link for the label module
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.
Tim Hunt [Mon, 11 Jun 2012 04:18:24 +0000 (12:18 +0800)]
MDL-33610 theme - increase activity icon spacing
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
Tim Hunt [Fri, 8 Jun 2012 10:46:59 +0000 (11:46 +0100)]
MDL-33612 quiz: Improve page title 'Editing quiz'
Include the quiz name in the title. Also, add two missing format_string
calls around $quiz->name.
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
Dan Poltawski [Fri, 8 Jun 2012 02:21:58 +0000 (10:21 +0800)]
MDL-33593 course: rename editingenabled param
Change to notifyeditingon to better reflect what it does and
prevent people getting confused with edit=1
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