mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 10:22:08 +02:00
Code Issues Projects Releases Wiki Activity
58,959 Commits 36 Branches 530 Tags
Commit Graph

58959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
8d8f9cf756 Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle 2013-02-04 23:58:41 +01:00
Eloy Lafuente (stronk7)
a35a7644b9 Merge branch 'MDL-37847' of git://github.com/timhunt/moodle 2013-02-04 22:54:50 +01:00
Tim Hunt
c0d12fc1cd MDL-37847 plain text essays were screwing up HTML special chars. 
This was incorrect use of PARAM_CLEANHTML for these inputs.

This fix also adds some unit tests to try to verify that this does not
break again in future.
 2013-02-04 12:54:10 +00:00
Dan Marsden
a022192a3b MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling 2013-02-04 22:04:06 +13:00
Damyon Wiese
935ec5e77e Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle 2013-02-04 16:18:00 +08:00
Dan Poltawski
78b161d39b Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle 2013-02-04 16:11:11 +08:00
Dan Poltawski
58e22287a6 Merge branch 'MDL-37422' of git://github.com/colchambers/moodle 2013-02-04 16:02:57 +08:00
Dan Poltawski
6ac9f15969 Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle 2013-02-04 15:54:43 +08:00
Dan Poltawski
efd779c2c6 Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests" 
This reverts commit 88df34abeddb5819e82e588b3b909c0de813d6b4.
 2013-02-04 15:12:30 +08:00
Dan Poltawski
5389bd999d Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle 2013-02-04 14:30:07 +08:00
Dan Poltawski
cf936fa297 Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-04 13:54:27 +08:00
Dan Poltawski
4ac341c9b6 Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle 2013-02-04 13:49:23 +08:00
Damyon Wiese
c15cda6138 Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle 2013-02-04 12:48:42 +08:00
Dan Poltawski
d5a13bca09 Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle 2013-02-04 12:12:11 +08:00
Dan Poltawski
b9299c61ca Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle 2013-02-04 11:56:45 +08:00
Damyon Wiese
c04dac3473 Merge branch 'master_MDL-36800' of git://github.com/danmarsden/moodle 2013-02-04 11:35:54 +08:00
Dan Poltawski
40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Dan Poltawski
7528ebd23a MDL-35823 - fix trailing whitespace 2013-02-04 11:23:44 +08:00
Dan Poltawski
3428c00d43 Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-04 11:23:41 +08:00
Damyon Wiese
ef23b6ff4f Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle 2013-02-04 11:12:45 +08:00
Dan Poltawski
7c433fa526 Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle 2013-02-04 10:26:32 +08:00
Dan Poltawski
e9c0ef3bca Merge branch 'MDL-37746' of git://github.com/timhunt/moodle 2013-02-04 10:17:36 +08:00
Dan Poltawski
85ef4d45ca Merge branch 'MDL-25853-master' of git://github.com/FMCorz/moodle 2013-02-04 10:12:54 +08:00
Dan Marsden
361069cbbb MDL-29207: SCORM prereq callback is pure js - move it to module.js so it can be cached better. 2013-02-03 20:27:52 +13:00
Dan Marsden
5f03868a53 MDL-29207 SCORM: Auto-continue doesn't work with Pre-req due to JS errors 2013-02-03 20:27:39 +13:00
Dan Marsden
6496979459 MDL-36800 SCORM: Fix Yui().use calls - thanks to Nancy Cheng for the fix 2013-02-03 20:21:16 +13:00
Colin Chambers
6dbc346095 MDL-37422 Quiz: Group fields related to 'Settings for multiple tries.' 2013-02-01 14:30:27 +00:00
Andrew Robert Nicols
2f545feb89 MDL-37574 Remove default link title from navigation items 2013-02-01 11:30:02 +00:00
Andrew Robert Nicols
2324cf045e MDL-37645 Generalise style for moodle-core-dialogues 2013-02-01 10:20:16 +00:00
Michael Hughes
127d66f183 MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users 2013-02-01 17:08:22 +08:00
Damyon Wiese
46692c3a81 MDL-37635 Assign: Prevent errors when viewing a feedback for an assignment with no gradeitem in gradebook 
Also adds unit tests to verify that:
Feedback is visible even if there is no grade
The grade is not shown if the gradeitem is hidden unless you have mod/assign:grade capability
 2013-02-01 13:46:08 +08:00
