mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
54,793 Commits 36 Branches 519 Tags
Commit Graph

54793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
c3fcad7d55 Merge branch 'MDL-34145' of git://github.com/timhunt/moodle 2012-07-05 03:40:44 +02:00
Sam Hemelryk
e5f0e51942 MDL-33770 webservices: Fixed error with core_group_create_groups when no enrolment key provided 2012-07-05 09:22:12 +12:00
Tim Hunt
bf92acc253 MDL-32062 question engine: fixup tests that this change broke. 
The test data was wrong, and was triggering the work-around code that
MDL-32062 introduced. I fixed the test data.

Also, I fixed one of the tests, that had been broken.
 2012-07-04 10:47:03 +01:00
Dan Poltawski
e255439446 MDL-34035 - fix typo in comment 
Thanks Sam!
 2012-07-04 10:37:47 +08:00
Dan Poltawski
54bda328d9 Merge branch 'MDL-34035' of git://github.com/timhunt/moodle 2012-07-04 10:34:22 +08:00
Barbara Ramiro
19ef00b916 MDL-33542, MDL-33542 Select dialogue details aligned 
And loading gif smaller
 2012-07-04 10:25:04 +08:00
Eloy Lafuente (stronk7)
a079d364f3 Merge branch 'w27_MDL-33876_m24_delenrol' of git://github.com/skodak/moodle 2012-07-04 04:15:47 +02:00
Dan Poltawski
c75599f966 Merge branch 'wip-MDL-34047-master' of git://github.com/marinaglancy/moodle 2012-07-04 09:51:25 +08:00
Sam Hemelryk
5804a2a31e Merge branch 'MDL-32614' of git://github.com/stronk7/moodle 2012-07-04 13:30:58 +12:00
Eloy Lafuente (stronk7)
b666885397 MDL-32614 lti: on restore, clean any typeid to convert the tool to selfcontained. 
This is known to be imperfect, awaiting for MDL-34161 to fix the whole thing. Also,
unrelated, there are some basiclti => lti replacements.
 2012-07-04 02:01:21 +02:00
Chris Scribner
420e6740e9 MDL-32614: Removing code which disassociated LTI instances from their tool types upon restore. 2012-07-04 01:34:20 +02:00
Sam Hemelryk
3778f990cc Merge branch 'MDL-31692' of git://github.com/danpoltawski/moodle 2012-07-04 10:07:54 +12:00
Sam Hemelryk
74abe5ce15 Merge branch 'MDL-32062' of git://github.com/timhunt/moodle 2012-07-04 09:54:06 +12:00
Sam Hemelryk
dc31e8d73d Merge branch 'MDL-33466-master' of git://github.com/sammarshallou/moodle 2012-07-04 09:37:38 +12:00
Sam Hemelryk
c425663c4c Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2 2012-07-04 09:32:45 +12:00
Sam Hemelryk
5439f90aa3 Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle 2012-07-04 08:33:14 +12:00
Sam Hemelryk
941d1fb2cc Merge branch 'wip-mdl-32787' of git://github.com/rajeshtaneja/moodle 2012-07-04 08:26:14 +12:00
Kevin Wiliarty
b1eeb76ec2 MDL-33749 follow redirects for URL downloader 2012-07-03 14:16:51 -04:00
Eloy Lafuente (stronk7)
20ef104713 Merge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle 2012-07-03 16:17:36 +02:00
Eloy Lafuente (stronk7)
4fcc358e12 Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle 2012-07-03 16:08:03 +02:00
sam marshall
110f73ad57 MDL-33426 Completion: Multilang activity names wrong in alt/title 2012-07-03 13:10:14 +01:00
Rajesh Taneja
fc3aa0fbaf MDL-32787 user: rule required for custom profile fields applies to all users editing own profile 2012-07-03 13:46:13 +08:00
Sam Hemelryk
e537a588d8 Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle 2012-07-03 16:35:32 +12:00
Dan Poltawski
eb85dafc8b Merge branch 'MDL-33937-master' of git://github.com/sammarshallou/moodle 2012-07-03 12:29:57 +08:00
Dan Poltawski
d4c16e8b63 Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/db/upgrade.php
 2012-07-03 12:19:07 +08:00
Dan Poltawski
3da087a8b4 Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle 2012-07-03 12:11:48 +08:00
Dan Poltawski
f884819546 Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle 2012-07-03 11:51:04 +08:00
Dan Poltawski
d07f3425ca Merge branch 'MDL-34008' of git://github.com/timhunt/moodle 2012-07-03 11:47:15 +08:00
Dan Poltawski
606319c927 Merge branch 'w27_MDL-34036_m24_bulkrole' of git://github.com/skodak/moodle 2012-07-03 11:40:08 +08:00
Sam Hemelryk
78e43b866b Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle 2012-07-03 15:15:07 +12:00
Dan Poltawski
7d27947851 Merge branch 'MDL-30883' of git://github.com/timhunt/moodle 2012-07-03 11:01:39 +08:00
Sam Hemelryk
04573eaa65 Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle 2012-07-03 14:57:41 +12:00
Dan Poltawski
114244ce6c Merge branch 'w27_MDL-34123_m24_newpasslang' of git://github.com/skodak/moodle 2012-07-03 10:39:12 +08:00
Dan Poltawski
66dd9e8ad4 Merge branch 'wip-MDL-33837-master' of git://github.com/marinaglancy/moodle 2012-07-03 10:24:26 +08:00
Sam Hemelryk
73d38068d9 Merge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle 2012-07-03 14:14:31 +12:00
Dan Poltawski
d3faa829cd Merge branch 'MDL-33757-master' of git://github.com/ankitagarwal/moodle 2012-07-03 09:45:12 +08:00
Frederic Massart
c31dc0b695 MDL-33828 Portfolio: prevent notices while exporting to portfolios 2012-07-03 09:33:17 +08:00
ISHIKAWA Takayuki
69101b4392 MDL-33757 gradebook: Adding support to sort userlist by email address 2012-07-03 09:09:05 +08:00
Eloy Lafuente (stronk7)
9039021b25 Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign 2012-07-03 02:15:57 +02:00
Eloy Lafuente (stronk7)
f1d9ceb0e4 Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle 2012-07-03 01:58:48 +02:00
Sam Hemelryk
2da0a38398 Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle 2012-07-03 11:48:43 +12:00
Sam Hemelryk
e1d7771b0f Merge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle 2012-07-03 11:36:01 +12:00
Eloy Lafuente (stronk7)
5d16ab2bba Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle 2012-07-03 01:04:47 +02:00
Sam Hemelryk
4f5263d969 Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle 2012-07-03 10:55:29 +12:00
Sam Hemelryk
14cff7be4d Merge branch 'MDL-9214' of git://github.com/danpoltawski/moodle 2012-07-03 10:47:07 +12:00
Sam Hemelryk
c6c16fd9ea Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle 2012-07-03 10:41:17 +12:00
Sam Hemelryk
b624ae9a2b Merge branch 'MDL-33990' of git://github.com/danpoltawski/moodle 2012-07-03 10:36:57 +12:00
Sam Hemelryk
4df3e2bedf MDL-34014 cssoptimiser: Fixed some aweful spelling 2012-07-03 10:34:20 +12:00
Sam Hemelryk
b5c4f3042b Merge branch 'MDL-34014' of git://github.com/danpoltawski/moodle 2012-07-03 10:32:37 +12:00
Sam Hemelryk
457fc727ac Merge branch 'MDL-34022' of git://github.com/danpoltawski/moodle 2012-07-03 10:30:30 +12:00