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

14985 commits

Author SHA1 Message Date
Dan Marsden
02bff1ad82 MDL-43541 SCORM: set first launchable sco correctly. 2014-02-17 19:56:40 +13:00
Marina Glancy
7f34b8e135 Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle 2014-02-05 15:56:30 +08:00
Rossiani Wijaya
8c6ca6961a MDL-42339 - removed double formatting for set_title() and set_heading() 2014-02-05 14:47:23 +08:00
Marina Glancy
a76edd4961 MDL-42425 assign: bumping version for new web services to take effect 2014-02-05 14:32:27 +08:00
Sam Hemelryk
d9fece93d0 Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle 2014-02-05 12:36:52 +13:00
Sam Hemelryk
8213574043 Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-02-05 12:35:11 +13:00
Eloy Lafuente (stronk7)
9433b01c94 Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle 2014-02-04 23:56:27 +01:00
Marina Glancy
e5fd05a368 Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:44:51 +08:00
Damyon Wiese
35361b94ec MDL-43805 assign: Prevent behat fail on ci - editpdf is not available there 
Ghostscript is not setup on the ci servers, so the editpdf feature will be automatically
disabled. This means that I cannot click on "Hide Annotate PDF".
 2014-02-04 13:37:06 +08:00
Sam Hemelryk
aa01949f24 Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:50:48 +13:00
Eloy Lafuente (stronk7)
263979ebee Merge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle 2014-02-03 23:58:07 +01:00
Sam Hemelryk
6958c718cc Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle 2014-02-04 08:28:56 +13:00
Marina Glancy
3ef6324aaa Merge branch 'MDL-43805-master' of git://github.com/damyon/moodle 2014-02-03 16:09:09 +08:00
Marina Glancy
dc4bed906f Merge branch 'MDL-43593-master' of git://github.com/damyon/moodle 2014-02-03 15:06:11 +08:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
Paul Charsley
40c3dacf44 MDL-42425 modify mod_assign_save_grade to process advanced grading data 2014-02-03 09:06:28 +13:00
Marina Glancy
cdb69ddff0 MDL-43828 forum: allow to select single available group when posting 2014-01-31 16:56:48 +08:00
Damyon Wiese
11ab6207e8 MDL-43805 assign: Behat test for quickgrading bug 2014-01-29 20:29:41 +08:00
Damyon Wiese
a6fd2e2cf1 MDL-43805 Assign: Quickgrading wipes out grades for hidden columns. 
Grr.. quickgrading will always be a hack.
 2014-01-29 20:29:35 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57 MDL-43736 Events: event->contextinstanceid should be used where possible 
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
 2014-01-29 11:39:44 +08:00
Tomasz Muras
672ce966c6 MDL-43040 Replace $module with $plugin in all mod/*/version.php 
Conflicts:
	mod/quiz/version.php
 2014-01-29 00:36:12 +01:00
Sam Hemelryk
07481c9277 Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle 2014-01-29 08:23:51 +13:00
Kevin Wiliarty
1ec8b1c7ea MDL-39942: invite only users who can post to discuss 2014-01-27 22:30:47 -05:00
Mark Nelson
50ac4392f3 MDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_test.php) 2014-01-27 19:11:38 -08:00
Eloy Lafuente (stronk7)
835ef9d84c Merge branch 'MDL-43874' of git://github.com/timhunt/moodle 2014-01-27 23:52:07 +01:00
Sam Hemelryk
c77d28e5b2 Merge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle 2014-01-28 08:40:45 +13:00
Tim Hunt
e101ec9fd7 MDL-43874 quiz, teacher comments should respect display options. 
Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.
 2014-01-27 12:01:32 +00:00
James Pratt
df9ddae686 MDL-41757 quiz statistics : limit subq and variant stat rows 
and print min, median and max.
 2014-01-27 18:04:08 +07:00
James Pratt
4f7516f6e8 MDL-41756 (3) quiz statistics : test variant stats 2014-01-27 18:00:04 +07:00
James Pratt
1239d28776 MDL-41756 (2) quiz statistics : break down question stats by variant 2014-01-27 18:00:04 +07:00
James Pratt
8da6fc9d57 MDL-41754 (2) quiz statistics : using Sam's new progress classes 2014-01-27 17:45:50 +07:00
James Pratt
8e32861786 MDL-43369 : quiz statistics - average across attempts where item seen 
and not across all attempts for subqs.
 2014-01-27 17:30:56 +07:00
Russell Smith
74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used. 
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
 2014-01-25 08:57:32 +11:00
Michael Aherne
780cf0a728 MDL-43440 unit tests Use correct cm identifier in unit tests 2014-01-25 08:56:43 +11:00
Tony Butler
4d72dfa956 MDL-43773 mod_choice: Swap order of name column headings in text export 2014-01-24 11:17:48 +00:00
Damyon Wiese
ac2b4ffc8c MDL-43593 Assign editpdf: More robust handling of errors from TCPDF. 
This includes a check to see if there are 0 pages in the combined pdf,
catching exceptions and suppressing php warnings and errors from bad pdf files.

Also - Use TCPDF directly to check if pdfs are compatible. The previous check was
letting dodgy PDFs through which then failed at generation time. This way dodgy
pdfs will get run through ghostscript early and cleaned up.
 2014-01-24 16:16:38 +08:00
Damyon Wiese
b158296ece Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close." 
This reverts commit ed3d1ee60d.
This reverts commit ed8eebeece.
This reverts commit f664a93878.
This reverts commit 9d22765723.
 2014-01-23 17:14:56 +08:00
Dan Marsden
ed3d1ee60d MDL-43247 SCORM: use window.closed property instead of window.opener for IE 2014-01-23 20:38:01 +13:00
Marina Glancy
0eadedea57 MDL-43643 chat: do not assign to nonexisting cm_info properties 2014-01-23 10:59:33 +08:00
Damyon Wiese
ed8eebeece MDL-43247 Scorm: Fix for undefined js variable when popup is blocked. 2014-01-23 10:49:56 +08:00
Damyon Wiese
6baeabc140 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-23 10:27:18 +08:00
Dan Poltawski
6fe1f72ca0 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-23 09:32:36 +08:00
Dan Marsden
f664a93878 MDL-43247 SCORM: convert some js to YUI 2014-01-22 21:53:26 +13:00
Tim Hunt
e5c86d0740 MDL-43670 fix quiz backup. 2014-01-22 08:32:10 +00:00
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Dan Poltawski
0758665c0d Merge branch 'mdl34020-master' of https://github.com/tlock/moodle 2014-01-21 15:21:17 +08:00
Damyon Wiese
29f7aef8e9 Merge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle 2014-01-21 13:17:05 +08:00
Damyon Wiese
c821f113cc Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-21 12:57:05 +08:00
Dan Poltawski
e5c5f52e8b MDL-43670 quiz: improve code comments a little 2014-01-21 11:59:07 +08:00