moodle.git
10 years agoMDL-29012 Show which user profile field is being deleted
Tomasz Muras [Sat, 20 Aug 2011 15:29:21 +0000 (16:29 +0100)]
MDL-29012 Show which user profile field is being deleted

Improve usability by showing the name of the profile field
being deleted.

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Thu, 18 Aug 2011 00:41:22 +0000 (02:41 +0200)]
weekly release 2.2dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 18 Aug 2011 00:38:24 +0000 (02:38 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMerge branch 'MDL-28349' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 13:28:55 +0000 (15:28 +0200)]
Merge branch 'MDL-28349' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL27951' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 01:09:15 +0000 (03:09 +0200)]
Merge branch 'MDL27951' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'wip_MDL-20804_wsdl' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 01:04:34 +0000 (03:04 +0200)]
Merge branch 'wip_MDL-20804_wsdl' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-mdl-27219' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 00:58:40 +0000 (02:58 +0200)]
Merge branch 'wip-mdl-27219' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-28737' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 00:51:09 +0000 (02:51 +0200)]
Merge branch 'MDL-28737' of git://github.com/timhunt/moodle

10 years agoRevert "MDL-25757 SCORM fix issue with duplicate cmi values being saved"
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 00:27:50 +0000 (02:27 +0200)]
Revert "MDL-25757 SCORM fix issue with duplicate cmi values being saved"

This reverts commit 7441c53cc11766d79d6567aee3deb2a286faf342.

10 years agoMerge branch 'MDL-21934' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 23:28:41 +0000 (01:28 +0200)]
Merge branch 'MDL-21934' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-27752' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 23:01:59 +0000 (01:01 +0200)]
Merge branch 'MDL-27752' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-28301-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:56:28 +0000 (00:56 +0200)]
Merge branch 'MDL-28301-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:44:44 +0000 (00:44 +0200)]
Merge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'master_MDL-28649' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:32:23 +0000 (00:32 +0200)]
Merge branch 'master_MDL-28649' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-28652' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:28:43 +0000 (00:28 +0200)]
Merge branch 'MDL-28652' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28653' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:17:14 +0000 (00:17 +0200)]
Merge branch 'MDL-28653' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28654' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:08:59 +0000 (00:08 +0200)]
Merge branch 'MDL-28654' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28655' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:07:19 +0000 (00:07 +0200)]
Merge branch 'MDL-28655' of git://github.com/bostelm/moodle

10 years agoMerge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 21:42:59 +0000 (23:42 +0200)]
Merge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 11:07:54 +0000 (13:07 +0200)]
Merge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle

10 years agoMerge branch 'MDL-28365' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 11:03:02 +0000 (13:03 +0200)]
Merge branch 'MDL-28365' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-23872_M' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 09:51:24 +0000 (11:51 +0200)]
Merge branch 'MDL-23872_M' of git://github.com/nebgor/moodle

10 years agoMDL-27219 chat: Beep will not display user fullname if user is not in chat
Rajesh Taneja [Tue, 16 Aug 2011 08:14:58 +0000 (16:14 +0800)]
MDL-27219 chat: Beep will not display user fullname if user is not in chat

10 years agoMerge branch 'MDL-28931_master' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 01:03:26 +0000 (03:03 +0200)]
Merge branch 'MDL-28931_master' of git://github.com/stronk7/moodle

10 years agoMerge branch 'master_MDL-28739' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 01:02:29 +0000 (03:02 +0200)]
Merge branch 'master_MDL-28739' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'wip-mdl-27728' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 00:14:26 +0000 (02:14 +0200)]
Merge branch 'wip-mdl-27728' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-27030' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 00:06:07 +0000 (02:06 +0200)]
Merge branch 'MDL-27030' of git://github.com/timhunt/moodle

10 years agoMDL-27896 filters/editor - fix whitespace
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 23:57:51 +0000 (01:57 +0200)]
MDL-27896 filters/editor - fix whitespace

