mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 17:40:26 +01:00
Code Issues Projects Releases Wiki Activity
62,229 Commits 36 Branches 527 Tags
Commit Graph

14012 Commits

Author SHA1 Message Date
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
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
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
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
Rossiani Wijaya
2d5fb2a678 MDL-39815 Add action to display the print windows on page load 2013-07-05 11:23:35 +08:00
Dan Marsden
f2b3e82b09 MDL-37484 SCORM: disable toc in player when using direct AICC url 2013-07-05 14:37:20 +12:00
Dan Marsden
957566eb28 MDL-40512 SCORM: prevent undefined warning 2013-07-05 12:07:48 +12:00
Tim Hunt
df14e8625d MDL-40443 setType notice in quiz reports. 2013-07-04 13:08:14 +01:00
Tim Hunt
726fd6db19 MDL-40318 quiz intro comprising just an impage was not shown 
Also, ensure that we don't output an empty box if there are no access
messages.
 2013-07-04 13:07:32 +01:00
Tim Hunt
b0ac85395c MDL-36479 quiz regrade: use progress bar to prevent time-outs 2013-07-04 13:06:18 +01:00
Ankit Agarwal
0601e0eef6 MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core 2013-07-04 15:41:06 +08:00
Damyon Wiese
af282bcc2c MDL-40308: Fix javascript for lti mod_form 
It was toggling the state of the hidden input - not the checkbox.
 2013-07-04 13:47:09 +08:00
Damyon Wiese
13e82f1c67 MDL-40472: Clean all codechecker warnings on mod_assign 2013-07-03 16:00:43 +08:00
Nadav Kavalerchik
8137e0496e MDL-37065 - Change get_string('status') token in assignment submissions page to a different token (for translation flexibility) 
AMOS BEGIN
 CPY [status,core],[status,mod_assign]
AMOS END
 2013-07-03 14:59:52 +08:00
Eloy Lafuente (stronk7)
1203222a3c Merge branch 'MDL-40246_master' of git://github.com/dmonllao/moodle 2013-07-02 14:27:34 +02:00
Eloy Lafuente (stronk7)
3c2e7a0e7c Merge branch 'MDL-34472-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	lib/upgrade.txt
 2013-07-02 14:09:11 +02:00
Eloy Lafuente (stronk7)
8b180f2317 Merge branch 'MDL-40439-en_fix' of git://github.com/mudrd8mz/moodle 2013-07-02 13:47:09 +02:00
Helen Foster
77fc81f3ee MDL-40439 Merge English strings from the en_fix language pack 2013-07-02 11:42:10 +02:00
Andreas Grabs
09c2ec4303 MDL-39570 mod_feedback - Missing privilege check 2013-07-02 13:37:10 +08:00
Dan Marsden
612fdeb24e MDL-39628 Chat: check mod/chat:chat capability when using daemon. 
Thanks to Francois Gauthier for report/fix.
 2013-07-02 12:20:29 +08:00
Eloy Lafuente (stronk7)
9a6a2d1ce0 Merge branch 'get_users_by_capability_fix_master' of http://github.com/timgus/moodle 2013-07-02 00:46:30 +02:00
Eloy Lafuente (stronk7)
c6638cd6ce Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle 2013-07-02 00:43:31 +02:00
Rossiani Wijaya
a4a2ddfbf1 MDL-39546 Lesson module: removed duplicate to decode special characters 2013-07-02 09:37:12 +12:00