moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54931 commits 37 branches 540 tags 1.3 GiB
Commit graph

54931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
4afbd0c834 Merge branch 'w28_MDL-34159_m24_wherelist' of git://github.com/skodak/moodle 2012-07-10 12:52:14 +08:00
Sam Hemelryk
f0d6e53c11 Merge branch 'w28_MDL-33617_m24_roleenrolindex' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 15:47:33 +12:00
Sam Hemelryk
e9c614276b Merge branch 'MDL-34237' of git://github.com/danpoltawski/moodle 2012-07-10 15:26:58 +12:00
Dan Poltawski
00142ce553 MDL-34237 - fix version number mistake 2012-07-10 11:20:33 +08:00
Sam Hemelryk
af0c360f48 Merge branch 'w28_MDL-33887_m24_jsstrings' of git://github.com/skodak/moodle 2012-07-10 15:07:47 +12:00
Dan Poltawski
b445f75019 Merge branch 'MDL-34156-master' of git://github.com/micaherne/moodle 2012-07-10 10:53:16 +08:00
Sam Hemelryk
e977b391b7 Merge branch 'w28_MDL-34057_m24_styledebug' of git://github.com/skodak/moodle 2012-07-10 14:50:40 +12:00
Sam Hemelryk
8f19a94304 Merge branch 'w28_MDL-34101_m24_newaccountprev' of git://github.com/skodak/moodle 2012-07-10 14:42:28 +12:00
Dan Poltawski
4b9e493b0a Merge branch 'w28_MDL-34147_m24_cygwin' of git://github.com/skodak/moodle 2012-07-10 10:31:16 +08:00
Dan Poltawski
315e968209 MDL-8249 - tests: fix breaking unit tests 2012-07-10 10:17:47 +08:00
Dan Poltawski
029be094ab MDL-8249 - tests: fix trailing whitespace 2012-07-10 10:17:33 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:43:23 +08:00
Dan Poltawski
c4f48b552f Merge branch 'MDL-34171' of git://github.com/timhunt/moodle 2012-07-10 09:24:56 +08:00
Dan Poltawski
b40eca11d9 Merge branch 'w28_MDL-33018_m24_pgindex2' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:17:23 +08:00
Sam Hemelryk
2e87278cbd Merge branch 'w28_MDL-34155_m24_visibilitydefault' of git://github.com/skodak/moodle 2012-07-10 12:51:50 +12:00
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