10 years agoMerge branch 'wip-mdl-27896' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 23:55:30 +0000 (01:55 +0200)]
Merge branch 'wip-mdl-27896' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'master_MDL-28937' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 23:52:59 +0000 (01:52 +0200)]
Merge branch 'master_MDL-28937' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'master_MDL-28933' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 23:40:06 +0000 (01:40 +0200)]
Merge branch 'master_MDL-28933' of git://github.com/danmarsden/moodle

Conflicts:
mod/scorm/api.php

10 years agoMerge branch 'master_MDL-28541' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 23:26:34 +0000 (01:26 +0200)]
Merge branch 'master_MDL-28541' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 22:37:23 +0000 (00:37 +0200)]
Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle

10 years agoMDL-26979 css - clean whitespace introduced by previous commit
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 22:31:08 +0000 (00:31 +0200)]
MDL-26979 css - clean whitespace introduced by previous commit

10 years agoMerge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 20:46:01 +0000 (22:46 +0200)]
Merge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-25602-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 15 Aug 2011 18:45:43 +0000 (20:45 +0200)]
Merge branch 'wip-MDL-25602-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-27845_rating_aggregation'
Petr Skoda [Mon, 15 Aug 2011 18:33:33 +0000 (20:33 +0200)]
Merge branch 'MDL-27845_rating_aggregation'

10 years agoMerge branch 'master_MDL-28603' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 18:00:53 +0000 (20:00 +0200)]
Merge branch 'master_MDL-28603' of git://github.com/danmarsden/moodle

10 years agoMDL-28605 repsitory/local - Prevent server running out of memory
Dan Poltawski [Thu, 4 Aug 2011 13:14:38 +0000 (14:14 +0100)]
MDL-28605 repsitory/local - Prevent server running out of memory

Removing useless code..

10 years agoMDL-21934 Removing all questions from the quiz should not delet overall feedback.
Tim Hunt [Mon, 15 Aug 2011 17:47:03 +0000 (18:47 +0100)]
MDL-21934 Removing all questions from the quiz should not delet overall feedback.

Overall feedback was being wiped because the quiz max grade was being set to zero when sumgrades was set to 0. The correct logic is to only set maxgrade to 0 if there are questions in the quiz and sumgrades is 0.

10 years agoMerge branch 'MDL-28939' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 15 Aug 2011 17:34:31 +0000 (19:34 +0200)]
Merge branch 'MDL-28939' of git://github.com/timhunt/moodle

10 years agoMDL-28349 error when GIFT-importing essay questions.
Tim Hunt [Mon, 15 Aug 2011 15:09:47 +0000 (16:09 +0100)]
MDL-28349 error when GIFT-importing essay questions.

10 years agoMDL-28365 Move question lang string to the right file
Tim Hunt [Mon, 15 Aug 2011 14:18:21 +0000 (15:18 +0100)]
MDL-28365 Move question lang string to the right file

All the references to this sring were already referring to it in the new
place.

AMOS BEGIN
 MOV [cannotread,mod_quiz],[cannotread,question]
AMOS END

10 years agoMDL-28939 Bad lang string reference in grade/import/csv.
Tim Hunt [Mon, 15 Aug 2011 14:11:51 +0000 (15:11 +0100)]
MDL-28939 Bad lang string reference in grade/import/csv.

10 years agoMDL-28639 question import should set timemodified and modified by.
Tim Hunt [Mon, 15 Aug 2011 13:55:50 +0000 (14:55 +0100)]
MDL-28639 question import should set timemodified and modified by.

Thanks to Jean-Michel Vedrine for the fix.

10 years agoMDL-28438 Aiken question import broken since MDL-24594.
Tim Hunt [Mon, 15 Aug 2011 13:42:48 +0000 (14:42 +0100)]
MDL-28438 Aiken question import broken since MDL-24594.

10 years agoMDL-28937 SCORM 2004 ADL TEST CM-01 MDL-28740 first part of check for hidecontinue...
Dan Marsden [Mon, 15 Aug 2011 04:59:30 +0000 (16:59 +1200)]
MDL-28937 SCORM 2004 ADL TEST CM-01 MDL-28740 first part of check for hidecontinue param in SCO - prevent next item in TOC from being selectable and disable buttons in navbar if links don't exist in TOC

