mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 07:25:30 +02:00
Code Issues Projects Releases Wiki Activity
61,210 Commits 37 Branches 536 Tags
Commit Graph

61210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
e9df9e8f7a MDL-38289: Custom profile fields - added unit test 
Added a unit test to cover the case when you are fetching a custom
profile field but you are not logged in.
 2013-05-09 10:29:51 +08:00
Damyon Wiese
8cfc9d75ed Merge branch 'MDL-38289-master-int' of git://github.com/FMCorz/moodle 2013-05-09 10:22:16 +08:00
Jerome Mouneyrac
669dee5804 MDL-37822 Moodle send site information to a hub even though it's unchecked 2013-05-09 01:51:56 +02:00
Eloy Lafuente (stronk7)
919a8db0a2 Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle 2013-05-09 00:35:28 +02:00
Eloy Lafuente (stronk7)
474e0d3cd2 Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges 2013-05-09 00:20:06 +02:00
Dan Poltawski
036aab5daa MDL-38979 bootstrap: fix previous TODO bugnumber.. 
grrr! Sorry for that.
 2013-05-08 13:34:49 +01:00
Dan Poltawski
69b9a894a1 MDL-38979 bootstrap: add note about duplicated logic 2013-05-08 13:32:48 +01:00
Dan Poltawski
0249631131 Merge branch 'MDL-38979-master' of git://github.com/ds125v/moodle 2013-05-08 13:27:42 +01:00
Dan Poltawski
ae3507af09 Merge branch 'MDL-39552' of git://github.com/stronk7/moodle 2013-05-08 13:03:58 +01:00
Dan Poltawski
2022330dd7 Merge branch 'MDL-39545_master' of https://github.com/markn86/moodle 2013-05-08 12:37:18 +01:00
Dan Poltawski
ca463dcf1c Merge branch 'wip-MDL-39520-master' of git://github.com/marinaglancy/moodle 2013-05-08 12:33:19 +01:00
Eloy Lafuente (stronk7)
7e2dd8dd47 MDL-38532 version mini-bump 2013-05-08 10:50:01 +02:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Eloy Lafuente (stronk7)
fc99ef7ebb Merge branch 'MDL-38532_master' of git://github.com/dmonllao/moodle 2013-05-08 10:30:25 +02:00
Dan Poltawski
1d8288f242 Merge branch 'wip-MDL-39462-master' of git://github.com/marinaglancy/moodle 2013-05-08 09:21:42 +01:00
Dan Poltawski
5179b61259 Merge branch 'MDL-39542-master-int' of git://github.com/FMCorz/moodle 2013-05-08 09:10:55 +01:00
David Monllao
8c700da3d8 MDL-38532 behat: Hardcode latest 2.5 moodlehq/behat-extension version 2013-05-08 16:07:02 +08:00
Damyon Wiese
35aba51758 Merge branch 'MDL-31193-master' of git://github.com/mouneyrac/moodle 2013-05-08 15:21:47 +08:00
Marina Glancy
8c288b261a MDL-38594 change course listing heading font size back to default 2013-05-08 15:14:56 +08:00
Marina Glancy
bb7368a29b MDL-39388 corrected tabs renderer to deal with old code 2013-05-08 14:58:17 +08:00
Damyon Wiese
9a2cc7b6c8 Merge branch 'MDL-39388-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-08 14:57:49 +08:00
Damyon Wiese
66d6221f9a MDL-29472: Cohorts webservice - fix numerous access problems and add to the unit tests. 
Also allow 'system' as a category type to allow you to create/update system wide cohorts.
 2013-05-08 12:56:14 +08:00
