mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity
62,375 Commits 36 Branches 527 Tags
Commit Graph

14032 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
dbdfd37709 Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle 2013-07-18 20:22:47 +02:00
Damyon Wiese
84c5f6416e MDL-35851 lesson: Handle importing questions into an empty lesson. 
Also - make sure the page we are updating belongs to the lesson.
 2013-07-18 16:45:44 +08:00
Dan Poltawski
caf8d39b17 MDL-40604 wiki: fix use of print_container 2013-07-17 14:11:10 +08:00
Damyon Wiese
afe36b8411 MDL-35851 Lesson: Check/fix the page order every time the pages are loaded 2013-07-17 13:04:04 +08:00
Marina Glancy
73f0d9b638 Merge branch 'MDL-40701-master' of git://github.com/danpoltawski/moodle 2013-07-17 12:45:18 +10:00
Dan Poltawski
f7d8f38e21 MDL-40701 mod_assignment: fix refresh events 
It was getting the cm event with the wrong id and calling
deprecated functions
 2013-07-17 10:29:25 +08:00
Eloy Lafuente (stronk7)
fb1788c598 Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle 
Conflicts:
	admin/oacleanup.php
 2013-07-17 01:21:51 +02:00
Petr Škoda
059e08ed92 MDL-40220 use new core_component::get_plugin_list_with_class() 2013-07-16 22:37:15 +02:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Eloy Lafuente (stronk7)
4c8bba6686 MDL-39926 SCORM: Adapt report to alt name fields 2013-07-16 18:34:59 +02:00
Eloy Lafuente (stronk7)
88ad6d0a99 Merge branch 'master_MDL-39926' of git://github.com/danmarsden/moodle 2013-07-16 18:34:58 +02:00
Marina Glancy
b7361a9be7 Merge branch 'MDL-35851-master' of git://github.com/damyon/moodle 2013-07-16 16:10:13 +10:00
Damyon Wiese
d33d712541 MDL-35851 lesson: removed expensive upgrade step. 
Just deal with the bad data when displaying the lesson instead.

Conflicts:

	mod/lesson/db/upgrade.php
 2013-07-16 14:05:07 +08:00
Damyon Wiese
539819dc40 Merge branch 'MDL-40195' of git://github.com/aolley/moodle 2013-07-16 13:28:52 +08:00
Damyon Wiese
2f9aeafe5e Merge branch 'MDL-40524' of git://github.com/aolley/moodle 2013-07-16 11:24:06 +08:00
Rossiani Wijaya
eebc821c83 MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links 2013-07-16 09:52:25 +08:00
Adrian Greeve
07d807ac24 MDL-40650 - workshop: Fixed fatal error in workshop cron. 
Line 246 was missing a semicolon at the end and this was causing
errors.
 2013-07-15 09:54:02 +08:00
Jamie Pratt
2baf8e8a0b MDL-40074 quiz attempt walk through test 2013-07-14 16:45:26 +07:00
Jamie Pratt
1cd7c92ece MDL-40074 refactoring of quiz code 
to reuse code fro quiz attempt walk through
 2013-07-14 16:28:39 +07:00
Frederic Massart
2e4c0c9181 MDL-40424 libraries: Deprecate context_instance_preload_sql() 2013-07-12 17:41:49 +08:00
David Monllao
3e6899989a MDL-39815 mod_glossary: Fixing behat test 2013-07-11 09:36:32 +02:00
Adrian Greeve
ec71acb798 MDL-31776 - lib: mod/forums - Fixed discussion sql query. 2013-07-10 15:26:05 +08:00
Raymond Wijaya
bf57184c28 MDL-40093: mod/assign: Remove count of drafts in offline assignment's grading summary screen 2013-07-10 11:18:28 +10:00
Marina Glancy
9100a8f4bb Merge branch 'MDL-40441' of git://github.com/timhunt/moodle 2013-07-10 10:02:04 +10:00
Marina Glancy
9a2188812d Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle 2013-07-10 09:58:09 +10:00
Sam Hemelryk
4e6ad78679 Merge branch 'MDL-39815' of git://github.com/rwijaya/moodle 2013-07-10 10:35:18 +12:00
Sam Hemelryk
05fb99ac70 Merge branch 'master_MDL-40512' of git://github.com/danmarsden/moodle 2013-07-10 10:10:11 +12:00
Damyon Wiese
57cf73a825 Merge branch 'MDL-36479' of git://github.com/timhunt/moodle 2013-07-09 22:28:51 +08:00
Marina Glancy
f429d25d37 MDL-40472 fixed missing semicolon 2013-07-09 22:01:49 +10:00
Marina Glancy
ed2896d990 Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle 2013-07-09 21:34:49 +10:00
Tim Hunt
475225a1c8 MDL-40441 fix obscure notice in the quiz. 
This can only happen if you have both a user with both a real attempt
and a preview, and then edit the quiz settings.

Also clean up this code a bit.
 2013-07-09 10:43:56 +01:00
Dan Poltawski
3a1b0dd908 Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle 2013-07-09 16:57:07 +08:00
Adrian Greeve
329846f198 MDL-40430 - Libraries: Deprecate print_context_name(). 2013-07-09 16:11:55 +08:00
Marina Glancy
73118a2687 Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle 2013-07-09 18:06:33 +10:00
Damyon Wiese
de0a6ed459 Merge branch 'MDL-40443' of git://github.com/timhunt/moodle 2013-07-09 15:15:47 +08:00
Rajesh Taneja
df6c384d55 MDL-40218 Assignment: updated upgrade.txt and version number 2013-07-09 14:09:11 +08:00
Rajesh Taneja
1ecb8044b6 MDL-40218 Assignment: Added lazy loading for showactiveenrol option and supended users 2013-07-09 14:09:11 +08:00
Damyon Wiese
c2bee5e0d1 Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle 2013-07-09 13:33:42 +08:00
Rajesh Taneja
e6cc5347eb MDL-40218 Assignment: Added unit test to check suspended users 2013-07-09 13:32:10 +08:00
Rajesh Taneja
3fa106d0d6 MDL-40218 Assignment: User should not be able to view submissions, whithout proper permissions 2013-07-09 13:32:09 +08:00
Rajesh Taneja
c494e18cbd MDL-40218 Assignment: Participants/submission/grade count only include active users 2013-07-09 13:32:08 +08:00
Rajesh Taneja
a69944eb8b MDL-40218 Assignment: Show suspended user, similar to the way they are shown in grader report 2013-07-09 13:32:08 +08:00
Rajesh Taneja
4c4c7b3f3f MDL-40218 Assignment: Added show/hide suspended users functionality 2013-07-09 13:32:08 +08:00
Damyon Wiese
26616e4b6d Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle 2013-07-09 12:34:31 +08:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields 
Add support for additional name fields and flexible formating of
user names.
 2013-07-09 11:45:50 +08:00
Damyon Wiese
9d871499fe Merge branch 'MDL-40318' of git://github.com/timhunt/moodle 2013-07-09 11:11:42 +08:00
Adam Olley
dd8ba80005 MDL-40195: mod_assign: Display grades when quickgrading to 2 decimal places 2013-07-08 20:04:59 +09:30
Matt Debus
cde6172df8 MDL-40524: mod_wiki: Display comments in order 2013-07-08 16:27:31 +09:30
Rossiani Wijaya
be27bd59d9 MDL-39815: wiki and glossary mods: update print icon and system print popup 2013-07-05 12:10:30 +08:00
Rossiani Wijaya
ac9cd092d6 MDL-39815 glossary mod: code improvement. 
Use html_writer to print out divs.
 2013-07-05 11:23:35 +08:00