10 years agoMDL-28933 SCORM use a global function to check SCORM version to make sure all methods...
Dan Marsden [Mon, 15 Aug 2011 01:50:06 +0000 (13:50 +1200)]
MDL-28933 SCORM use a global function to check SCORM version to make sure all methods of storing SCORM version are checked.

10 years agoMDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning...
Mayank Gupa [Thu, 4 Aug 2011 13:15:04 +0000 (18:45 +0530)]
MDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning null

10 years agoMDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning...
Mayank Gupa [Thu, 4 Aug 2011 13:15:04 +0000 (18:45 +0530)]
MDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning null

10 years agoMDL-28931 timezone - update to 2011h (2200 rules)
Eloy Lafuente (stronk7) [Sun, 14 Aug 2011 16:04:59 +0000 (18:04 +0200)]
MDL-28931 timezone - update to 2011h (2200 rules)

10 years agoMDL-28739 SCORM trim minnormalizedmeasure before saving it
Dan Marsden [Sat, 13 Aug 2011 07:03:53 +0000 (19:03 +1200)]
MDL-28739 SCORM trim minnormalizedmeasure before saving it

10 years agoMDL-25757 SCORM fix issue with duplicate cmi values being saved
Dan Marsden [Sat, 13 Aug 2011 01:22:58 +0000 (13:22 +1200)]
MDL-25757 SCORM fix issue with duplicate cmi values being saved

10 years agoMDL-28737 advcheckboxes toggle state every submit if checkbox_controller present.
Tim Hunt [Fri, 12 Aug 2011 18:11:45 +0000 (19:11 +0100)]
MDL-28737 advcheckboxes toggle state every submit if checkbox_controller present.

10 years agoMDL-27896 course - Rectified wrong use of itemid for preparing draft file area
Rajesh Taneja [Thu, 11 Aug 2011 06:42:05 +0000 (14:42 +0800)]
MDL-27896 course - Rectified wrong use of itemid for preparing draft file area

10 years agoMDL-27951 Balancing Div tags
Ankit Kumar Agarwal [Wed, 10 Aug 2011 09:34:04 +0000 (15:04 +0530)]
MDL-27951 Balancing Div tags

10 years agoMDL-28603 - fix regression for SCORM 1.2 test
Dan Marsden [Fri, 12 Aug 2011 05:15:18 +0000 (17:15 +1200)]
MDL-28603 - fix regression for SCORM 1.2 test

10 years agoMDL-27896 editor - parent context will be respected by editor in case context is...
Rajesh Taneja [Thu, 28 Jul 2011 03:27:07 +0000 (11:27 +0800)]
MDL-27896 editor - parent context will be respected by editor in case context is not created.

10 years agoMDL-27896 editor - added sanity check to pick wrong context passed to editor creation
Rajesh Taneja [Thu, 28 Jul 2011 02:31:26 +0000 (10:31 +0800)]
MDL-27896 editor - added sanity check to pick wrong context passed to editor creation

10 years agoMDL-27896 context - Fixed editor context to observe filter status
Rajesh Taneja [Tue, 12 Jul 2011 02:45:55 +0000 (10:45 +0800)]
MDL-27896 context - Fixed editor context to observe filter status

10 years agoMDL-26979 custommenu Improved the custom menu CSS in base and all other core themes
Sam Hemelryk [Wed, 27 Jul 2011 08:35:07 +0000 (16:35 +0800)]
MDL-26979 custommenu Improved the custom menu CSS in base and all other core themes

* The custom menu now requires the YUI module directly rather than in its initialisation
* Improved the CSS in base so that it was more precise and more easily overrideable
* Reviewed the CSS for all core themes improving and removing !important from rules