Damyon Wiese
59add07d01 Merge branch 'MDL-29472_m' of git://github.com/andreabix/moodle 2013-05-08 12:51:00 +08:00
Damyon Wiese
8ed91fdabb Merge branch 'MDL-37552-master' of git://github.com/mouneyrac/moodle 2013-05-08 12:47:44 +08:00
Yuliya Bozhko
7deff81f80 MDL-39397 badges: Handle course badges when course is deleted 2013-05-08 16:12:44 +12:00
Frederic Massart
31f4725932 MDL-39542 course: Return to right section when JS is off 2013-05-08 11:32:25 +08:00
Marina Glancy
b80a50f7c9 MDL-39462 added missing clearing of coursecat cache 2013-05-08 11:02:45 +10:00
Eloy Lafuente (stronk7)
2fd46e12b8 Merge branch 'wip-MDL-39554-m25' of git://github.com/samhemelryk/moodle 2013-05-08 02:14:20 +02:00
Sam Hemelryk
5451933012 MDL-39554 cache: sharing link only shown in multiple options are available 2013-05-08 11:02:14 +12:00
Sam Hemelryk
bd12f745b7 MDL-39554 cache: forced sharing options for static + request 2013-05-08 10:56:55 +12:00
Andrew Davis
5df9bc3998 MDL-37475 core_grade:fixed the handling of show totals 2013-05-08 10:38:20 +12:00
Eloy Lafuente (stronk7)
4ce97aed0d Merge branch 'wip-mdl-39332' of git://github.com/rajeshtaneja/moodle 2013-05-08 00:28:15 +02:00
Sam Hemelryk
b3a9bf23f5 Merge branch 'MDL-39481_master' of git://github.com/dmonllao/moodle 2013-05-08 09:54:13 +12:00
Eloy Lafuente (stronk7)
d40a24384e Merge branch 'MDL-39452-master' of git://github.com/sammarshallou/moodle 2013-05-07 22:06:04 +02:00
Eloy Lafuente (stronk7)
fbd84c8eb5 Merge branch 'MDL-32301_lti_instructor_params' of https://github.com/moodlerooms/moodle 2013-05-07 21:57:40 +02:00
Eloy Lafuente (stronk7)
ddb8041433 MDL-39538 take rid of unused global 2013-05-07 21:43:06 +02:00
Eloy Lafuente (stronk7)
5304ded836 Merge branch 'wip-MDL-39538-master' of git://github.com/marinaglancy/moodle 2013-05-07 21:38:24 +02:00
Eloy Lafuente (stronk7)
52933ab087 Merge branch 'wip-MDL-39525-m25' of git://github.com/samhemelryk/moodle 2013-05-07 21:28:09 +02:00
Mark Nielsen
e91be4ffa8 MDL-32301: Allow instructor custom parameters for LTI tools 2013-05-07 10:24:32 -07:00
Eloy Lafuente (stronk7)
3705a6dcbe Merge branch 'MDL-34275-master' of git://github.com/danpoltawski/moodle 2013-05-07 19:15:21 +02:00
Eloy Lafuente (stronk7)
de10fcac5f MDL-39552 Make behat code re-entrant safe 
With yui combo in action, some times setup.php is
included more than once. So it's mandatory to
guarantee that code until ABORT_AFTER_CONFIG_CANCEL
can be executed safely multiple times in the same
request.

This change just prevents the behat section to be executed
more than once. All the values that are set within it
should be already defined for the re-entrant call.
 2013-05-07 19:00:41 +02:00
Eloy Lafuente (stronk7)
5b003e9cdd Merge branch 'MDL-39478_master' of git://github.com/dmonllao/moodle 2013-05-07 17:52:00 +02:00
Dan Poltawski
49bd43c140 Merge branch 'MDL-39497-workshop-allocator-stable' of git://github.com/mudrd8mz/moodle 2013-05-07 16:42:19 +01:00
Dan Poltawski
07d0648baf MDL-39515, MDL-39514 - ie9 fix for svg icons 2013-05-07 16:33:47 +01:00
Dan Poltawski
d047828835 Merge branch 'MDL-39515-master' of git://github.com/barbararamiro/moodle 2013-05-07 16:33:06 +01:00
Dan Poltawski
339386d96c Merge branch 'MDL-39514-master' of git://github.com/barbararamiro/moodle 2013-05-07 16:32:29 +01:00
Damyon Wiese
5946813506 Merge branch 'master_MDL-38102' of github.com:totara/moodle 2013-05-07 23:06:09 +08:00
Dan Poltawski
b6009c5ca5 Merge branch 'MDL-36223-master' of git://github.com/damyon/moodle 2013-05-07 15:28:05 +01:00
Dan Poltawski
38a6ec6a3a Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 15:12:58 +01:00
Rajesh Taneja
89f5e43064 MDL-37245 Blog: Fixed comments. 2013-05-07 15:02:23 +01:00