mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 15:29:08 +01:00
Code Issues Projects Releases Wiki Activity
66,681 Commits 36 Branches 523 Tags
Commit Graph

15080 Commits

Author SHA1 Message Date
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
Ankit Agarwal
0a61619043 MDL-40056 events: Replace old add_to_log calls with new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
25e8023d3d MDL-40056 events: Add unit tests for new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
a501fe1385 MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm 
Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events
 2014-01-14 12:05:10 +08:00
Damyon Wiese
49ca1e77b0 Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle 2014-01-14 11:57:09 +08:00
Dan Poltawski
986c3f27ee Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle 2014-01-14 11:28:39 +08:00
Dan Poltawski
4be67945aa Merge branch 'MDL-43412' of git://github.com/timhunt/moodle 2014-01-14 10:46:22 +08:00
Eloy Lafuente (stronk7)
295f7a6137 Merge branch 'MDL-43109' of https://github.com/mdikih/moodle 2014-01-13 21:51:27 +01: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
Eloy Lafuente (stronk7)
12efa52762 MDL-43646 "disapprove" changed to "undo approval" 2014-01-10 19:54:10 +01:00
Eloy Lafuente (stronk7)
7123ae8f9a MDL-43590 move unapprove to undo approval 2014-01-10 18:56:10 +01: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
Tony Butler
802f85076a MDL-43632 mod_feedback: Use SSL for reCAPTCHA API request if Moodle is using it 2014-01-10 10:40:23 +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
Dan Marsden
aafb7a5b95 MDL-43222 SCORM: correct check for list of attempts and make correct check for current attempt in scorm_get_toc 2014-01-10 22:04:09 +13:00
Dan Marsden
2526d7e178 MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported. 2014-01-10 21:04:54 +13:00
Dan Marsden
434cab3c79 MDL-41577 SCORM: remove old IE9 hack that didn't really work. 2014-01-10 20:46:05 +13:00