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

49895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rossiani Wijaya
b43251b846 MDL-29569: lesson_mod: in matching type questions, fixed and set default value for scoring and fixed jump page setting when response text is set to empty 2011-10-25 12:22:02 +08:00
Sam Hemelryk
1c3bd9b3ff Merge branch 'MDL-28718' of git://github.com/timhunt/moodle 2011-10-25 16:47:20 +13:00
Jerome Mouneyrac
5b9735b949 MDL-29716 Make token more flexible to support third party client - also fix issue with some code not matching the way the server authenticate/authorize token, missing iprestriction/validuntil for restricted users (there are iprestriction/validiuntil on token and on restricted user). Also add missing check when the user is not listed in the authorised list. 2011-10-25 11:17:18 +08:00
Sam Hemelryk
e6acc5518b MDL-29106 white space clean up 2011-10-25 15:28:52 +13:00
Sam Hemelryk
d040ea8893 Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle 2011-10-25 15:19:45 +13:00
Marina Glancy
8722a322db MDL-29794: fixed bug with description cloning 2011-10-25 09:49:10 +08:00
Sam Hemelryk
6327bf8f2b Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle 2011-10-25 14:28:53 +13:00
Sam Hemelryk
44d10ad002 Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle 2011-10-25 14:02:20 +13:00
Marina Glancy
8df55bbe6a MDL-29481: rubric renderer now uses tables for smoother layout 2011-10-25 08:57:56 +08:00
Marina Glancy
fc5adc3b5d MDL-29481: phpdocs in renderer, renamed the main CSS class for rubric 2011-10-25 08:57:56 +08:00
Sam Hemelryk
9d9d8e17eb Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle 2011-10-25 13:10:43 +13:00
Eloy Lafuente (stronk7)
9bfe68bff8 Merge branch 'MDL-29339_b' of git://github.com/timhunt/moodle 2011-10-25 01:53:51 +02:00
Eloy Lafuente (stronk7)
dc83f5b006 Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle 2011-10-25 01:42:48 +02:00
Sam Hemelryk
6f59dd1a8b Merge branch 'MDL-29906' of git://github.com/timhunt/moodle 2011-10-25 12:25:28 +13:00
Eloy Lafuente (stronk7)
4ecbf079b5 Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle 
Conflicts:
	lib/thirdpartylibs.xml
 2011-10-25 01:21:09 +02:00
Eloy Lafuente (stronk7)
e1595b32dc Merge branch 'w42_MDL-29863_m22_extendsorder' of git://github.com/skodak/moodle 2011-10-25 01:01:10 +02:00
Sam Hemelryk
9c99c3df46 Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle 2011-10-25 11:49:25 +13:00
Sam Hemelryk
2d94084463 Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle 2011-10-25 11:46:51 +13:00
Sam Hemelryk
c486d7f2d8 Merge branch 'MDL-29459' of git://github.com/mouneyrac/moodle 2011-10-25 11:45:58 +13:00
Sam Hemelryk
2336a84333 MDL-29106 webservices: Minor whitespace cleanup 2011-10-25 11:43:53 +13:00
Sam Hemelryk
b8b594843c Merge branch 'MDL-29106' of git://github.com/mouneyrac/moodle 2011-10-25 11:42:40 +13:00
Eloy Lafuente (stronk7)
e4950b6cf0 Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle 2011-10-24 23:14:31 +02:00
Eloy Lafuente (stronk7)
1272091a6c Merge branch 'w42_MDL-29878_m22_typo3' of git://github.com/skodak/moodle 2011-10-24 23:04:54 +02:00
Eloy Lafuente (stronk7)
918ecf1754 Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle 2011-10-24 23:03:11 +02:00
David Mudrak
01609c9ad9 Merge remote branch 'origin/master' into rubric 
Conflicts:
	lib/db/upgrade.php
	version.php
 2011-10-24 22:13:01 +02:00
David Mudrak
8b9ada5e19 Merge remote branch 'github/rubric' into rubric 2011-10-24 21:02:56 +02:00
David Mudrak
9c9cee4e33 Simplified manage.php initialization 
For now, we support activity modules only anyway.
 2011-10-24 21:02:05 +02:00
