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

49287 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
ca00985a79 Merge branch 'MDL-28653' of git://github.com/timhunt/moodle 2011-08-17 00:17:14 +02:00
Eloy Lafuente (stronk7)
e2c65492c8 Merge branch 'MDL-28654' of git://github.com/timhunt/moodle 2011-08-17 00:08:59 +02:00
Eloy Lafuente (stronk7)
ff61183f43 Merge branch 'MDL-28655' of git://github.com/bostelm/moodle 2011-08-17 00:07:19 +02:00
Eloy Lafuente (stronk7)
6d4f437640 Merge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle 2011-08-16 23:42:59 +02:00
Eloy Lafuente (stronk7)
50c89706a7 Merge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle 2011-08-16 13:07:54 +02:00
Eloy Lafuente (stronk7)
78fe1bad47 Merge branch 'MDL-28365' of git://github.com/timhunt/moodle 2011-08-16 13:03:02 +02:00
Eloy Lafuente (stronk7)
515380a992 Merge branch 'MDL-23872_M' of git://github.com/nebgor/moodle 2011-08-16 11:51:24 +02:00
Rajesh Taneja
d0157d827b MDL-27219 chat: Beep will not display user fullname if user is not in chat 2011-08-16 16:34:16 +08:00
Andrew Davis (andyjdavis)
2fd7c451ad MDL-28943 messaging: made messaging admin page use a string instead of the plugin name 2011-08-16 14:30:34 +08:00
Eloy Lafuente (stronk7)
2345ab864d Merge branch 'MDL-28931_master' of git://github.com/stronk7/moodle 2011-08-16 03:03:26 +02:00
Eloy Lafuente (stronk7)
6ae8a01edb Merge branch 'master_MDL-28739' of git://github.com/danmarsden/moodle 2011-08-16 03:02:29 +02:00
Eloy Lafuente (stronk7)
c4e560099c Merge branch 'wip-mdl-27728' of git://github.com/rajeshtaneja/moodle 2011-08-16 02:14:26 +02:00
Eloy Lafuente (stronk7)
f716839a3f Merge branch 'MDL-27030' of git://github.com/timhunt/moodle 2011-08-16 02:06:07 +02:00
Eloy Lafuente (stronk7)
32dc8ecd16 MDL-27896 filters/editor - fix whitespace 2011-08-16 01:57:51 +02:00
Eloy Lafuente (stronk7)
f50675809f Merge branch 'wip-mdl-27896' of git://github.com/rajeshtaneja/moodle 2011-08-16 01:55:30 +02:00
Eloy Lafuente (stronk7)
70fc3fb919 Merge branch 'master_MDL-28937' of git://github.com/danmarsden/moodle 2011-08-16 01:52:59 +02:00
Eloy Lafuente (stronk7)
485b56ee87 Merge branch 'master_MDL-28933' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/api.php
 2011-08-16 01:40:06 +02:00
Eloy Lafuente (stronk7)
21507599b1 Merge branch 'master_MDL-28541' of git://github.com/danmarsden/moodle 2011-08-16 01:26:34 +02:00
Eloy Lafuente (stronk7)
c380fbf4c9 Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle 2011-08-16 00:37:23 +02:00
Eloy Lafuente (stronk7)
8f85249a96 MDL-26979 css - clean whitespace introduced by previous commit 2011-08-16 00:31:08 +02:00
Eloy Lafuente (stronk7)
eed36bbbd9 Merge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle 2011-08-15 22:46:01 +02:00
Petr Skoda
ace24aaa7d Merge branch 'wip-MDL-25602-master' of git://github.com/samhemelryk/moodle 2011-08-15 20:45:43 +02:00
Petr Skoda
49989aa47d Merge branch 'MDL-27845_rating_aggregation' 2011-08-15 20:33:33 +02:00
Eloy Lafuente (stronk7)
04a332d740 Merge branch 'master_MDL-28603' of git://github.com/danmarsden/moodle 2011-08-15 20:00:53 +02:00
Dan Poltawski
22fb538603 MDL-28605 repsitory/local - Prevent server running out of memory 
Removing useless code..
 2011-08-15 19:57:46 +02:00
Tim Hunt
effc982b1e 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.
 2011-08-15 18:47:03 +01:00
Eloy Lafuente (stronk7)
c97cc5c72f Merge branch 'MDL-28939' of git://github.com/timhunt/moodle 2011-08-15 19:34:31 +02:00
Tim Hunt
0519420f59 MDL-28349 error when GIFT-importing essay questions. 2011-08-15 16:17:16 +01:00
Tim Hunt
a41c441c05 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
 2011-08-15 15:18:21 +01:00
Tim Hunt
9d555b4456 MDL-28939 Bad lang string reference in grade/import/csv. 2011-08-15 15:11:51 +01:00
Tim Hunt
08f5328659 MDL-28639 question import should set timemodified and modified by. 
Thanks to Jean-Michel Vedrine for the fix.
 2011-08-15 14:55:50 +01:00
Tim Hunt
45bdcf1134 MDL-28438 Aiken question import broken since MDL-24594. 2011-08-15 14:44:57 +01:00
Dan Marsden
6917eee804 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 2011-08-15 18:33:33 +12:00
Dan Marsden
e6402b54ad MDL-28933 SCORM use a global function to check SCORM version to make sure all methods of storing SCORM version are checked. 2011-08-15 14:05:59 +12:00
Mayank Gupa
05c2b851c0 MDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning null 2011-08-15 13:47:40 +12:00
Mayank Gupa
6faea458ba MDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning null 2011-08-15 10:26:18 +12:00
Eloy Lafuente (stronk7)
03625387e2 MDL-28931 timezone - update to 2011h (2200 rules) 2011-08-14 18:04:59 +02:00
Dan Marsden
45999e7895 MDL-28739 SCORM trim minnormalizedmeasure before saving it 2011-08-13 19:03:53 +12:00
Dan Marsden
7441c53cc1 MDL-25757 SCORM fix issue with duplicate cmi values being saved 2011-08-13 13:22:58 +12:00
Tim Hunt
775fd4f145 MDL-28737 advcheckboxes toggle state every submit if checkbox_controller present. 2011-08-12 19:11:45 +01:00
Rajesh Taneja
cec1d81461 MDL-27896 course - Rectified wrong use of itemid for preparing draft file area 2011-08-12 16:41:29 +08:00
Ankit Kumar Agarwal
59666dae0e MDL-27951 Balancing Div tags 2011-08-12 10:59:35 +05:30
Dan Marsden
f35b5884be MDL-28603 - fix regression for SCORM 1.2 test 2011-08-12 17:15:18 +12:00
Rajesh Taneja
dedb69a2a1 MDL-27896 editor - parent context will be respected by editor in case context is not created. 2011-08-12 11:33:21 +08:00
Rajesh Taneja
f9157eb798 MDL-27896 editor - added sanity check to pick wrong context passed to editor creation 2011-08-12 11:33:21 +08:00
Rajesh Taneja
e9de1cf49c MDL-27896 context - Fixed editor context to observe filter status 2011-08-12 11:33:21 +08:00
Sam Hemelryk
6c95e46a15 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
 2011-08-12 11:10:06 +08:00
Sam Hemelryk
6919b90f05 MDL-25602 blocks Altered order of block editing icons and added CSS to better control the size of block editing icons 2011-08-12 10:26:20 +08:00
Rajesh Taneja
b29c9b05e6 MDL-27728 Moodleforms: Added validation for element before checking element values 2011-08-12 10:22:40 +08:00
AMOS bot
7b83d6291c Automatically generated installer lang files 2011-08-12 00:55:26 +00:00