10 years agoMDL-25602 blocks Altered order of block editing icons and added CSS to better control...
Sam Hemelryk [Thu, 4 Aug 2011 05:23:58 +0000 (13:23 +0800)]
MDL-25602 blocks Altered order of block editing icons and added CSS to better control the size of block editing icons

10 years agoMDL-27728 Moodleforms: Added validation for element before checking element values
Rajesh Taneja [Tue, 2 Aug 2011 04:17:44 +0000 (12:17 +0800)]
MDL-27728 Moodleforms: Added validation for element before checking element values

10 years agoAutomatically generated installer lang files
AMOS bot [Fri, 12 Aug 2011 00:55:26 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-28649 SCORM fix force new attempt when skipview is used
Dan Marsden [Fri, 12 Aug 2011 00:44:16 +0000 (12:44 +1200)]
MDL-28649 SCORM fix force new attempt when skipview is used

10 years agoMDL-28721 SCORM - respect hide navigation buttons setting.
Dan Marsden [Thu, 11 Aug 2011 21:55:13 +0000 (09:55 +1200)]
MDL-28721 SCORM - respect hide navigation buttons setting.

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Thu, 11 Aug 2011 22:18:07 +0000 (00:18 +0200)]
weekly release 2.2dev

10 years agoMDL-26754: Removed unnecessary include
Marina Glancy [Thu, 11 Aug 2011 05:39:30 +0000 (13:39 +0800)]
MDL-26754: Removed unnecessary include

10 years agoMerge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 21:03:06 +0000 (23:03 +0200)]
Merge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 20:46:42 +0000 (22:46 +0200)]
Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle

10 years agoMDL-28643 Fix debugging message when deleting activity with grade completion
sam marshall [Tue, 9 Aug 2011 11:45:58 +0000 (12:45 +0100)]
MDL-28643 Fix debugging message when deleting activity with grade completion

10 years agoMDL-28301 Completion: Replaced completion tickbox icons with nicer ones
sam marshall [Wed, 3 Aug 2011 10:35:12 +0000 (11:35 +0100)]
MDL-28301 Completion: Replaced completion tickbox icons with nicer ones

10 years agoMDL-27491 Add 'complete on view' support to wiki, survey
sam marshall [Wed, 3 Aug 2011 10:20:21 +0000 (11:20 +0100)]
MDL-27491 Add 'complete on view' support to wiki, survey

10 years agoMDL-23872 Forms Library : Updated MoodleQuickForm to honour setConstant(), prevents...
Daren Chandisingh [Wed, 2 Feb 2011 10:33:16 +0000 (10:33 +0000)]
MDL-23872 Forms Library : Updated MoodleQuickForm to honour setConstant(), prevents injection.

10 years agoMerge branch 'MDL-20501' of git://github.com/rwijaya/moodle
Sam Hemelryk [Wed, 10 Aug 2011 06:04:22 +0000 (14:04 +0800)]
Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL_25417' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 10 Aug 2011 05:39:32 +0000 (13:39 +0800)]
Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-27631' of git://github.com/mkassaei/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 01:00:17 +0000 (03:00 +0200)]
Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle

10 years agoMerge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 00:47:57 +0000 (02:47 +0200)]
Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 00:34:51 +0000 (02:34 +0200)]
Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle

10 years agoMDL-28295 SCORM change mangement of pop-up windows, load full SCORM API in existing...
Dan Marsden [Wed, 13 Jul 2011 01:31:28 +0000 (13:31 +1200)]
MDL-28295 SCORM change mangement of pop-up windows, load full SCORM API in existing window - this fixes an issue with IE 7 and httpreq communication

10 years agoMerge branch 'MDL-23967' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 10 Aug 2011 00:04:55 +0000 (02:04 +0200)]
Merge branch 'MDL-23967' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-28059' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 23:58:03 +0000 (01:58 +0200)]
Merge branch 'MDL-28059' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 23:10:27 +0000 (01:10 +0200)]
Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 17:30:54 +0000 (19:30 +0200)]
Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle

