moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 03:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55069 commits 37 branches 544 tags 1.3 GiB
Commit graph

12496 commits

Author SHA1 Message Date
Sam Hemelryk
137467f5b4 Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle 2012-05-10 13:58:12 +12:00
Sam Hemelryk
6bfa88103d Merge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle 2012-05-10 13:52:31 +12:00
Sam Hemelryk
efd412dda9 MDL-30649 Fixed up whitespace 2012-05-10 11:57:59 +12:00
Sam Hemelryk
320b4deb6a Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle 2012-05-10 11:56:58 +12:00
Charles Fulton
66969d5004 MDL-32889 lib: escape filename in Content-Disposition header 2012-05-09 16:03:33 -04:00
sam marshall
8b7d95b625 MDL-29624 Media embedding system, part 3: resource module (and URL, lesson) 
This change makes the resource module use the new API when it embeds media
files (audio/video/Flash), and removes the resourcelib library functions
which were previously used for this.

The old API is still used for embedding non-media files such as PDFs and
HTML.

The URL and Lesson module both used copy/paste duplicates of a section of
resource module code which called the removed functions. I have changed
these too. As a bonus this significantly reduces the duplication involved.
 2012-05-09 18:29:31 +01:00
sam marshall
daefd6eb97 MDL-29624 Media embedding system, part 1: new API and filter changes 
Includes new API in medialib.php and core_media_renderer in outputrenderers.php.
Enable/disable settings moved from filter to systemwide appearance page.
Filter changed to use new API.

AMOS BEGIN
 MOV [flashanimation,filter_mediaplugin],[flashanimation,core_media]
 MOV [flashanimation_help,filter_mediaplugin],[flashanimation_desc,core_media]
 MOV [flashvideo,filter_mediaplugin],[flashvideo,core_media]
 MOV [flashvideo_help,filter_mediaplugin],[flashvideo_desc,core_media]
 MOV [html5audio,filter_mediaplugin],[html5audio,core_media]
 MOV [html5audio_help,filter_mediaplugin],[html5audio_desc,core_media]
 MOV [html5video,filter_mediaplugin],[html5video,core_media]
 MOV [html5video_help,filter_mediaplugin],[html5video_desc,core_media]
 MOV [mp3audio,filter_mediaplugin],[mp3audio,core_media]
 MOV [mp3audio_help,filter_mediaplugin],[mp3audio_desc,core_media]
 MOV [legacyquicktime,filter_mediaplugin],[legacyquicktime,core_media]
 MOV [legacyquicktime_help,filter_mediaplugin],[legacyquicktime_desc,core_media]
 MOV [legacyreal,filter_mediaplugin],[legacyreal,core_media]
 MOV [legacyreal_help,filter_mediaplugin],[legacyreal_desc,core_media]
 MOV [legacywmp,filter_mediaplugin],[legacywmp,core_media]
 MOV [legacywmp_help,filter_mediaplugin],[legacywmp_desc,core_media]
 MOV [legacyheading,filter_mediaplugin],[legacyheading,core_media]
 MOV [legacyheading_help,filter_mediaplugin],[legacyheading_desc,core_media]
 MOV [sitevimeo,filter_mediaplugin],[sitevimeo,core_media]
 MOV [sitevimeo_help,filter_mediaplugin],[sitevimeo_desc,core_media]
 MOV [siteyoutube,filter_mediaplugin],[siteyoutube,core_media]
 MOV [siteyoutube_help,filter_mediaplugin],[siteyoutube_desc,core_media]
AMOS END
 2012-05-09 18:29:29 +01:00
Rossiani Wijaya
272bc0a6ed MDL-24401: fixed string for adding content page 2012-05-09 14:19:49 +08:00
David Mudrak
386b67d100 MDL-31675 File browsing support for the Database module 
AMOS BEGIN
 CPY [fields,mod_data],[areacontent,mod_data]
AMOS END
 2012-05-09 04:03:34 +02:00
Christopher Tombleson
4447223b38 MDL-31028: Added pathname hashes to eventdata 
Also fix strict standard warning
 2012-05-09 13:46:20 +12:00
David Mudrak
7978d5dc31 MDL-31675 File browsing support for the Glossary module 
AMOS BEGIN
 CPY [attachments,mod_forum],[areaattachment,mod_glossary]
 CPY [definitions,mod_glossary],[areaentry,mod_glossary]
AMOS END
 2012-05-09 03:01:46 +02:00
David Mudrak
9a1c075119 MDL-31675 File browsing support for the Forum module 
AMOS BEGIN
 CPY [attachments,mod_forum],[areaattachment,mod_forum]
AMOS END
 2012-05-09 03:00:16 +02:00
David Mudrak
b75ec1040e MDL-32853 Forum: fixed serving files from posts in a visible group 
The previous code was copied from the part where emails are being sent.
In that case, we do not want to send copies of posts from other groups.
But in terms of access control, the user has full read access to posts
in any visible group.
 2012-05-08 17:04:27 +02:00
Dan Marsden
37ca1722cd MDL-32507 SCORM fix some strict standard errors 2012-05-08 09:00:46 +12:00
Tim Hunt
ad3b37cf87 MDL-31814 question bank: fix possible error with sort columns. 2012-05-04 17:29:04 +01:00
Davo Smith
abed5d655f MDL-22504 Fixed issues raised by Sam Hemelryk 2012-05-04 12:12:52 +01:00
Damyon Wiese
b843e2b747 MDL-32754: Add missing string for assign:addinstance capability 
AMOS BEGIN
    CPY [assignment:addinstance,mod_assignment],[assign:addinstance,mod_assign]
