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
61,447 Commits 36 Branches 519 Tags
Commit Graph

61447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rossiani Wijaya
51fce0f6e0 MDL-39488 Lesson Module: Fixed PHP error matching question, 
if one or more options have not been selected.
 2013-05-08 13:53:38 +08:00
Joseph Rézeau
b0e9cdd45b MDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more options have not been selected " 
Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
 2013-05-08 13:53:31 +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
Rajesh Taneja
9a909b1a35 MDL-37245 Blog: Added permission check for blog comments 2013-05-07 15:02:22 +01:00
Eloy Lafuente (stronk7)
fc076898c7 Merge branch 'MDL-39437' of git://github.com/rwijaya/moodle 2013-05-07 15:50:29 +02:00
Dan Poltawski
5bb85e4bf6 Merge branch 'MDL-39508_master' of git://github.com/lazydaisy/moodle 2013-05-07 14:42:44 +01:00
Dan Poltawski
577f21ec24 Merge branch 'MDL-39496-m' of git://github.com/andrewnicols/moodle 2013-05-07 12:15:38 +01:00
Dan Poltawski
1795fc7ead Merge branch 'MDL-38500-master' of git://github.com/FMCorz/moodle 2013-05-07 11:54:15 +01:00
Dan Poltawski
ac15fc95fa Merge branch 'MDL-39448-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	cache/stores/memcache/version.php
 2013-05-07 11:43:23 +01:00
Dan Poltawski
bdc8928339 Merge branch 'master_MDL-35852' of git://github.com/danmarsden/moodle 2013-05-07 11:41:30 +01:00
Barbara Ramiro
dfdfe9cac0 MDL-39515 usability: New paypal icon in svg and png formats 2013-05-07 18:13:30 +08:00
Mark Nelson
34e338a458 MDL-39545 mod_assign: prevent notice from displaying when course module id does not exist 2013-05-07 17:31:14 +08:00
Rex Lorenzo
b4d33e02c0 MDL-34275 - Use default copyright license when restoring files 2013-05-07 09:09:38 +01:00
Damyon Wiese
670fd5aad4 Merge branch 'MDL-39187_master' of https://github.com/markn86/moodle 2013-05-07 16:09:10 +08:00
Damyon Wiese
d285e5e628 Merge branch 'MDL-31713_override' of git://github.com/andyjdavis/moodle 2013-05-07 15:28:17 +08:00
Mark Nelson
63d2081ee7 MDL-39535 grade: only display grade errors once 2013-05-07 15:15:37 +08:00
Jerome Mouneyrac
ea29059efa MDL-37552 external_format_text: missing require_once filelib.php (shared credits to Adam Fredericks for report and patch proposal) 2013-05-07 14:55:55 +08:00
Marina Glancy
4c3f33dc0c MDL-39538 use of deprecated function make_categories_list() 2013-05-07 16:15:25 +10:00
Damyon Wiese
ef4d3233b6 MDL-38596 coursecatlib performance 
Version bump for cache definitions and added user delete check to sql
 2013-05-07 14:10:23 +08:00
Damyon Wiese
fc075899e0 Merge branch 'wip-MDL-38596-master' of git://github.com/marinaglancy/moodle 2013-05-07 14:09:56 +08:00
Sam Hemelryk
e4e8d577cd Merge branch 'wip-MDL-39499-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 17:11:28 +12:00
Damyon Wiese
98b2443961 Merge branch 'wip-MDL-39482-master' of git://github.com/marinaglancy/moodle 2013-05-07 12:43:50 +08:00