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

58368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
5a3d98c26d Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle 2013-01-15 10:48:53 +13:00
Sam Hemelryk
2a6dbdcaee Merge branch 'MDL-37378' of git://github.com/timhunt/moodle 2013-01-15 10:43:08 +13:00
Sam Hemelryk
0fe5a201c0 Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/locallib.php
	mod/assign/submission/onlinetext/locallib.php
 2013-01-15 10:37:54 +13:00
Sam Hemelryk
2d971403e6 MDL-31682 mod_assign: fixed since version on new service. 2013-01-15 10:27:40 +13:00
Sam Hemelryk
ddca5610d3 Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle 
Conflicts:
	mod/assign/version.php
 2013-01-15 10:21:20 +13:00
Sam Hemelryk
ccc89b8235 Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle 2013-01-15 10:12:44 +13:00
Dan Poltawski
5c2aacc21c Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle 2013-01-14 15:34:29 +08:00
Dan Poltawski
9695b2a596 Merge branch 'wip-MDL-30797-master' of git://github.com/abgreeve/moodle 2013-01-14 15:26:09 +08:00
Dan Poltawski
b75d99239d Merge branch 'w02_MDL-37151_m25_mimetex' of git://github.com/skodak/moodle 2013-01-14 15:24:10 +08:00
Dan Poltawski
5590e85e1a Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle 2013-01-14 15:11:42 +08:00
Dan Poltawski
2e55217173 MDL-36297 - increment version no 2013-01-14 15:06:20 +08:00
Dan Poltawski
ddaf0983b2 Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle 2013-01-14 15:05:15 +08:00
Dan Poltawski
bf5f8a4f60 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-14 14:59:22 +08:00
Marina Glancy
8afb1cc8f8 MDL-37206 preload course format renderer in course/view.php 
Also fixed bug with hardcoded default 'weeks' format
 2013-01-14 15:14:08 +11:00
Adrian Greeve
51e8d287f9 MDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function. 
$timeadded has now been included so that the backup / restore functions can now use
this API rather than duplicating the code.
 2013-01-14 10:24:37 +08:00
Adam Olley
fdcf4a5f37 MDL-30797 backup: Use correct API call for mapping groups to groupings on import/restore 2013-01-14 10:24:37 +08:00
Sam Hemelryk
110178c5c2 Merge branch 'MDL-37048-master' of git://github.com/ankitagarwal/moodle 2013-01-14 14:08:56 +13:00
Sam Hemelryk
f5c51a6d64 Merge branch 'MDL-35568_dndupload_hidden' of git://github.com/davosmith/moodle 2013-01-14 13:51:48 +13:00
Sam Hemelryk
8b2d3f1bef Merge branch 'wip-MDL-35885-master' of git://github.com/phalacee/moodle 2013-01-14 13:40:06 +13:00
Sam Hemelryk
469749706a Merge branch 'MDL-36095-master' of git://github.com/sammarshallou/moodle 2013-01-14 12:24:06 +13:00
Sam Hemelryk
8d9c15a44e Merge branch 'MDL-36511' of git://github.com/srynot4sale/moodle 2013-01-14 12:13:00 +13:00
Sam Hemelryk
00df8f3f45 Merge branch 'w02_MDL-32387_m25_paypalexpire' of git://github.com/skodak/moodle 2013-01-14 11:47:37 +13:00
Sam Hemelryk
c2e2da2e69 Merge branch 'master_MDL-37394' of git://github.com/danmarsden/moodle 2013-01-14 11:46:13 +13:00
Sam Hemelryk
d9a3d932db Merge branch 'MDL-37397-m' of git://github.com/andrewnicols/moodle 2013-01-14 11:04:52 +13:00
Sam Hemelryk
9abf0ed1dc Merge branch 'wip-mdl-35780' of git://github.com/rajeshtaneja/moodle 2013-01-14 11:00:00 +13:00
Petr Škoda
e659c02595 MDL-37151 upgrade mimetex to 1.74 
Thanks Ralf Krause for help with OSX compilation flags.
 2013-01-12 16:31:58 +01:00
