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

54900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
db296214d9 Merge branch 'w28_MDL-34010_m24_mysqldiag' of git://github.com/skodak/moodle 2012-07-10 08:49:22 +08:00
Sam Hemelryk
1ef3f066ee Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle 2012-07-10 12:43:48 +12:00
Dan Poltawski
a87425aba8 Merge branch 'w28_MDL-33568_m24_recordcounts' of git://github.com/skodak/moodle 2012-07-10 08:38:41 +08:00
Dan Poltawski
5c509b058e Merge branch 'master_MDL-34198' of git://github.com/danmarsden/moodle 2012-07-10 08:34:18 +08:00
Sam Hemelryk
3bfe07a5ad Merge branch 'wip-MDL-33444-master' of git://github.com/marinaglancy/moodle 2012-07-10 12:27:47 +12:00
Sam Hemelryk
77c3ccccd2 Merge branch 'wip-MDL-34139-master' of git://github.com/marinaglancy/moodle 2012-07-10 12:22:19 +12:00
Sam Hemelryk
3ea910c83f Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-10 12:16:26 +12:00
Sam Hemelryk
5958b17eb0 Merge branch 'MDL-29470-master' of git://github.com/FMCorz/moodle 2012-07-10 12:13:03 +12:00
Sam Hemelryk
3aed38eb7d Merge branch 'MDL-32297-master' of git://github.com/FMCorz/moodle 2012-07-10 12:03:00 +12:00
Sam Hemelryk
3b37c5ceb9 Merge branch 'MDL-34107_filename_dot' of git://github.com/davosmith/moodle 2012-07-10 11:47:20 +12:00
Sam Hemelryk
0f36bce51e Merge branch 'MDL-34061' of git://github.com/danpoltawski/moodle 2012-07-10 11:40:18 +12:00
Sam Hemelryk
68a5f9c7ab Merge branch 'MDL-27800-23' of https://github.com/mackensen/moodle 2012-07-10 11:32:09 +12:00
Dan Poltawski
4e85084148 Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle 2012-07-09 14:27:10 +08:00
Dan Poltawski
423c96868d Merge branch 'MDL-32057' of git://github.com/aolley/moodle 2012-07-09 14:14:07 +08:00
Dan Poltawski
13ce630719 Merge branch 'w28_MDL-34046_m24_stalefiles' of git://github.com/skodak/moodle 2012-07-09 13:50:09 +08:00
Dan Poltawski
5e1e213707 Merge branch 'MDL-33030' of git://github.com/rwijaya/moodle 2012-07-09 13:42:26 +08:00
Dan Poltawski
2579ac464f Merge branch 'wip-mdl-29969' of git://github.com/rajeshtaneja/moodle 2012-07-09 13:39:08 +08:00
Dan Poltawski
098c02be10 Merge branch 'MDL-34077-master' of git://github.com/FMCorz/moodle 2012-07-09 13:37:20 +08:00
Sam Hemelryk
357f4d8ed7 Merge branch 'master_MDL-33822' of git://github.com/danmarsden/moodle 2012-07-09 17:24:13 +12:00
Sam Hemelryk
0e08cd1ffd Merge branch 'MDL-17395' of git://github.com/danpoltawski/moodle 2012-07-09 17:19:19 +12:00
Sam Hemelryk
3c34f3213f Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle 2012-07-09 17:14:08 +12:00
Dan Poltawski
898a2310a5 Merge branch 'wip-MDL-34143-master' of git://github.com/marinaglancy/moodle 2012-07-09 13:05:25 +08:00
Sam Hemelryk
66dd3e5d2f MDL-32119 Fixed messy merge in upgrade code 2012-07-09 17:00:52 +12:00
Sam Hemelryk
46bc0e2238 Merge branch 'MDL-33702-master' of git://github.com/ankitagarwal/moodle 2012-07-09 16:27:30 +12:00
Sam Hemelryk
a2a2e7fb4a Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-09 16:02:49 +12:00
Dan Poltawski
cfd5687407 Merge branch 'wip-mdl-33943' of git://github.com/rajeshtaneja/moodle 2012-07-09 11:34:46 +08:00
Dan Poltawski
7265d03334 Merge branch 'MDL-27831-master' of git://github.com/ankitagarwal/moodle 2012-07-09 11:29:38 +08:00
Ankit Agarwal
fa6e528c79 MDL-27831 calendar: Removing reduntand control icons in delete.php 2012-07-09 11:29:39 +08:00
Ankit Agarwal
9381c28084 MDL-33702 scorm: refactoring interraction report to use '2004 SCORM' score elements 2012-07-09 11:27:34 +08:00
Ankit Agarwal
57a32d3eb6 MDL-33702 scorm: Adding support for '2004 SCORM' progress status elements 2012-07-09 11:27:34 +08:00
Ankit Agarwal
d875cf9cdf MDL-33702 scorm: Adding support for '2004 SCORM' objectives status elements 2012-07-09 11:27:34 +08:00
Ankit Agarwal
1c2b2132e5 MDL-33702 scorm: Adding suppport for '2004 SCORM standard' score elements 2012-07-09 11:27:34 +08:00
Dan Poltawski
b4b31391cf Merge branch 'MDL-33885-master' of git://github.com/FMCorz/moodle 2012-07-09 10:31:47 +08:00
Dan Poltawski
8081238453 Merge branch 'MDL-33890-master-2' of git://git.luns.net.uk/moodle 2012-07-09 10:02:13 +08:00
Sam Hemelryk
b4aa178e40 MDL-29538 condition: Fixed up phpunit tests after addition of user field conditions 2012-07-09 12:37:22 +12:00
Sam Hemelryk
141d3c86d3 MDL-29538 condition: Tidied up user field condition code post merge 2012-07-09 11:45:44 +12:00
Sam Hemelryk
871c06e583 Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle 2012-07-09 11:44:39 +12:00
Sam Hemelryk
440821205a MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results 2012-07-09 10:56:14 +12:00
Sam Hemelryk
5261dab607 Merge branch 'MDL-30816' of git://github.com/rwijaya/moodle 2012-07-09 10:45:14 +12:00
Sam Hemelryk
ece157e426 Merge branch 'MDL-33514' of git://github.com/danpoltawski/moodle 2012-07-09 10:22:06 +12:00
Sam Hemelryk
91448b9db2 Merge branch 'MDL-31033_message_deprecated' of git://github.com/andyjdavis/moodle 2012-07-09 10:19:50 +12:00
Ruslan Kabalin
2d724607e1 MDL-33890 Make course blocks less theme dependant 
This fix checks that the empty block region is actaually the standard one, so
it can be hidden. The blocks move operating area is not resticted to page
content any more.
 2012-07-06 11:16:37 +01:00
Petr Škoda
efc80e2bb8 MDL-33454 import latest TinyMCE 3.5.4.1 2012-07-06 08:10:14 +02:00
Petr Skoda
63224dee44 MDL-33568 improve DB->count_records*() 
Now always returns integer and invalid queries are detected.
 2012-07-06 08:09:11 +02:00
Petr Škoda
3c2fbdbb87 MDL-34010 improve mysqli engine diagnostics performace 2012-07-06 08:01:33 +02:00
Michael Aherne
445be5c6cd MDL-34010 Update diagnose() function to query information_schema.tables 2012-07-06 08:01:33 +02:00
Petr Škoda
774c42a8d3 MDL-34046 improve mixed files upgrade error 
Credit goes to Gordon Bateson.
 2012-07-06 08:00:53 +02:00
Petr Škoda
d6fc8d94e2 MDL-34175 a few more renamed admin fixes 2012-07-06 07:53:44 +02:00
Petr Škoda
8a8914cd41 MDL-34175 automatically fix admin JS links 2012-07-06 07:51:23 +02:00
Frederic Massart
3e0ce6079c MDL-33885 Blog: Added maxlength rule to subject field 2012-07-06 13:14:52 +08:00