AMOS END
 2012-05-04 12:05:58 +08:00
Jason Fowler
486a138bf1 MDL-30649 - Glossary - Adding functions so recent glossary activity shows up in the activity reports 2012-05-04 10:11:50 +08:00
Tim Hunt
070511062a MDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing. 2012-05-03 19:45:18 +01:00
Dan Poltawski
e50de8764b Merge branch 'MDL-32738' of git://github.com/timhunt/moodle 2012-05-04 01:09:53 +08:00
Tim Hunt
f59f85717e MDL-32738 quiz overdue handling cron: appease MySQL. 
Thanks to sam marshall for giving my the idea of using a subquery to
make the SQL work on all DBs.
 2012-05-03 18:07:59 +01:00
Dan Poltawski
59e430718a Merge branch 'MDL-32740' of git://github.com/timhunt/moodle 2012-05-04 00:58:00 +08:00
Tim Hunt
96e5168c7e MDL-32740 / MDL-3030 quiz summary: no Return to attempt for overdue. 2012-05-03 12:16:43 +01:00
Tim Hunt
a558acf93f MDL-32739 quiz reports: process_actions broken. Regression from MDL-3030 2012-05-03 12:02:29 +01:00
Dan Poltawski
e6236edebf MDL-31270 mod_assign: version dump 
Introduce depdency from assignmentupgrade to mod_assign
 2012-05-03 16:46:06 +08:00
Dan Poltawski
c06b2127bc MDL-31270 mod_assign: Fix another whitespace issue. 
Seems I didn't catch them all :(
 2012-05-03 16:46:06 +08:00
Dan Poltawski
1ca059ee88 MDL-31270 mod_assign: fix another whitespace issue 2012-05-03 16:10:16 +08:00
Dan Poltawski
9682626eec MDL-31270: mod_assign fix whitespace issues 2012-05-03 16:05:58 +08:00
Damyon Wiese
bbd0e548c3 MDL-31270 mod_assign: introducing the assignment module 
* Includes an assignment upgrade tool to convert from the old mod_assignment.
* Hides mod_assignment on new installs
 2012-05-03 14:44:06 +08:00
Dan Poltawski
bc5a657bfb MDL-32813 - fix trailing whitespace 2012-05-09 11:17:57 +08:00
Dan Poltawski
b7e4b76536 Merge branch 'MDL-32813' of github.com:netspotau/moodle-mod_assign 2012-05-09 11:13:09 +08:00
Sam Hemelryk
86e62f9223 Merge branch 'wip-MDL-31147-master' of git://github.com/phalacee/moodle 2012-05-09 11:50:17 +12:00
Sam Hemelryk
303cb36b18 Merge branch 'wip-MDL-31948-master' of git://github.com/phalacee/moodle 2012-05-09 11:49:33 +12:00
Sam Hemelryk
a8f127950e Merge branch 'wip-MDL-31950-master' of git://github.com/phalacee/moodle 2012-05-09 11:49:23 +12:00
Sam Hemelryk
d779cd65a9 Merge branch 'wip-MDL-31952-master' of git://github.com/phalacee/moodle 2012-05-09 11:49:14 +12:00
Sam Hemelryk
b370716f7b Merge branch 'wip-MDL-31953-master' of git://github.com/phalacee/moodle 2012-05-09 11:48:35 +12:00
Sam Hemelryk
09d64cadee Merge branch 'MDL-32164-master-2' of git://git.luns.net.uk/moodle 2012-05-09 11:47:00 +12:00
Sam Hemelryk
55a8b2eefc Merge branch 'MDL-31940-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:43:27 +12:00
Sam Hemelryk
a6c1f5a4cc Merge branch 'MDL-31943-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:39:02 +12:00
Sam Hemelryk
d7e6345c11 Merge branch 'MDL-31945-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:37:29 +12:00
Sam Hemelryk
b1851f4639 Merge branch 'MDL-31946-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:35:38 +12:00
Frederic Massart
114dd080e1 MDL-32718 Fixed typo in column name 2012-05-08 15:54:11 +08:00
Ankit Agarwal
d5f7468eca MDL-31940 data: Removing deprecated function data_get_participants 2012-05-08 15:04:53 +08:00
Ankit Agarwal
8bb7fb7008 MDL-31940 assignment: Removing deprecated function assignment_get_participants 2012-05-08 14:59:23 +08:00
Jason Fowler
ce5f042b82 MDL-31948 - IMC-CP - Removing the deprecated imscp_get_participants function 2012-05-08 14:58:02 +08:00
Jason Fowler
3edf380de6 MDL-31950 - Label - Removing the deprecated label_get_participants function 2012-05-08 14:53:54 +08:00
Ankit Agarwal
ecb6b25b0d MDL-31946 forum: Removing deprecated function folder_get_participants 2012-05-08 14:50:22 +08:00
Ankit Agarwal
c1413e22e2 MDL-31945 folder: Removing deprecated function folder_get_participants 2012-05-08 14:44:47 +08:00
Jason Fowler
dd6ae1784c MDL-31952 - Resource - Removing the deprecated page_get_participants function 2012-05-08 14:40:53 +08:00
Jason Fowler
c72c01b184 MDL-31953 - Resource - Removing the deprecated resource_get_participants function 2012-05-08 14:37:43 +08:00