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

61494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
20fe8676ea Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle 2013-06-04 14:44:35 +08:00
Dan Poltawski
93ab081025 Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-04 14:37:55 +08:00
Dan Poltawski
e404e040d3 Merge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle 2013-06-04 14:14:18 +08:00
Dan Poltawski
31e9ffe0ac MDL-39931 less: recompile with whitespace removed 2013-06-04 14:08:28 +08:00
Dan Poltawski
42d00d3638 Merge branch 'MDL-39931' of github.com:lazydaisy/moodle 2013-06-04 13:31:34 +08:00
Dan Poltawski
7f639dd352 Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle 2013-06-04 13:18:49 +08:00
Frederic Massart
1530fe2192 MDL-39536 completion: Unit tests for get_activities and has_activities 2013-06-04 12:57:13 +08:00
Frederic Massart
8ca0c12370 MDL-39536 completion: Prevent DB call when fetching activities 2013-06-04 12:57:10 +08:00
Dan Poltawski
984dc35457 Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle 2013-06-04 12:27:30 +08:00
Dan Poltawski
4dfadbc99b Merge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/moodle 2013-06-04 11:29:38 +08:00
Dan Poltawski
ea746c0166 Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle 2013-06-04 11:26:28 +08:00
Dan Poltawski
0d9121a1c4 Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle 2013-06-04 11:03:39 +08:00
Dan Poltawski
820b66be58 Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle 2013-06-04 10:42:45 +08:00
Eloy Lafuente (stronk7)
b50ddbdbd5 Merge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle 2013-06-04 01:51:10 +02:00
Eloy Lafuente (stronk7)
aed9401e14 MDL-39764 style: phpdoc changed to inline comments 2013-06-04 01:41:58 +02:00
Eloy Lafuente (stronk7)
00169e862e Merge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle 2013-06-04 01:36:16 +02:00
Eloy Lafuente (stronk7)
fd4c01566e Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle 2013-06-04 01:31:54 +02:00
Eloy Lafuente (stronk7)
422595e282 Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle 2013-06-04 01:14:09 +02:00
Eloy Lafuente (stronk7)
d13d3f2d31 MDL-39465 Show env. info instead of part twice. 2013-06-04 00:50:15 +02:00
Gareth J Barnard
86f590b45f MDL-39764 course_format: Allow courses to have numsections > maxsections. 2013-06-03 23:36:32 +01:00
Eloy Lafuente (stronk7)
5431fda180 Merge branch 'MDL-39936-master' of git://github.com/danpoltawski/moodle 2013-06-04 00:04:12 +02:00
Eloy Lafuente (stronk7)
a346c3826b Merge branch 'w23_MDL-39465_m26_environment' of git://github.com/skodak/moodle 2013-06-03 23:59:12 +02:00
Eloy Lafuente (stronk7)
0288c5ffe1 Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle 2013-06-03 23:51:22 +02:00
Eloy Lafuente (stronk7)
9e3b5a47f6 Merge branch 'wip-MDL-39710-master' of git://github.com/marinaglancy/moodle 2013-06-03 23:18:55 +02:00
Eloy Lafuente (stronk7)
71b2d24a9b Merge branch 'MDL-39932_master' of git://github.com/grabs/moodle 2013-06-03 19:10:00 +02:00
Eloy Lafuente (stronk7)
6cffc66647 Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle 2013-06-03 19:03:15 +02:00
Eloy Lafuente (stronk7)
c557f6b324 Merge branch 'MDL-39987_master' of git://github.com/lazydaisy/moodle 2013-06-03 16:20:41 +02:00
Mary Evans
c14964cacb MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php. 2013-06-02 23:04:17 +01:00
Mary Evans
5f831ca077 MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions. 2013-06-01 21:36:58 +01:00
Gareth J Barnard
873dfb3608 MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker. 2013-05-31 22:30:26 +01:00
Petr Škoda
7dc1feaa99 MDL-39465 detect environment problems in tests 
This should help explain why something else fails.
 2013-05-31 22:02:34 +02:00
Petr Škoda
f8cb3e62ff MDL-39882 add required behat settings to config-dist 2013-05-31 21:09:52 +02:00
Marina Glancy
027c230796 MDL-39710 Don't display rubric and guide preview unless option checked 2013-05-31 16:14:32 +10:00
Russell Boyatt
8f485ce28e Fixing MDL-39710: setting to limit student access to rubric now checked. 2013-05-31 16:14:26 +10:00
Marina Glancy
5150c30203 MDL-39801 navigation_node::remove does not allow to insert nodes afterwards 2013-05-31 11:49:34 +10:00
Marina Glancy
e3b11a6e2b MDL-39801 navigation_node::remove fails if first child does not have a key 2013-05-31 11:49:12 +10:00
Andreas Grabs
e6e9bec3ee MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson 2013-05-30 23:10:33 +02:00
David Mudrák
b60ab47cb7 MDL-39939 Fix the basic SCORM report plugin name 2013-05-30 22:42:12 +02:00
Iñaki Arenaza
7469c51270 MDL-34085 Fix the backup options names in core_course_duplicate_course 
Fix the option names to match those used by the backup subsystem.
 2013-05-30 17:26:29 +02:00
Mary Evans
947483327f MDL-39931 theme_bootstrapbase: ported invisiblefieldset css rules from theme/base/core.css to less/moodle/core.css 2013-05-30 15:26:13 +01:00
Dan Poltawski
4f5bcf2eca MDL-39936 upgrade: 2.5.0 line incorrectly positioned 2013-05-30 13:41:15 +08:00
Damyon Wiese
b6f8a93642 weekly on-sync release 2.6dev 2013-05-30 11:50:35 +08:00
Damyon Wiese
455d204201 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-05-30 11:25:54 +08:00
AMOS bot
4912f45476 Automatically generated installer lang files 2013-05-30 00:38:20 +00:00
Damyon Wiese
7775545197 MDL-39317 assign: Fix for submitted filter on grading table. 
Some old upgraded assignments have no timecreated column so use
a different one to check for a valid submission.
 2013-05-29 14:40:50 +08:00
Marina Glancy
74aeac79b4 MDL-39870 correctly determine whether activity is resource or module 2013-05-29 14:45:20 +10:00
Ashley Holman
c7e4403c9f MDL-39743 assign: Fix missing capability check for "grant extension" 2013-05-29 11:58:48 +08:00
Damyon Wiese
48488bfb39 MDL-39821 assign: missing setType with advanced grading 2013-05-29 11:20:56 +08:00
AMOS bot
7440ce08c3 Automatically generated installer lang files 2013-05-29 00:39:21 +00:00
Eloy Lafuente (stronk7)
aeb5f9ae37 Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle 2013-05-28 15:31:07 +02:00