moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48567 commits 37 branches 544 tags 1.3 GiB
Commit graph

48567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
1eff23084e Merge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle 2011-07-18 19:27:57 +10:00
Petr Skoda
83162b2612 Merge branch 'wip-MDL-25125-master' of github.com:marinaglancy/moodle 2011-07-18 09:18:31 +02:00
Sam Hemelryk
610cc5c383 Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle 2011-07-19 00:45:13 +10:00
Sam Hemelryk
761a000f73 Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle 2011-07-19 00:39:02 +10:00
Sam Hemelryk
508a5bd402 Merge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle 2011-07-19 00:34:37 +10:00
Sam Hemelryk
5f65d37cd2 Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git 2011-07-19 00:25:13 +10:00
Petr Skoda
656749c18a MDL-28363 make dimmed selectors more specific to prevent overriding from other themes 2011-07-16 21:03:06 +02:00
Petr Skoda
d20f655d59 MDL-28350 prevent bogus role assignment via externallib 2011-07-15 12:23:34 +02:00
David Mudrak
94f630e33f MDL-28325 Enrolment: added help to the duration, start date and end date setting 
The patch also fixes one typo in enrol_manual detected while working on
this.
 2011-07-15 08:59:55 +02:00
Marina Glancy
4173ef4a04 MDL-25125 fix YUI bug with overriding styles 2011-07-14 09:40:00 +08:00
Dan Marsden
99da7a9523 MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help! 2011-07-14 11:06:49 +12:00
Dan Marsden
7b6f5c8d1e MDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch 2011-07-14 11:01:16 +12:00
Sam Hemelryk
ecb8829273 weekly release 2.2dev 2011-07-13 20:21:48 +08:00
Sam Hemelryk
59c8535226 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-07-13 20:06:16 +08:00
Sam Hemelryk
4d4e6d6bfc Revert "MDL-23344 fix login form focus" 
This reverts commit 70b02b12d3.
 2011-07-13 20:02:58 +08:00
David Mudrak
c8ea2c4572 MDL-28298 workshop: do not use a constant without explicit inclusion of the library 
Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.
 2011-07-13 10:28:28 +02:00
Eloy Lafuente (stronk7)
e62a947eec Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle 2011-07-12 16:57:54 +02:00
Eloy Lafuente (stronk7)
dd8f2538b6 Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
 2011-07-12 16:28:36 +02:00
Eloy Lafuente (stronk7)
d703e3816f MDL-28210 messaging: all includes but config.php must use $CFG-based abosolute paths 2011-07-12 12:17:34 +02:00
Eloy Lafuente (stronk7)
8654b65619 Merge branch 'MDL-28210_messaging_constants2' of git://github.com/andyjdavis/moodle 2011-07-12 12:16:16 +02:00
Andrew Davis (andyjdavis)
6366fdcc6c MDL-28210 messaging: Fixed requires problems in /message/discussion.php 2011-07-12 10:46:59 +08:00
AMOS bot
84a4374683 Automatically generated installer lang files 2011-07-12 00:55:19 +00:00
Dan Marsden
59cdcb9770 MDL-28017 - SCORM unset old config var 2011-07-12 09:46:23 +12:00
David Mudrak
47f5964381 MDL-28221 Legacy resource URL pointing to the course itself are migrated as File module 
This patch replays the logic of resource_20_migrate() function. If a
file is referred via URL to the course files of the course being
backed up, then such a resource is converted to the File module
(mod/resource) rather than URL module.
 2011-07-11 23:30:28 +02:00
David Mudrak
498c722d0f MDL-28221 resource: improved file not found handling 
When the referenced file is not found, do not rely on the record in
resource_old as the resource can be actually restored from a 1.9 backup.
 2011-07-11 23:30:28 +02:00
David Mudrak
c6c9a3bcdb MDL-28221 resource: fixed a typo in variable names 2011-07-11 23:30:28 +02:00
Eloy Lafuente (stronk7)
d253e3cc90 Merge branch 'w27_MDL-28270_m22_cohortfilter' of git://github.com/skodak/moodle 2011-07-11 20:22:42 +02:00
Eloy Lafuente (stronk7)
701570b5e4 Merge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle 2011-07-11 19:47:14 +02:00
Eloy Lafuente (stronk7)
8746aab856 Merge branch 'MDL-27755' of git://github.com/rwijaya/moodle 2011-07-11 19:41:00 +02:00
Eloy Lafuente (stronk7)
7660f09ee6 Merge branch 'MDL-27741' of git://github.com/rwijaya/moodle 2011-07-11 19:35:41 +02:00
Eloy Lafuente (stronk7)
fc75965b63 Merge branch 'w27_MDL-23344_m22_loginfocus' of git://github.com/skodak/moodle 2011-07-11 17:01:58 +02:00
Eloy Lafuente (stronk7)
2af4d0a27f Merge branch 'MDL-23580' of git://git.luns.net.uk/moodle 2011-07-11 16:46:35 +02:00
Eloy Lafuente (stronk7)
3fe120a6c6 Merge branch 'MDL-26165' of git://github.com/timhunt/moodle 2011-07-11 16:32:17 +02:00
Eloy Lafuente (stronk7)
cf5b3dad05 Merge branch 'MDL-27483' of git://github.com/timhunt/moodle 2011-07-11 16:25:42 +02:00
Eloy Lafuente (stronk7)
97c5f85f37 Merge branch 'MDL-27931' of git://github.com/rwijaya/moodle 2011-07-11 15:56:22 +02:00
Eloy Lafuente (stronk7)
d5497dcc86 MDL-28109 scorm - new settings => version bump 2011-07-11 15:54:11 +02:00
Eloy Lafuente (stronk7)
2abfc1c630 Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle 2011-07-11 15:42:21 +02:00
Eloy Lafuente (stronk7)
21ba26e814 Merge branch 'w27_MDL-28158_m22_cookies' of git://github.com/skodak/moodle 2011-07-11 15:33:03 +02:00
Eloy Lafuente (stronk7)
f046f96f05 Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle 2011-07-11 15:20:56 +02:00
Eloy Lafuente (stronk7)
75853bc5a5 Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle 2011-07-11 12:06:22 +02:00
Eloy Lafuente (stronk7)
23e90aa5b8 Merge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle 2011-07-11 12:01:34 +02:00
Rossiani Wijaya
0d3780a1e8 MDL-27741 forum subscribe link: Removed 'no' string in social course format to display a subscribe link if user is not enrolled 2011-07-11 17:07:55 +08:00
Sam Hemelryk
9c52c8a4b0 Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle 2011-07-11 16:20:03 +08:00
Sam Hemelryk
e2d1b25a5a Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle 2011-07-11 16:11:50 +08:00
Sam Hemelryk
59772e4749 Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle 2011-07-11 16:01:26 +08:00
Sam Hemelryk
9dae5179cb Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle 2011-07-11 15:40:12 +08:00
Petr Skoda
56284322ea MDL-22404 bulk user add to cohort 2011-07-11 09:20:45 +02:00
Sam Hemelryk
c430467ca8 Merge branch 'MDL-28195' of git://github.com/timhunt/moodle 2011-07-11 15:02:03 +08:00
Sam Hemelryk
48ae99cbaf Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle 2011-07-11 14:50:56 +08:00
Sam Hemelryk
3bbc7a0fc5 Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle 2011-07-11 14:18:54 +08:00