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

13038 commits

Author SHA1 Message Date
Sam Hemelryk
72258d36db Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle 2012-09-11 15:08:11 +12:00
Sam Hemelryk
60871abb53 Merge branch 'master_MDL-34755' of git://github.com/danmarsden/moodle 2012-09-11 15:02:30 +12:00
Eloy Lafuente (stronk7)
7772fed15d MDL-34338 mod_folder: delete unused $browser var. 2012-09-11 02:18:38 +02:00
Eloy Lafuente (stronk7)
caaf32f823 Merge branch 'wip-MDL-34338-master' of git://github.com/marinaglancy/moodle 2012-09-11 02:17:30 +02:00
Sam Hemelryk
6396fb3dab Merge branch 'master_MDL-35255' of git://github.com/danmarsden/moodle 2012-09-11 12:11:02 +12:00
Eloy Lafuente (stronk7)
29636a9af2 Merge branch 'MDL-34660' of git://github.com/raymondAntonio/moodle 2012-09-11 02:08:41 +02:00
Eloy Lafuente (stronk7)
50dca95dc4 Merge branch 'master_MDL-35123' of git://github.com/danmarsden/moodle 2012-09-11 02:02:49 +02:00
Eloy Lafuente (stronk7)
227b50eb43 Merge branch 'master_MDL-35208' of git://github.com/danmarsden/moodle 2012-09-11 01:56:51 +02:00
Sam Hemelryk
20b133e7a3 MDL-34794 mod_assign: Fixed up style after integration 2012-09-11 11:34:10 +12:00
Sam Hemelryk
f28896b615 Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle 2012-09-11 11:33:04 +12:00
Sam Hemelryk
27b1b28552 Merge branch 'MDL-35007-master' of git://github.com/ankitagarwal/moodle 2012-09-11 11:07:29 +12:00
Aparup Banerjee
e2abebcbb2 Merge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle 2012-09-10 17:15:00 +08:00
Aparup Banerjee
b3b79a58ee Merge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle 2012-09-10 17:00:16 +08:00
Aparup Banerjee
5ddaa60d49 Merge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle 2012-09-10 14:37:40 +08:00
Aparup Banerjee
fda1d233a7 Merge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle 2012-09-10 14:29:47 +08:00
Damyon Wiese
d0d4796b4a MDL-31276: Fixes for offline marking and team submissions 
Filenames in zip of all submission now contains the team group name.
 2012-09-10 14:18:42 +08:00
Damyon Wiese
df47b77f46 MDL-31276: Offline marking. Includes download/upload of csv grades. 
Also provides bulk upload/download of feedback files via zips.
 2012-09-10 14:18:32 +08:00
David Monllao
bd9cb43e09 MDL-27398 mod_chat Removing PAGE references 2012-09-10 14:09:02 +08:00
David Monllao
32b49bbd84 MDL-27398 mod_chat Adding file basic doc 2012-09-10 14:09:02 +08:00
David Monllao
24242682df MDL-27398 mod_chat Removing deprecated calls and moving dependencies 
Credit to Jorge Villalon
 2012-09-10 14:08:49 +08:00
David Monllao
e54370d7fb MDL-27398 mod_chat Adding CLI_SCRIPT to chat daemon 
Credit to Jorge Villalon
 2012-09-10 14:08:22 +08:00
Jason Fowler
24eb0897cb MDL-29463 - Chat - Change socket_setopt to socket_set_options 2012-09-08 11:53:37 +08:00
Raymond Wijaya
ec32d06834 MDL-34088: Advanced grading criteria is shown on assignment page (if used) before the assignment submissions have been graded. 2012-09-07 15:20:32 +08:00
Raymond Wijaya
72429a10da MDL-34794: Add reset course feature in mod_assign (new assignment (2.3)) 2012-09-07 15:06:11 +08:00
David Monllao
84ac37f0f4 MDL-34068 mod_chat Sending text/html headers when sending the messages frame output for the first time 2012-09-07 12:10:36 +08:00
David Monllao
476a235db1 MDL-35264 mod_chat Changing the input frame of chat daemon method to a embedded page layout 2012-09-07 12:07:46 +08:00
Rajesh Taneja
0465ef6e31 MDL-34568: Accessibility: Added missing lables in quiz section 
AMOS BEGIN
 CPY [pluginname,grade_export_xls],[downloadexcel,table]
 CPY [pluginname,grade_export_ods],[downloadods,table]
