mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 16:59:56 +01:00
Code Issues Projects Releases Wiki Activity
66,225 Commits 36 Branches 523 Tags
Commit Graph

66225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Pratt
1239d28776 MDL-41756 (2) quiz statistics : break down question stats by variant 2014-01-27 18:00:04 +07:00
James Pratt
aa05ae5da3 MDL-41756 (1) quiz statistics : use new method increment_progress 
to cut down on clutter before adding new break down by variant stuff
 2014-01-27 17:56:16 +07:00
James Pratt
eb50c6e198 MDL-43027 core progress : new method keeps track of progress internally 2014-01-27 17:51:09 +07:00
James Pratt
ef81a7c30e MDL-41754 (3) quiz statistics : need to escape core_php_time_limit 
after MDL-42084 was merged into upstream, introducing
core_php_time_limit, this branch that moved a reference to
core_php_time_limit to a new namespace was broken.
 2014-01-27 17:45:50 +07:00
James Pratt
8da6fc9d57 MDL-41754 (2) quiz statistics : using Sam's new progress classes 2014-01-27 17:45:50 +07:00
James Pratt
809fdb83b1 MDL-41754 (1) Progress tracking : moved from backup and restore to core 2014-01-27 17:45:50 +07:00
James Pratt
8e32861786 MDL-43369 : quiz statistics - average across attempts where item seen 
and not across all attempts for subqs.
 2014-01-27 17:30:56 +07:00
Eloy Lafuente (stronk7)
9788e26805 weekly release 2.7dev 2014-01-23 12:38:19 +01:00
Eloy Lafuente (stronk7)
93473e5dd2 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-01-23 12:38:06 +01:00
Damyon Wiese
b158296ece Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close." 
This reverts commit ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit 9d2276572372f5d249cde8c61d0976e25f0fa4a8.
 2014-01-23 17:14:56 +08:00
Dan Marsden
ed3d1ee60d MDL-43247 SCORM: use window.closed property instead of window.opener for IE 2014-01-23 20:38:01 +13:00
Damyon Wiese
ed8eebeece MDL-43247 Scorm: Fix for undefined js variable when popup is blocked. 2014-01-23 10:49:56 +08:00
Damyon Wiese
6baeabc140 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-23 10:27:18 +08:00
Dan Poltawski
6fe1f72ca0 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-23 09:32:36 +08:00
Dan Marsden
f664a93878 MDL-43247 SCORM: convert some js to YUI 2014-01-22 21:53:26 +13:00
Tim Hunt
e5c86d0740 MDL-43670 fix quiz backup. 2014-01-22 08:32:10 +00:00
Damyon Wiese
ff77d601d5 MDL-26680: Reset my moodle page - add sesskey check. 2014-01-22 10:00:43 +08:00
Damyon Wiese
ce3b8b0e71 Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-22 09:52:38 +08:00
Dan Poltawski
259d41fcb9 Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle 2014-01-22 09:15:52 +08:00
Michael Aherne
41dcfbf1af MDL-26680 my page My Moodle "reset to default" button 2014-01-21 22:36:24 +00:00
Dan Poltawski
73cb5874b6 Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-21 23:29:20 +08:00
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Petr Škoda
3345e24f4b MDL-43661 change event property level to edulevel 
Level is a reserved word in sql, sorry.
 2014-01-21 15:54:56 +08:00
Dan Poltawski
0758665c0d Merge branch 'mdl34020-master' of https://github.com/tlock/moodle 2014-01-21 15:21:17 +08:00
Dan Poltawski
0eea6f5d99 Merge branch '43714-27' of git://github.com/samhemelryk/moodle 2014-01-21 14:49:26 +08:00
Dan Poltawski
8a04a045b3 Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle 2014-01-21 14:28:50 +08:00
Damyon Wiese
e677c1be7c Merge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle 2014-01-21 13:47:39 +08:00
Damyon Wiese
29f7aef8e9 Merge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle 2014-01-21 13:17:05 +08:00
Damyon Wiese
f329801959 Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges 
Conflicts:
	badges/upgrade.txt
 2014-01-21 13:06:30 +08:00
Damyon Wiese
c821f113cc Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-01-21 12:57:05 +08:00
Dan Poltawski
e8d79c2d4b Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle 2014-01-21 12:24:38 +08:00
Dan Poltawski
d5b5f1a38b Merge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle 2014-01-21 12:19:34 +08:00
Dan Poltawski
e5c5f52e8b MDL-43670 quiz: improve code comments a little 2014-01-21 11:59:07 +08:00
Dan Poltawski
1f931e2928 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-21 11:25:38 +08:00
Dan Poltawski
d0a0768b7f Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle 2014-01-21 11:21:52 +08:00
Damyon Wiese
5388c6665f Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle 2014-01-21 10:41:40 +08:00
Dan Poltawski
0296662a22 Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle 2014-01-21 10:37:01 +08:00
Damyon Wiese
d3b5017940 Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle 2014-01-21 09:35:21 +08:00
Damyon Wiese
7b6464bf9d Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle 2014-01-21 09:28:54 +08:00
Eloy Lafuente (stronk7)
bc6d39a561 Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle 2014-01-21 01:59:50 +01:00
Eric Merrill
bed27b3024 MDL-43732 quiz Fix styles so that question div doesn't overlap controls. 2014-01-20 19:56:17 -05:00
Eloy Lafuente (stronk7)
ba766c4772 Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle 2014-01-21 01:54:00 +01:00
Eloy Lafuente (stronk7)
2079744b84 Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle 2014-01-21 01:46:16 +01:00
Eloy Lafuente (stronk7)
b7623bcb5d Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle 2014-01-21 01:43:13 +01:00
Eloy Lafuente (stronk7)
ad1ad9f5b4 Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle 2014-01-21 01:13:04 +01:00
Eloy Lafuente (stronk7)
b0512f418b Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-21 00:20:28 +01:00
Eloy Lafuente (stronk7)
1816a46d11 Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle 2014-01-21 00:17:31 +01:00
Eloy Lafuente (stronk7)
9faed21cb9 Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle 2014-01-21 00:05:03 +01:00
Eloy Lafuente (stronk7)
221e6adaa5 Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 23:59:27 +01:00
Frederic Massart
fb95da6f5b MDL-41688 gradebook: Improved grading layout on bootstrapbase themes 2014-01-20 10:34:03 +01:00