mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
60,253 Commits 36 Branches 519 Tags
Commit Graph

60253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
200571507f Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle 2013-04-04 11:22:20 +08:00
Dan Poltawski
f88ff0e7cf Merge branch 'MDL-38861' of git://github.com/stronk7/moodle 2013-04-04 11:00:01 +08:00
Damyon Wiese
1b774df9a7 MDL-35073 Open badges - close session before making curl request to check backpack server. 2013-04-04 10:39:51 +08:00
Damyon Wiese
b38f932abf Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle 2013-04-04 10:34:50 +08:00
Eloy Lafuente (stronk7)
0c7ad0ab13 Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle 2013-04-04 01:15:34 +02:00
Eloy Lafuente (stronk7)
1b882ab87b Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle 2013-04-04 01:14:36 +02:00
Eloy Lafuente (stronk7)
33871fbf3e Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle 2013-04-04 01:07:23 +02:00
Eloy Lafuente (stronk7)
5c98b64b00 Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle 2013-04-04 01:04:00 +02:00
Eloy Lafuente (stronk7)
235fc2562c Merge branch 'MDL-38667-m' of git://github.com/andrewnicols/moodle 2013-04-04 01:02:20 +02:00
Eloy Lafuente (stronk7)
a37a698417 Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle 2013-04-04 00:53:05 +02:00
Eloy Lafuente (stronk7)
75fb383260 Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle 
Conflicts:
	mod/glossary/mod_form.php
 2013-04-04 00:51:47 +02:00
Eloy Lafuente (stronk7)
68a6d3cd9f Merge branch 'MDL-38645-master' of git://github.com/FMCorz/moodle 2013-04-04 00:34:24 +02:00
Eloy Lafuente (stronk7)
76d86181a3 Merge branch 'wip-mdl-38494' of git://github.com/rajeshtaneja/moodle 2013-04-03 23:45:40 +02:00
Eloy Lafuente (stronk7)
1ca5ce1b33 Merge branch 'MDL-36570' of git://github.com/timhunt/moodle 2013-04-03 23:09:19 +02:00
Eloy Lafuente (stronk7)
896efbeadb Merge branch 'MDL-38756-m' of git://github.com/andrewnicols/moodle 2013-04-03 21:59:18 +02:00
Eloy Lafuente (stronk7)
0e864c3f21 Merge branch 'MDL-38733-workshop-rubric-css' of git://github.com/mudrd8mz/moodle 2013-04-03 20:06:49 +02:00
Eloy Lafuente (stronk7)
2a5e0d6321 Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle 2013-04-03 19:48:02 +02:00
Eloy Lafuente (stronk7)
7191a59fc9 Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle 2013-04-03 17:12:04 +02:00
Eloy Lafuente (stronk7)
6b117438b9 Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle 2013-04-03 16:48:42 +02:00
Eloy Lafuente (stronk7)
ad46ea0b2f MDL-38861 upload users: add missing setType() calls. 2013-04-03 16:18:38 +02:00
Dan Poltawski
626403eb73 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-03 20:22:03 +08:00
Eloy Lafuente (stronk7)
57902e2738 Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle 2013-04-03 13:33:16 +02:00
Eloy Lafuente (stronk7)
c9f8620492 Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-03 13:20:23 +02:00
Tim Hunt
d2e32121b0 MDL-26956 user selector: fix regressions sam caused. 2013-04-03 11:44:23 +01:00
Tim Hunt
000fbcf2bd MDL-38538 quiz autosave: fix language string. 
This feature does not actually provide spiritual salvation.
 2013-04-03 11:23:41 +01:00
Dan Poltawski
aed60c64af Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 17:32:15 +08:00
Damyon Wiese
e84900648b MDL-36804 Assign attempt history: Fix course unit tests 
Handle missing attemptreopenmethod in add/update instance.
 2013-04-03 17:31:12 +08:00
Dan Poltawski
369496c31e Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-03 17:22:38 +08:00
Dan Poltawski
41b9392daa Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle 2013-04-03 16:50:43 +08:00
Aparup Banerjee
b8eb2f3dc6 Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle 2013-04-03 16:48:53 +08:00
Dan Poltawski
71573249ae Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 16:47:15 +08:00
Damyon Wiese
c9c34c7a65 MDL-36804 Assign attempt history - Add missing index to upgrade step. 2013-04-03 16:44:31 +08:00
Aparup Banerjee
7a2a430aa5 Merge branch 'MDL-38809' of git://github.com/timhunt/moodle 2013-04-03 16:32:42 +08:00
Dan Poltawski
5cc929bc12 Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle 2013-04-03 16:27:16 +08:00
Dan Poltawski
5e45f6a569 Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 16:18:50 +08:00
Damyon Wiese
74c9283854 MDL-36804: Assign attempt history - add upgrade.txt 2013-04-03 16:16:21 +08:00
Damyon Wiese
82b175e868 Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle 2013-04-03 15:48:35 +08:00
Dan Poltawski
89ea5ecd45 Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle 2013-04-03 15:39:48 +08:00
Damyon Wiese
b64a05b996 MDL-26644 Course - Remove completion tracking begins on enrolment setting from behat. 2013-04-03 15:30:49 +08:00
David Mudrák
5582ea0a9b MDL-37602 Fix broken workshop unit tests 2013-04-03 09:28:11 +02:00
Damyon Wiese
9855770d6c Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle 2013-04-03 14:48:06 +08:00
Dan Poltawski
998c5996e0 Merge branch 'MDL-38808' of git://github.com/jmvedrine/moodle 2013-04-03 14:46:58 +08:00
Damyon Wiese
6fb437b2bb Merge branch 'MDL-38705' of git://github.com/jonof/moodle 2013-04-03 14:35:12 +08:00
Damyon Wiese
dcf6318515 MDL-26644 Course - Version bump for upgrade script. 2013-04-03 14:32:19 +08:00
Damyon Wiese
7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
 2013-04-03 14:32:11 +08:00
Dan Poltawski
dc4260d918 Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle 2013-04-03 14:27:08 +08:00
Damyon Wiese
fab5cb3604 MDL-36804: Assign resubmission history - remove locked/mailed 
Remove locked/mailed flags from the grade record in the unit tests.
It just would not have done anything because the columns dont exist.
 2013-04-03 14:17:00 +08:00
Dan Poltawski
ac8bc0f947 Merge branch 'MDL-34640' of git://github.com/timhunt/moodle 2013-04-03 13:57:02 +08:00
David Monllao
7a6204ce1d MDL-38823 behat: Fixing related scenarios 2013-04-03 13:56:31 +08:00
David Monllao
060bafefe3 MDL-38823 behat: New behat_form_radio 
To deal with radio inputs after allowing
behat_form_field to delegate in specific
fields managers. It also fixes a BIG issue
when calling a no required class.
 2013-04-03 13:55:42 +08:00