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

784 commits

Author SHA1 Message Date
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
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
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
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
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Dan Poltawski
d0a0768b7f Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle 2014-01-21 11:21:52 +08:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
Damyon Wiese
57fbd5f91f MDL-28448 Assign: Add a new capability that lets teachers mess with student submissions. 2014-01-15 12:52:08 +08:00
Ruslan Kabalin
534fc27649 MDL-43693: assignment: Fix JS error on grading page. 2014-01-14 16:19:40 +00:00
Damyon Wiese
718f42ae68 Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle 2014-01-14 16:21:21 +08:00
Damyon Wiese
49ca1e77b0 Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle 2014-01-14 11:57:09 +08:00
Eloy Lafuente (stronk7)
b9da30cfd2 Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle 2014-01-13 16:31:00 +01:00
Dan Poltawski
d1426e2843 Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assignment/lang/en/assignment.php
 2014-01-13 12:55:36 +08:00
Michael Aherne
f56ad6036f MDL-46310 assign Prevent blind marking submission notification email being sent to noreplyemail address 2014-01-10 15:19:04 +00:00
David Monllao
50edfdca03 MDL-43584 behat: Updating features to use the new expected arguments 2014-01-10 18:25:44 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Damyon Wiese
40cb48792a MDL-33952 Assignment - bon voyage! 
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
 2014-01-08 14:51:06 +08:00
Damyon Wiese
8e1266bf77 MDL-33600 Assign: Add an admin setting to set the default for sendstudentnotifications 2014-01-08 11:03:59 +08:00
Damyon Wiese
f7dc9871e7 MDL-33600 Assign: Allow teachers to skip notifying students about grade update. 2014-01-08 10:34:57 +08:00
Damyon Wiese
cf1110eb62 MDL-43595: The dropdowns for editpdf stopped working due to a recent change. 2014-01-08 09:15:58 +08:00
Damyon Wiese
abc217b2bf Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle 2014-01-07 14:10:40 +08:00
Damyon Wiese
e011f229a8 Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle 2014-01-07 12:29:45 +08:00
Damyon Wiese
de47c9c81b Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle 2014-01-07 12:22:49 +08:00
Dan Poltawski
812cc702ad Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle 2014-01-07 11:51:15 +08:00
Dan Poltawski
93759b73a5 Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/version.php
 2014-01-07 10:55:20 +08:00
Frederic Massart
f588ea5008 MDL-42995 mod_assign: Extended tests for update_calendar method 2014-01-06 10:20:23 +01:00
Frederic Massart
0cfc7d13ef MDL-42995 mod_assign: Remove files from calendar event description 2014-01-06 09:29:26 +01:00
Frederic Massart
2a5794e099 MDL-42995 mod_assign: Use new global function to strip content 2014-01-06 09:29:25 +01:00
Sam Hemelryk
e4ac256c35 Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle 2014-01-06 13:09:42 +13:00
Sam Hemelryk
2dad31ecf9 MDL-43238 mod_assign: removed incorrect validation 2014-01-06 09:51:38 +13:00
Rajesh Taneja
456d7bc7f3 MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled 2014-01-03 16:30:37 +08:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Petr Škoda
2803f3c1b5 MDL-43402 remove all zlib detection code 
Zlib extension is now required.
 2013-12-27 11:06:18 +08:00
Sam Hemelryk
ee70f10f99 Merge branch 'MDL-43250-master' of git://github.com/damyon/moodle 2013-12-24 10:36:22 +13:00
Andrew Nicols
54a3dca258 MDL-43307 JavaScript: Migrate moodle-mod_assign-history to use Shifter 2013-12-23 16:18:10 +08:00
Rajesh Taneja
cdfd607449 MDL-43293 Events: Added unit test for comment events 2013-12-23 09:22:15 +08:00
Rajesh Taneja
a55eaf0351 MDL-43293 Events: Added comments event in modules supporting comments 2013-12-23 09:22:14 +08:00
Eloy Lafuente (stronk7)
a6761e26e7 Merge branch 'MDL-43318-master' of git://github.com/damyon/moodle 2013-12-23 00:39:41 +01:00
Damyon Wiese
997588195d MDL-43318 Assign: Fix bug when editing previous attempt feedback 2013-12-20 11:14:27 +08:00
Damyon Wiese
4a47008ca6 MDL-42585 Assign: Add capability to only view grades 
AMOS BEGIN
    CPY [viewgrades,grades],[assign:viewgrades,mod_assign]
AMOS END
 2013-12-20 11:01:44 +08:00
Eloy Lafuente (stronk7)
1f73779156 MDL-42425 assign: keep already bumped version. 2013-12-20 03:40:58 +01:00
Eloy Lafuente (stronk7)
c7df8656be Revert "MDL-42425 modify mod_assign_save_grade to process advanced grading data" 
This reverts commit 29932b2112.

Conflicts:
	mod/assign/upgrade.txt
 2013-12-20 03:39:14 +01:00