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

14957 commits

Author SHA1 Message Date
Dan Poltawski
70f1ddba87 Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle 2013-12-19 10:56:41 +08:00
Damyon Wiese
76dc48cb6a MDL-34432 Assign: Set up the commentinline form element properly. 2013-12-19 09:40:14 +08:00
Eloy Lafuente (stronk7)
c751d81bbc Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle 
Conflicts:
	mod/assign/upgrade.txt
 2013-12-19 01:37:57 +01:00
Paul Charsley
29932b2112 MDL-42425 modify mod_assign_save_grade to process advanced grading data 2013-12-19 09:39:22 +13:00
Frederic Massart
4550e762f4 MDL-43438 mod_assignment: Prevent double inclusion of plugin files 2013-12-18 09:13:47 +01:00
Rajesh Taneja
fc832a4882 MDL-43437 wiki: Fixed unit test for page_version_deleted event 2013-12-18 13:56:44 +08:00
Eloy Lafuente (stronk7)
5d2667fa07 Merge branch 'MDL-40920_master' of https://github.com/markn86/moodle 2013-12-18 00:13:15 +01:00
Eloy Lafuente (stronk7)
1f71f7685a Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle 2013-12-17 22:58:51 +01:00
Sam Hemelryk
9b4c44c8e6 Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle 2013-12-18 09:59:05 +13:00
Marina Glancy
9cba0f8981 Merge branch 'wip-MDL-43295-master' of git://github.com/abgreeve/moodle 2013-12-17 16:35:31 +11:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/upgrade.txt
 2013-12-17 16:32:35 +13:00
Adrian Greeve
fb59d5352a MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission. 2013-12-17 10:42:20 +08:00
Sam Hemelryk
bb4551334f Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle 2013-12-17 08:48:08 +13:00
Sam Hemelryk
2b08f90aca Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle 2013-12-17 08:45:05 +13:00
Frederic Massart
545b310c84 MDL-42212 mod_lesson: Use autoloading for mod_lesson_file_info 2013-12-16 07:03:46 +01:00
Frederic Massart
89133afae6 MDL-42212 mod_lesson: Localise area names 2013-12-16 06:49:05 +01:00
Frederic Massart
b47dc5ffea MDL-42212 mod_lesson: Fix callbacks retrieving activity files 2013-12-16 06:49:05 +01:00
Damyon Wiese
f268fb5d20 MDL-43250 Assign: separate groups mode fix 
When in separate groups mode, only get graders in a group that is in the course module grouping.
 2013-12-16 10:54:38 +08:00
Sam Hemelryk
9f5b319345 Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle 2013-12-16 15:46:56 +13:00
Damyon Wiese
c7a7368958 MDL-34432: Allow comment inline (stripping embedded images version) 2013-12-16 10:38:23 +08:00
Marina Glancy
2a73cfb011 Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle 2013-12-16 12:27:38 +11:00
Sam Hemelryk
3b94d80c20 Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle 2013-12-16 13:52:16 +13:00
Sam Hemelryk
6015500d5b Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle 2013-12-16 09:46:47 +13:00
Frederic Massart
0aa3b16c90 MDL-35032 mod_book: 1.9 backup restore convertis files to book area 2013-12-13 10:20:49 +01:00
Jason Fowler
082ad25776 MDL-36984 Assign: Add redirect after saving grades 2013-12-12 14:19:26 +08:00
Jason Fowler
871015414d MDL-34321 Assignment2.2 - Fixing submission count 2013-12-12 10:35:41 +08:00
Rajesh Taneja
2270661e51 MDL-40058 mod_wiki: trigger event on page map view 2013-12-12 13:08:18 +11:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Damyon Wiese
e9fe65d575 MDL-43326 Assign: Start new attempt from previous missing sesskey 2013-12-11 13:07:52 +08:00
Rajesh Taneja
0e72987517 MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context 2013-12-11 13:53:04 +11:00
Rajesh Taneja
e94f6c6572 MDL-40058 Events: added unit test 2013-12-11 13:53:04 +11:00
Rajesh Taneja
86b0e3b308 MDL-40058 Events: Replaced add_to_log for page comments to event 2013-12-11 13:53:00 +11:00
Rajesh Taneja
8b43cf225f MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event 2013-12-11 13:53:00 +11:00
Rajesh Taneja
a8481a66fe MDL-40058 mod_wiki: Replaced add_to_log for page created to event 2013-12-11 13:53:00 +11:00
Rajesh Taneja
ff79f49f44 MDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event 2013-12-11 13:52:59 +11:00
Rajesh Taneja
d6a54be3a6 MDL-40058 mod_wiki: Replaced add_to_log for admin to event 2013-12-11 13:52:59 +11:00
Rajesh Taneja
b3dd79d101 MDL-40058 mod_wiki: Replaced add_to_log for override locks with event 2013-12-11 13:52:59 +11:00
Rajesh Taneja
3e5e78a2c9 MDL-40058 mod_wiki: Replaced add_to_log for page diff view with event 2013-12-11 13:52:59 +11:00
Rajesh Taneja
fb92417b5e MDL-40058 mod_wiki: Replaced add_to_log for page edit with event 2013-12-11 13:52:59 +11:00
Rajesh Taneja
31383bcdad MDL-40058 mod_wiki: Replaced add_to_log for version restored with event 2013-12-11 13:52:58 +11:00
Rajesh Taneja
d1d555c955 MDL-40058 mod_wiki: Replaced add_to_log for history viewed with event 2013-12-11 13:52:58 +11:00
Rajesh Taneja
9307bed8c5 MDL-40058 mod_wiki: Replaced add_to_log on index.php with event 2013-12-11 13:52:58 +11:00
Rajesh Taneja
48f871e09b MDL-40058 mod_wiki: Replaced add_to_log for course_module_viewed with event 2013-12-11 13:52:58 +11:00
Rajesh Taneja
8ac1d22436 MDL-40058 mod_wiki: Replaced add_to_log for page_viewed with event 2013-12-11 13:52:54 +11:00
Marina Glancy
939aedfe30 Merge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle 2013-12-11 12:46:14 +11:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Eloy Lafuente (stronk7)
5cf182e39d Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle 2013-12-10 22:06:39 +01:00
Sam Chaffee
7bfa3d9b6e MDL-37972 Assignment: fixing settings link for upload single submissions 2013-12-10 13:41:57 +08:00
Marina Glancy
8f3e0bf7a5 Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle 2013-12-10 15:20:22 +11:00
Marina Glancy
b3e0bd5225 Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle 2013-12-10 15:15:27 +11:00