Petr Škoda
50f1c9e3f5 MDL-36514 add tests for showing of self enrolment link 2013-01-12 16:03:09 +01:00
Petr Škoda
e1fa177cf9 MDL-36514 add new option to prevent only new self enrolments 
Hopefully this will resolve all confusion around the enrol->status flag in this plugin.
 2013-01-12 16:03:08 +01:00
Petr Škoda
d9a707adc2 MDL-32387 add paypal enrolment expiration action 2013-01-12 15:59:25 +01:00
Petr Škoda
4fa7fdeada MDL-37286 improve coding style in unit tests 2013-01-12 15:28:57 +01:00
Petr Škoda
e7259ec998 MDL-37286 add new combined_progress_trace 
This type of trace should be useful when multiple trace outputs requested.
 2013-01-12 15:16:39 +01:00
Petr Škoda
78048e15f2 MDL-37286 add error_log progress trace 2013-01-12 15:16:38 +01:00
Petr Škoda
837e304260 MDL-37286 add progres_trace buffer and unit tests 2013-01-12 15:16:38 +01:00
Tim Hunt
816138b4f2 MDL-37378 quiz restore: timecheckstate not in old backups. 
We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.
 2013-01-11 13:17:13 +00:00
Eloy Lafuente (stronk7)
ca48fe5f97 NOBUG: Bumping version to test auto-packaging 2013-01-11 13:42:08 +01:00
Andrew Robert Nicols
8743aabca0 MDL-37397 Test for a valid select in formautosubmit 
Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.
 2013-01-11 11:49:44 +00:00
Eloy Lafuente (stronk7)
2e5d013417 weekly release 2.5dev 2013-01-11 12:36:05 +01:00
Eloy Lafuente (stronk7)
b64a33bade fix permissions 2013-01-11 12:23:22 +01:00
Eloy Lafuente (stronk7)
d0942f0744 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-01-11 12:15:57 +01:00
Dan Marsden
7b63805531 MDL-37394 SCORM: Aicc direct url fails with new nav as it has a single sco with no children - allow these to be navigated correctly. 2013-01-11 23:45:23 +13:00
Jason Fowler
beff3a9dd5 MDL-35885 - Wiki - add a legend element to the search wikis form 2013-01-11 15:29:35 +08:00
Damyon Wiese
798a060b04 MDL-32341 calendar: get_file_by_hash() expects a hash 2013-01-11 11:55:55 +08:00
Rajesh Taneja
96214a49ec MDL-35780 Administration: email display on user profile view page will respect user capability 2013-01-11 09:33:28 +08:00
Petr Škoda
92b00c32a7 MDL-37420 rework pg schema testing 2013-01-11 02:12:38 +01:00
David Mudrák
fe7e411e7c MDL-37467 Do not provide blog posts via RSS when blogging is disabled 2013-01-10 18:22:56 +01:00
Eloy Lafuente (stronk7)
72a504dc2a Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle 2013-01-10 11:13:13 +01:00
Mark Nelson
941294ef43 MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists 2013-01-10 17:59:40 +08:00
Mark Nelson
faf3016f35 MDL-37247 mod_forum: removing unnecessary variable in the get_forums web service 2013-01-10 13:45:45 +08:00
Mark Nelson
0c246ae5d9 MDL-37247 mod_forum: perform conditional checks before returning forums via web service 2013-01-10 12:47:23 +08:00
Dan Poltawski
319d937602 Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle" 
This reverts commit 8361f557a117211a21e657b8ad6b8bec402fbf69,
2b9e957a274c037b222b8159dbc03b49d61b2e47 and
fae51910bf8d7e859f9dae807b9ca54089c5109e
 2013-01-10 11:17:33 +08:00