10 years agoMDL-28653 question output. Add a class to the main div based on question state.
Tim Hunt [Tue, 9 Aug 2011 10:31:37 +0000 (11:31 +0100)]
MDL-28653 question output. Add a class to the main div based on question state.

This makes it possible themes do cool things. For example change more of the display depending on whether the answer was correct or not.

10 years agoMerge branch 'MDL-28565_M' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 08:13:18 +0000 (10:13 +0200)]
Merge branch 'MDL-28565_M' of git://github.com/nebgor/moodle

10 years agoMDL-28655 qtype_calculated question engine upgrade: fix return value
Henning Bostelmann [Mon, 8 Aug 2011 22:53:34 +0000 (23:53 +0100)]
MDL-28655 qtype_calculated question engine upgrade: fix return value

10 years agoMerge branch 'MDL-28604' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 9 Aug 2011 07:41:53 +0000 (09:41 +0200)]
Merge branch 'MDL-28604' of git://github.com/timhunt/moodle

10 years agoMDL-27030: Fix quiz overview report showing incorrect grades on regraded attempts
Tony Levi [Thu, 31 Mar 2011 05:36:13 +0000 (16:06 +1030)]
MDL-27030: Fix quiz overview report showing incorrect grades on regraded attempts

Conflicts:

mod/quiz/report/overview/report.php

10 years agoMDL-28493 scorm - fix whitespace
Eloy Lafuente (stronk7) [Mon, 8 Aug 2011 16:15:42 +0000 (18:15 +0200)]
MDL-28493 scorm - fix whitespace

10 years agoMDL-28654 fix path for TinyMCE in lib/thirdpartylibs.xml.
Tim Hunt [Mon, 8 Aug 2011 15:39:58 +0000 (16:39 +0100)]
MDL-28654 fix path for TinyMCE in lib/thirdpartylibs.xml.

10 years agoMerge branch 'master_MDL-28601'
Petr Skoda [Mon, 8 Aug 2011 14:18:08 +0000 (16:18 +0200)]
Merge branch 'master_MDL-28601'

10 years agoMerge branch 'MDL-28620' of git://github.com/jbrisland/moodle
Petr Skoda [Mon, 8 Aug 2011 13:32:29 +0000 (15:32 +0200)]
Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle

10 years agoMDL-28652 qtype calculated, bad display of placeholder names on the editing form.
Tim Hunt [Mon, 8 Aug 2011 12:13:37 +0000 (13:13 +0100)]
MDL-28652 qtype calculated, bad display of placeholder names on the editing form.

10 years agoMDL-28565 General - updated lang files License link to docs.moodle.org/dev/License
Aparup Banerjee [Mon, 8 Aug 2011 09:10:32 +0000 (17:10 +0800)]
MDL-28565 General - updated lang files License link to docs.moodle.org/dev/License

10 years agoMDL-28565 General - updated License and Credits links
Aparup Banerjee [Tue, 2 Aug 2011 05:51:15 +0000 (13:51 +0800)]
MDL-28565 General - updated License and Credits links
to docs.moodle.org/dev/License and docs.moodle.org/dev/Credits

10 years agoMDL-26721 automated backups - Fix typo
Sagie Maoz [Sat, 6 Aug 2011 20:46:17 +0000 (21:46 +0100)]
MDL-26721 automated backups - Fix typo

Causing the 'role assignment' backup inclusion to be tied to the users

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agoMerge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 8 Aug 2011 07:05:56 +0000 (15:05 +0800)]
Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'mdl-28517' of git://github.com/colchambers/moodle
Sam Hemelryk [Mon, 8 Aug 2011 06:22:51 +0000 (14:22 +0800)]
Merge branch 'mdl-28517' of git://github.com/colchambers/moodle

10 years agoMDL-28569 blocks/rss_client - RSS feed autodiscovery fails with ampersands
Dan Poltawski [Tue, 2 Aug 2011 12:18:05 +0000 (13:18 +0100)]
MDL-28569 blocks/rss_client - RSS feed autodiscovery fails with ampersands

Simpliepie is quoting urls and we need the url to be unescaped