mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-28 05:54:55 +01:00
Code Issues Projects Releases Wiki Activity
61,171 Commits 36 Branches 523 Tags
Commit Graph

61171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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)
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
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
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
Andrew Davis
ea11496d0b MDL-31713 core_grade: added updating of grade min and max to update_final_grade() 2013-05-07 12:21:07 +08:00
Sam Hemelryk
d5cdfbc288 Merge branch 'MDL-39364_clean' of git://github.com/lazydaisy/moodle 2013-05-07 16:13:06 +12:00
Damyon Wiese
a135128390 Merge branch 'wip-MDL-39130-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 11:25:35 +08:00
Andrew Davis
59772c066a MDL-31713 core_grade:added a unit test to replicate a raw grade max bug 2013-05-07 11:14:08 +08:00
David Monllao
cfcbc34a61 MDL-39478 behat: New constant to detect when the test site is running 
Also removing an unused var and method.
 2013-05-07 11:12:01 +08:00
Sam Hemelryk
045fe95c63 MDL-39525 cache: fixed purging definitions requiring identifiers 2013-05-07 15:11:33 +12:00
David Monllao
fd70acae15 MDL-39437 mod_lesson: Expanding form fieldsets before clicking elements 2013-05-07 11:11:17 +08:00
Rossiani Wijaya
7f8ce0257b MDL-39437 lesson mod: rename add a question page section name to avoid conflict in behat 2013-05-07 11:05:58 +08:00
Damyon Wiese
e0fc61f993 Merge branch 'MDL-39162' of git://github.com/totara/openbadges 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 10:41:44 +08:00
Eloy Lafuente (stronk7)
4d71661e2b Merge branch 'wip-MDL-37500-m25' of git://github.com/samhemelryk/moodle 2013-05-07 03:00:02 +02:00
Mary Evans
b4d70ce2e1 MDL-39508 theme_canvas: Fixed dropdown navigation menu in SCORM player view. 2013-05-07 01:58:11 +01:00
Sam Hemelryk
5f5776c1e6 MDL-37500 cache: integration review touchups. 
Issues:
1. Fix setType calls
2. Changing from default to all and editing again, default is still selected.
3. Uncheck all options causes error.
4. Doesn't seem to be restricting based upon option.
5. Picked all and got coding error with the database thing.
6. Bad title: https://github.com/samhemelryk/moodle/commit/wip-MDL-37500-m25#L1R157
7. Amend comments - should only be removed once 2.5 is the minimum version for an upgrade.
8. Document the defaultsharing option.

Outcomes:
1. Fixed - copy paste error.
2. Fixed - mforms was applying the default value despite a value being provided. A quirk of elements with array names.
3. Fixed - validation now requires at least one option to be selected.
4. Fixed - issue rose from definitions not being re-parsed. cache/admin.php now reparses the first time a user visits the page.
5. Fixed - better purging of definitions when working with them anonymously. Unit test added.
6. Fixed - new string added and used.
7. Fixed - comments amended.

New issue to address parsing of definitions during upgrade.
New issue to add debugging notice if definition sets only one possible sharing option and that option is user input.
 2013-05-07 12:49:12 +12:00
Sam Hemelryk
46e17f04c7 MDL-37500 cache: implemented sharing options and gui 2013-05-07 11:57:37 +12:00
Hugh Davenport
9a2b5e0b4f MDL-35852 Add config option to prevent changes to configexecutable settings 2013-05-07 11:17:05 +12:00
Damyon Wiese
69a0e65c56 MDL-38315 Fix unit tests for module completion 2013-05-06 23:27:40 +08:00