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

14948 Commits

Author SHA1 Message Date
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
b158296ece Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close." 
This reverts commit ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit 9d2276572372f5d249cde8c61d0976e25f0fa4a8.
 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
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
Dan Poltawski
1f931e2928 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-21 11:25:38 +08:00
Dan Poltawski
d0a0768b7f Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle 2014-01-21 11:21:52 +08:00
Damyon Wiese
5388c6665f Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle 2014-01-21 10:41:40 +08:00
Damyon Wiese
7b6464bf9d Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle 2014-01-21 09:28:54 +08:00
Eric Merrill
bed27b3024 MDL-43732 quiz Fix styles so that question div doesn't overlap controls. 2014-01-20 19:56:17 -05:00
Eloy Lafuente (stronk7)
2079744b84 Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle 2014-01-21 01:46:16 +01:00
Eloy Lafuente (stronk7)
b7623bcb5d Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle 2014-01-21 01:43:13 +01:00
Eloy Lafuente (stronk7)
9faed21cb9 Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle 2014-01-21 00:05:03 +01:00
Damyon Wiese
4177d6a097 Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle 2014-01-20 17:10:38 +08:00
Damyon Wiese
3a96e8b4c3 Merge branch 'MDL-32523' of git://github.com/timhunt/moodle 2014-01-20 16:02:54 +08:00
Dan Poltawski
395333abe9 Merge branch 'MDL-43690' of git://github.com/timhunt/moodle 2014-01-20 14:24:38 +08:00
Damyon Wiese
ac97a7ed53 Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle 2014-01-20 13:21:58 +08:00
David Monllao
a77adc602a MDL-43743 mod_scorm: Adding package disclaimer 
As the package is licensed under CC 3.0 we should
be compliant with attribution.
 2014-01-20 09:30:44 +08:00
Tim Hunt
7051f3a882 MDL-43690 quiz_question_tostring missing s(). 
This meant that the edit quiz page sometimes had invalid HTML.
 2014-01-17 10:56:27 +00:00
Tim Hunt
dc4a3ea1ee MDL-43670 quiz_question_instances to match coding guidelines. 
Some columns needed to be renamed:
* quiz     -> quizid
* question -> questionid
* grade    -> maxmark

Then all the places that refer to those needed to be fixed.
 2014-01-17 10:56:07 +00:00
M Kassaei
e0c41591e1 MDL-32523 Duplicate questions in question bank 2014-01-17 10:54:12 +00:00
David Monllao
ef6ac9b0d5 MDL-43743 behat: Lightweight scorm package 
The previous used package were adding a second iframe
inside the scorm iframe and was slow loading it;
this patch replaces it for a simple one without any
extra iframe.
 2014-01-17 17:39:25 +08:00
Adrian Greeve
b481cc2e8f MDL-43294 mod_lesson: Unit test for essay_assessed event. 2014-01-17 15:38:03 +08:00
Adrian Greeve
f577148266 MDL-43294 events: New Event for essay submission in lesson. 2014-01-17 15:38:02 +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
Dan Marsden
9d22765723 MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close. 2014-01-17 10:09:26 +13:00
Damyon Wiese
8e3be93572 Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-16 16:35:22 +08:00
Ankit Agarwal
5971f6266a MDL-40056 events: Use correct course module id while fetching context 2014-01-16 16:31:06 +08:00
Dan Poltawski
c8c8e6c2de Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle 2014-01-16 09:40:58 +08:00
Eloy Lafuente (stronk7)
da272e6b6b Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-15 22:02:12 +01:00
Dan Marsden
eb07f2d8d0 MDL-43222 SCORM: Fix invalid sql 2014-01-16 09:48:04 +13:00
Damyon Wiese
15f9dfad09 MDL-33952: mod_assignment Don't hide the modules on upgrade. 2014-01-15 16:47:30 +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
Eloy Lafuente (stronk7)
e5f7cce1c1 Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-14 16:44:11 +01:00
Damyon Wiese
718f42ae68 Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle 2014-01-14 16:21:21 +08:00
Dan Poltawski
b901d0e9dd Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle 2014-01-14 15:26:52 +08:00
Dan Poltawski
2be353c195 Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle 2014-01-14 15:00:11 +08:00
Dan Poltawski
4198f7f903 Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle 2014-01-14 14:43:45 +08:00
Dan Poltawski
198b1facc3 Merge branch 'MDL-40313' of git://github.com/timhunt/moodle 2014-01-14 14:21:06 +08:00
Damyon Wiese
c98ee8cdc0 Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle 2014-01-14 13:59:26 +08:00
Damyon Wiese
961f70adcd Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-14 13:14:09 +08:00