David Mudrak
d1bc817832 Merge pull request #16 from marinaglancy/wip-MDL-29483-rubric 
MDL-29483: advanced grading methods support on assignment module, grading
 2011-10-24 11:59:08 -07:00
Eloy Lafuente (stronk7)
a4f6cc2fc7 Merge branch 'w42_MDL-29887_m22_swfobject' of git://github.com/skodak/moodle 2011-10-24 18:25:52 +02:00
Eloy Lafuente (stronk7)
b64188cd97 Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle 2011-10-24 18:03:42 +02:00
Eloy Lafuente (stronk7)
e9296e6177 Merge branch 'w42_MDL-29885_m22_csshover' of git://github.com/skodak/moodle 2011-10-24 17:50:27 +02:00
Petr Skoda
22d7cede55 MDL-29887 add forgotten flashvars 
Thanks Eloy!
 2011-10-24 17:43:05 +02:00
Tim Hunt
442a3c0b62 MDL-29906 quiz statistics report: replace use of deprectaed helpbutton. 2011-10-24 16:19:46 +01:00
Dan Poltawski
e52a8ebdd2 MDL-29902: Course contacts display cleanup 
This fixes warnings in course description when searching courses with
users assigned multiple display roles. It cleans up inconsistent behaviour
which I noticed whilst fixing the bug. Now course search and course listing
use the same logic to display users.
 2011-10-24 15:52:35 +01:00
Eloy Lafuente (stronk7)
f3b6463506 Merge branch 'w42_MDL-29886_m22_md5js' of git://github.com/skodak/moodle 2011-10-24 16:51:53 +02:00
Andrew Robert Nicols
3b3b8c6b0b MDL-29898: Fix documentation for CLI DB only installer 2011-10-24 12:31:16 +01:00
Tim Hunt
deef04a44e MDL-29339 Manually cast objects to string before calling dmllib. 2011-10-24 11:08:10 +01:00
Aparup Banerjee
0e03740fc8 Merge branch 'MDL-29542' of git://github.com/rwijaya/moodle 2011-10-24 17:05:17 +08:00
Aparup Banerjee
64fcc674f9 Merge branch 'MDL-29828' of git://github.com/timhunt/moodle 2011-10-24 16:39:17 +08:00
Aparup Banerjee
ef0aa7ba5c MDL-29527 RSS : improved language string. 2011-10-24 15:50:58 +08:00
Aparup Banerjee
9809413bba Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle 2011-10-24 15:37:14 +08:00
Aparup Banerjee
5117a3d789 Merge branch 'MDL-29619-master' of git://github.com/ankitagarwal/moodle 2011-10-24 14:21:39 +08:00
Marina Glancy
fc05f22204 MDL-29483: allow the grading instance to exist without itemid until submitting (submission in assignment might not yet existed) 2011-10-24 13:36:51 +08:00
Marina Glancy
ed709412c2 MDL-29108: support for returnurl in rubriceditor 2011-10-24 13:36:42 +08:00
Marina Glancy
5060997ba5 MDL-29481: added support for remarks in rubric feedback 2011-10-24 13:36:33 +08:00
Aparup Banerjee
b077de82f9 Merge branch 'MDL-29646-master' of git://github.com/ankitagarwal/moodle 2011-10-24 13:26:28 +08:00
Aparup Banerjee
c11ccbfd8b Merge branch 'MDL-29818-master' of git://git.luns.net.uk/moodle 2011-10-24 11:36:07 +08:00
Jerome Mouneyrac
5d1017e11d MDL-29106 new web service naming convention 2011-10-24 11:06:00 +08:00
Petr Skoda
3df93d6d88 MDL-29444 use iframe embedding in IE 
iframe is back in HTML 5, we can safely use it in IE for all text documents because object embedding has multiple problems
 2011-10-23 21:14:04 +02:00
Petr Skoda
379434e440 MDL-29688 add support for status sync in enrol meta plugin 2011-10-23 20:52:10 +02:00