Jason Fowler
4df8223cbe MDL-35823 - Accessibility - Converted the help popup header from H1 to H2 to improve the over all DOM 2013-02-01 11:01:00 +08:00
Andrew Davis
88df34abed MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests 2013-02-01 08:31:00 +08:00
David Mudrák
1df3bc143c MDL-37806 Display 'Save and show next' button when assessing workshop submissions 
The button is displayed only when there is a pending (that is not
assessed yet) submission to assess.

AMOS BEGIN
 CPY [savenext,mod_assign],[saveandshownext,mod_workshop]
AMOS END
 2013-01-31 18:21:51 +01:00
David Mudrák
0001eea6dd MDL-37806 Add new workshop class method to return pending assessments 
This is a simple wrapper around workshop::get_assessments_by_reviewer()
that filters assigned assessments and returns just those that were not
graded by the reviewer yet.
 2013-01-31 18:21:50 +01:00
Tim Hunt
a74d924c25 MDL-37746 qtype_shortanser: avoid normalizer_normalize dangers. 
When an error occurs, normalizer_normalize just silently returns null,
which is dangerous. Here, we wrap it in a safe helper function.
 2013-01-31 11:35:07 +00:00
David Mudrák
8342a6981b MDL-37781 Allocate workshop submissions without waiting for cron 
Now we are checking for the need to execute the allocator every time the
main view.php is displayed to any user. Previously this was done by cron
only.
 2013-01-31 11:42:03 +01:00
David Mudrák
85f1c2d68b MDL-37781 Check for switching the workshop phase without waiting for cron 
Now we are checking for the need to switch the phase when the main
view.php is displayed to any user (previously this was done via cron
only). To give our subplugins (such as the scheduled allocation method)
a chance to do what they need to do, the workshop_viewed event is
triggered before the phase is actually switched.
 2013-01-31 11:41:55 +01:00
Eloy Lafuente (stronk7)
1918a2452e weekly release 2.5dev 2013-01-31 10:59:41 +01:00
Dan Poltawski
3895cdc2b7 Merge branch 'MDL-37789_master' of git://github.com/dmonllao/moodle 2013-01-31 15:34:46 +08:00
David Monllao
6b1a8fc5dd MDL-37789 behat: Fixing unit test in windows 
The directory separator was specified with
the slash character which is not good when
running the tests on windows
 2013-01-31 15:26:08 +08:00
Dan Poltawski
12f756f9d7 Revert "MDL-37613 mod: changed generalbox class in table to generaltable class in mod/feedback (2 files);mod/glossary (3 files);mod/wiki (1 file)." 
This reverts commit 0434dd24820e8c89e7f03d01c797ca65d211121a.
 2013-01-31 15:02:12 +08:00
Frederic Massart
d422fb22f7 MDL-37177 navigation: Prevent exception when viewing a profile 
When viewing a profile as a non-authenticated user, an exception
was raised because we were trying to fetch the context of this user.
 2013-01-31 12:24:37 +08:00
Dan Poltawski
8d81f4f4cc Revert "MDL-33105 flexible apply_units() function" 
This reverts commit c2ba17858c1994d9654a5ca64cb9fb22780654c1.
 2013-01-31 10:17:16 +08:00
Dan Poltawski
2c8d31cd72 Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle 2013-01-31 10:14:46 +08:00
Sam Hemelryk
956d3544f0 MDL-36363 cache: added unit tests for muliple loaders 2013-01-31 12:16:08 +13:00
Dan Marsden
220e5b5216 MDL-34231 SCORM: calculate correct number of attemptsleft when entering an attempt. 2013-01-31 10:45:11 +13:00
Sam Hemelryk
3aee2fb8ee MDL-36363 cache: fixed issue with double parsing keys for stacked loaders 2013-01-31 09:10:57 +13:00
Eloy Lafuente (stronk7)
f97db01978 Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle 2013-01-30 10:27:11 +01:00
Dan Poltawski
7543705d9b Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle 2013-01-30 09:18:57 +08:00