mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 16:32:43 +02:00
Code Issues Projects Releases Wiki Activity
70,709 Commits 36 Branches 529 Tags
Commit Graph

70709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
a8668e161a Merge branch 'MDL-47882_scorm_loadsco_invalid_html' of git://github.com/MorrisR2/moodle 2014-10-27 11:52:18 +08:00
Damyon Wiese
ae0711d861 MDL-47690 Course: Remove unused variable from unit tests. 2014-10-27 11:26:35 +08:00
Damyon Wiese
d2dbc373f8 Merge branch 'MDL-47690-master' of git://github.com/jleyva/moodle 2014-10-27 11:11:53 +08:00
Damyon Wiese
2b97417296 Merge branch 'wip-MDL-30358-master' of git://github.com/marinaglancy/moodle 2014-10-27 10:30:44 +08:00
Ray Morris
a53bf3a031 MDL-47882 SCORM: invalid HTML in loadSCO.php 2014-10-24 16:45:32 -05:00
Dan Poltawski
42b6b39136 Merge branch 'MDL-46088-master' of git://github.com/timhunt/moodle 2014-10-24 17:10:56 +01:00
Dan Poltawski
8d1c5eceb3 Merge branch 'MDL-47545-master' of git://github.com/jleyva/moodle 2014-10-24 16:40:06 +01:00
Juan Leyva
3ca3d259e5 MDL-47545 web services: Allow cross origin requests for file downloads 2014-10-24 17:10:44 +02:00
Dan Poltawski
cb1bc5eb6b Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle 2014-10-24 15:37:26 +01:00
Dan Poltawski
f6dbc2bb9c Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle 
Conflicts:
	admin/tool/monitor/lang/en/tool_monitor.php
 2014-10-24 15:25:42 +01:00
Dan Poltawski
22ef599c5d Merge branch 'MDL-47780_master' of https://github.com/markn86/moodle 2014-10-24 15:19:48 +01:00
Dan Poltawski
519fd3dd4c Merge branch 'wip-MDL-47760-master' of git://github.com/marinaglancy/moodle 2014-10-24 15:18:32 +01:00
Dan Poltawski
d6eff32be0 Merge branch '46518-28' of git://github.com/samhemelryk/moodle 2014-10-24 15:16:55 +01:00
Dan Poltawski
0b03353433 Merge branch 'MDL-47804' of git://github.com/aolley/moodle 2014-10-24 15:14:53 +01:00
Dan Poltawski
7638a4366f Merge branch '47608-28' of git://github.com/samhemelryk/moodle 2014-10-24 15:12:59 +01:00
Frederic Massart
20942dd702 MDL-47397 assignfeedback_editpdf: Copy stamps to other students in team 
During a team submission the stamps were attached to the user that
was graded and not to the other users. This could lead to errors when
generating the PDF for each user.
 2014-10-24 15:09:06 +01:00
Frederic Massart
47ff1cd93b MDL-47397 assignfeedback_editpdf: Tests use reliable way to annotate PDF 
The drag and drop step did not work, so we moved to using the stamps
to annotate the PDF. They do not rely on drag&drop and produce the same
effects.
 2014-10-24 15:09:06 +01:00
Frederic Massart
aad194b19a MDL-47397 editor_atto: Properly close confirm dialogue in Behat test 2014-10-24 15:09:06 +01:00
Dan Poltawski
e29ec53238 Merge branch 'MDL-47778_master' of https://github.com/markn86/moodle 2014-10-24 14:53:21 +01:00
Andrew Nicols
71bc139d63 MDL-47802 mod_forum: Check for required subscription capabilities 
Users must be able to both view, and manage their subscription in order to
subscribe or be subscribed to a discussion.
 2014-10-24 14:44:21 +01:00
Andrew Nicols
0603df04da MDL-47802 mod_forum: Include discussion subscriptions when moving 
Check for both forum, and discussion subscriptions when moving a discussion
to a different forum.
 2014-10-24 14:44:21 +01:00