AMOS END
 2012-09-07 10:18:15 +08:00
Ankit Agarwal
15c5f2a8bd MDL-34944 book: Implementing reset framework for book 2012-09-07 10:17:21 +08:00
Ankit Agarwal
9735d339d6 MDL-35007 book: Adding rule to parse links to book chapters from 1.9 backups 2012-09-07 10:13:18 +08:00
Ankit Agarwal
93ec553969 MDL-35223 book: use chapter names in page titles 2012-09-07 10:10:01 +08:00
Marina Glancy
eb8d220d68 MDL-34338: renderer for mod_folder should not use file_info 2012-09-07 09:34:04 +08:00
Marina Glancy
406f8dd827 MDL-34223 increased performance in forum_get_file_info() for admins 2012-09-07 09:31:22 +08:00
Eloy Lafuente (stronk7)
3b70685c26 fix permissions 2012-09-07 02:36:04 +02:00
Eloy Lafuente (stronk7)
6f050c7dea MDL-31291 assign: Fix diffs between installed & upgraded DB schema 2012-09-06 18:31:26 +02:00
Aparup Banerjee
d59b488b5a Merge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:43:15 +08:00
Aparup Banerjee
89577d774d Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:36:24 +08:00
Aparup Banerjee
7183a1f4a4 Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues." 
This reverts commit 0e708c3476.

note : there is another commit prefixed with MDL-34257 hash 'ddda79c' which was really for MDL-34187. 'ddda79c' is not being reverted as its not really about MDL-34257.
 2012-09-06 17:35:40 +08:00
Dan Marsden
81f460b1e2 MDL-33755 SCORM only auto-skipview for users with skipview cap that can't see reports 
also don't generate unrequired content when scorm will be launched automatically.
 2012-09-06 20:30:37 +12:00
Piers Harding
35cfa9e62c MDL-33755 mod/scorm: directview scorm activity 
Enable direct view of scorm activity from the course
overview page

Conflicts:

	mod/scorm/view.js
 2012-09-06 20:28:42 +12:00
Dan Marsden
122878590a MDL-35123 SCORM: cleaner version of get_last_attempt and get_last_completed_attempt, fixes support for MS Sql driver 2012-09-06 18:42:55 +12:00
Eloy Lafuente (stronk7)
37a74d1e28 Merge branch 'MDL-27799' of git://github.com/timhunt/moodle 2012-09-06 01:29:04 +02:00
Eloy Lafuente (stronk7)
393cadf205 MDL-29662 quiz overrides: use proper course value (was php notice). 2012-09-05 18:01:24 +02:00
Dan Marsden
c792565b9d MDL-35255 mod_assign plagiarism api shift update_status call to after header has been printed. 2012-09-05 12:44:18 +12:00
Tim Hunt
0e708c3476 MDL-34257 quiz 'secure' mode: PAGE initialisation order issues. 2012-09-04 11:39:38 +08:00
Aparup Banerjee
8f8e28c0b6 Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle 2012-09-04 11:38:11 +08:00
Simon Coggins
02ed0df5ae MDL-34755 SCORM: pop-up not loading in IE7/IE8 compat mode 2012-09-04 13:11:22 +12:00
Eloy Lafuente (stronk7)
259208e0ab MDL-31295 assign: fix comments in upgrade code. 2012-09-04 01:27:49 +02:00
Eloy Lafuente (stronk7)
7ef0d527b2 Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-04 01:20:55 +02:00
Eloy Lafuente (stronk7)
b448cf475e Merge branch 'MDL-29662' of git://github.com/timhunt/moodle 2012-09-04 01:14:06 +02:00
Dan Marsden
cfa5063777 MDL-35208 mod_choice: respect order of options when running backup 2012-09-04 11:01:06 +12:00