Dan Poltawski
41ea0d3cc2
Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle
2012-05-14 10:28:05 +08:00
Adrian Greeve
0ba303e85f
MDL-32126 - data - Fix of an error when sorting by other criteria.
2012-05-14 07:27:01 +08:00
Petr Skoda
7edfd54fcf
MDL-32915 fix bogus open div in basic chat ui
2012-05-13 10:24:43 +02:00
Petr Skoda
d59ef9c5ab
MDL-32926 exorcise setUser(2) evil from phpunit
2012-05-12 21:42:07 +02:00
David Mudrak
d20bffa2fd
MDL-32714 workshop: fixed SQL to load assessment form fields
...
Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
2012-05-12 10:27:34 +02:00
Tim Hunt
62a3bfb37e
MDL-32633 quiz editing: recreate grade item when max changed from 0
2012-05-11 20:23:37 +01:00
Dan Poltawski
93f11331e4
MDL-31458 forum: email subjects containing ampersand are sent as &
2012-05-11 15:25:26 +08:00
Frederic Massart
50a8374ef8
MDL-30649 Glossary : Fixed floating element breaking HTML
2012-05-11 10:53:22 +08:00
Ankit Agarwal
3afe75a79c
MDL-31902 general: Removing deprecated functions
2012-05-11 10:30:40 +08:00
Rajesh Taneja
5d8215ccf4
MDL-31941 chat: removed chat_get_participants, deprecated function
2012-05-11 09:21:04 +08:00
Chris Scribner
bc2a92aeda
MDL-32921: Fixing an issue with adding LTI tool providers from the admin UI
2012-05-10 12:07:13 -04:00
Chris Scribner
66c1441213
MDL-31657: Remove some unused LTI localization strings
2012-05-10 09:43:23 -04:00
Andrew Robert Nicols
96c8f933fd
MDL-32641 Ensure that the form change protector does not kick in when adding/editing feedback questions
2012-05-10 12:15:24 +01:00
Ankit Agarwal
99c4dcd3e2
MDL-31944 feedback: remove deprecated function feedback_get_participants()
2012-05-10 15:16:47 +08:00
Dan Poltawski
b84eb3cf20
Merge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign
2012-05-10 14:24:20 +08:00
Damyon Wiese
755bfecae9
MDL-32901: Default feedback plugin for gradebook was using incorrect component name
...
This fix allows this setting to be set to the default correctly and prevents it showing on the
front page settings screen for a new install.
2012-05-10 14:16:18 +08:00
Damyon Wiese
d82bb44d74
MDL-32899: Assignment upgrade tool fails to upgrade some online text submissions
...
This is a fix for onlinetext assignments with submissions that have feedback but no
actual submission (data1 and data2 are NULL)
2012-05-10 14:00:23 +08:00
Sam Hemelryk
c56d266a58
MDL-31763 mod_data: Fixed array iteration reference issue
2012-05-10 17:31:42 +12:00
Aparup Banerjee
e1e3fa217f
Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle
2012-05-10 10:52:32 +08:00
Rossiani Wijaya
6176184bcc
MDL-31951 Lesson module: Removed deprecated lesson_get_participants() function
2012-05-10 10:51:05 +08:00
Sam Hemelryk
5ba2e3150f
Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle
2012-05-10 14:11:24 +12:00
Adrian Greeve
541685ec20
MDL-31763 - data - users can only override their own presets unless they have manage presets permission.
2012-05-10 10:04:30 +08:00
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