Zachary Durber
5b2571547f MDL-47873 gradebook: Fix for missing override checkboxes. 2014-10-24 14:39:20 +01:00
Dan Poltawski
6c6375e438 Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	version.php
 2014-10-24 14:34:09 +01:00
Dan Poltawski
7dc62ed3cb Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle 2014-10-24 14:30:44 +01:00
Dan Poltawski
1429a25cd8 Merge branch 'MDL-47734-master' of git://github.com/andrewnicols/moodle 2014-10-24 14:13:59 +01:00
Dan Poltawski
d63a81c507 on-demand release 2.8beta+ 2014-10-24 11:15:32 +01:00
Damyon Wiese
4bb46504ee Merge branch 'wip-MDL-47542-master' of git://github.com/marinaglancy/moodle 2014-10-24 11:49:19 +02:00
Marina Glancy
079b2e5202 MDL-47542 core_grades: action menu for grade setup 2014-10-24 11:49:19 +02:00
Marina Glancy
4ea3258af9 Merge branch 'MDL-47813-master' of git://github.com/xow/moodle 2014-10-24 11:49:18 +02:00
John Okely
4809376f13 MDL-47813 tool_monitor: Fix rule manager unit tests in oracle 2014-10-24 11:49:18 +02:00
Damyon Wiese
996de187a5 MDL-47704 Grades: Behat fix - dropped items have no contribution 
We see "-" instead of "0.00 %"
 2014-10-24 11:49:17 +02:00
Damyon Wiese
d8e98c3178 Merge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle 2014-10-24 11:49:17 +02:00
Marina Glancy
681276aad2 Merge branch 'MDL-47838-master-fix3' of https://github.com/damyon/moodle 2014-10-24 11:49:16 +02:00
Frederic Massart
2eb60f110d MDL-47637 core_grades: Remove extra credit field in outcome test 2014-10-24 11:49:16 +02:00
Andrew Nicols
504d0a1821 MDL-47513 theme_base: Fix grader report when blocks are docked 2014-10-24 11:49:15 +02:00
Damyon Wiese
0ce4642864 MDL-47838 gradereport_singleview: Reuse get_element_header instead of rolling our own. 
This means the grade.php / index.php is kept in one place.
 2014-10-24 11:49:15 +02:00
Marina Glancy
c785cc9893 Merge branch 'MDL-47340-master' of git://github.com/jethac/moodle 2014-10-24 11:49:11 +02:00
Damyon Wiese
d700fa463e Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle 2014-10-24 11:48:25 +02:00
Damyon Wiese
0b9635cba4 Merge branch '46499-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:24 +02:00
Zachary Durber
237f76ce14 MDL-47838 gradebook: Singleview fix for invalid links. 2014-10-24 11:48:24 +02:00
Sam Hemelryk
fad1a02d21 MDL-46332 fixed whitespace 2014-10-24 11:48:23 +02:00
Sam Hemelryk
a1428d4be6 Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle 2014-10-24 11:48:23 +02:00
Sam Hemelryk
065448834c Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:22 +02:00
Sam Hemelryk
fc91acc813 Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:22 +02:00
Sam Hemelryk
614820522f Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle 2014-10-24 11:48:21 +02:00
Sam Hemelryk
7117571c34 Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle 2014-10-24 11:48:21 +02:00
Sam Hemelryk
1e97569713 Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle 2014-10-24 11:48:20 +02:00
gdharris
ee19ae694a MDL-46853 calendar: fix import of no duration events 2014-10-24 11:48:20 +02:00
Dan Poltawski
0255780b9c Merge branch 'MDL-47791' of git://github.com/timhunt/moodle 2014-10-24 11:48:19 +02:00
Dan Poltawski
a5f9fc6be3 Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle 2014-10-24 11:48:19 +02:00