moodle.git
10 years agoMerge branch 'MDL-25695-master' of https://github.com/mackensen/moodle
Aparup Banerjee [Tue, 15 May 2012 03:03:07 +0000 (11:03 +0800)]
Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle

10 years agoMerge branch 'MDL-32930' of git://github.com/tmuras/moodle
Dan Poltawski [Mon, 14 May 2012 12:57:14 +0000 (20:57 +0800)]
Merge branch 'MDL-32930' of git://github.com/tmuras/moodle

10 years agoMerge branch 'MDL-32863' of git://github.com/jonof/moodle
Dan Poltawski [Mon, 14 May 2012 12:49:05 +0000 (20:49 +0800)]
Merge branch 'MDL-32863' of git://github.com/jonof/moodle

10 years agoMerge branch 'MDL-32375' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 14 May 2012 12:42:12 +0000 (20:42 +0800)]
Merge branch 'MDL-32375' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30291' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 14 May 2012 10:08:30 +0000 (18:08 +0800)]
Merge branch 'MDL-30291' of git://github.com/rwijaya/moodle

10 years ago MDL-32923 phpunit: make copy/paste easier
Dan Poltawski [Mon, 14 May 2012 09:38:58 +0000 (17:38 +0800)]
 MDL-32923 phpunit: make copy/paste easier

10 years agoMerge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 14 May 2012 07:53:19 +0000 (15:53 +0800)]
Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle

10 years agoMDL-32923 phpunit: be a bit more verbose about re-run cmmand
Dan Poltawski [Mon, 14 May 2012 07:48:26 +0000 (15:48 +0800)]
MDL-32923 phpunit: be a bit more verbose about re-run cmmand

10 years agoMerge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 07:46:23 +0000 (15:46 +0800)]
Merge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle

10 years agoMerge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 06:44:04 +0000 (14:44 +0800)]
Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 14 May 2012 06:26:29 +0000 (14:26 +0800)]
Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-31951' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 14 May 2012 06:23:41 +0000 (14:23 +0800)]
Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 14 May 2012 06:21:57 +0000 (14:21 +0800)]
Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 14 May 2012 06:20:05 +0000 (14:20 +0800)]
Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-24401' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 14 May 2012 06:12:30 +0000 (14:12 +0800)]
Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 14 May 2012 06:08:27 +0000 (14:08 +0800)]
Merge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 06:06:37 +0000 (14:06 +0800)]
Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-32872-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 14 May 2012 06:00:51 +0000 (14:00 +0800)]
Merge branch 'wip-MDL-32872-m23' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 05:36:11 +0000 (13:36 +0800)]
Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle

10 years agoMerge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 05:32:18 +0000 (13:32 +0800)]
Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 14 May 2012 05:12:53 +0000 (13:12 +0800)]
Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 14 May 2012 05:08:40 +0000 (13:08 +0800)]
Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle

10 years agoMDL-31804 duplicated columns cause Oracle error in grader report
Jonathon Fowler [Tue, 28 Feb 2012 04:53:47 +0000 (14:53 +1000)]
MDL-31804 duplicated columns cause Oracle error in grader report

10 years agoMDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission...
Damyon Wiese [Thu, 10 May 2012 07:10:30 +0000 (15:10 +0800)]
MDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission screen.

10 years agoMerge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 14 May 2012 03:36:55 +0000 (15:36 +1200)]
Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle

10 years agoMDL-32863 question: fix for Oracle ambiguous column error
Jonathon Fowler [Wed, 9 May 2012 01:51:18 +0000 (11:51 +1000)]
MDL-32863 question: fix for Oracle ambiguous column error

10 years agoMerge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 14 May 2012 02:52:10 +0000 (14:52 +1200)]
Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'w20_MDL-26553_m23_sqlsrvconfig' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 02:49:52 +0000 (10:49 +0800)]
Merge branch 'w20_MDL-26553_m23_sqlsrvconfig' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 14 May 2012 02:48:31 +0000 (14:48 +1200)]
Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 14 May 2012 02:41:46 +0000 (10:41 +0800)]
Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 14 May 2012 02:37:51 +0000 (14:37 +1200)]
Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)]
Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle

10 years agoMDL-30291 outputrenderers: fixed typo for
Rossiani Wijaya [Mon, 14 May 2012 02:25:05 +0000 (10:25 +0800)]
MDL-30291 outputrenderers: fixed typo for

10 years agoMerge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 14 May 2012 02:22:21 +0000 (10:22 +0800)]
Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-32910' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 14 May 2012 02:10:03 +0000 (10:10 +0800)]
Merge branch 'MDL-32910' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 14 May 2012 02:04:21 +0000 (14:04 +1200)]
Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle

10 years agoMDL-32873 course: Fixed up unused global + phpdocs
Sam Hemelryk [Mon, 14 May 2012 01:41:15 +0000 (13:41 +1200)]
MDL-32873 course: Fixed up unused global + phpdocs

10 years agoMerge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 14 May 2012 01:39:55 +0000 (13:39 +1200)]
Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle

Conflicts:
course/lib.php

10 years agoMerge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 14 May 2012 01:30:16 +0000 (13:30 +1200)]
Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 14 May 2012 01:20:07 +0000 (13:20 +1200)]
Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle

10 years agoMDL-32126 - data - Fix of an error when sorting by other criteria.
Adrian Greeve [Tue, 8 May 2012 01:21:24 +0000 (09:21 +0800)]
MDL-32126 - data - Fix of an error when sorting by other criteria.

10 years agoMDL-32611 editcategory: Fixed up navigation error.
Sam Hemelryk [Sun, 13 May 2012 21:16:43 +0000 (09:16 +1200)]
MDL-32611 editcategory: Fixed up navigation error.

10 years agoMDL-32872 tool_roles: Fixed up navigation on user roles page
Sam Hemelryk [Wed, 9 May 2012 23:44:18 +0000 (11:44 +1200)]
MDL-32872 tool_roles: Fixed up navigation on user roles page

10 years agoMDL-31719 lang/en/admin.php: changed text in $string['configallowthemechangeonurl...
Mary Evans [Sun, 13 May 2012 13:40:30 +0000 (14:40 +0100)]
MDL-31719 lang/en/admin.php: changed text in $string['configallowthemechangeonurl'] to make less ambiguous

10 years agoMDL-26553 add sqlsrv to list of available db types in config-dist.php
Petr Skoda [Sun, 13 May 2012 12:28:25 +0000 (14:28 +0200)]
MDL-26553 add sqlsrv to list of available db types in config-dist.php

10 years agoMDL-32915 fix bogus open div in basic chat ui
Petr Skoda [Sun, 13 May 2012 08:24:43 +0000 (10:24 +0200)]
MDL-32915 fix bogus open div in basic chat ui

10 years agoMDL-32923 on failure print hint how to execute the failed test case
Petr Skoda [Sun, 13 May 2012 07:56:57 +0000 (09:56 +0200)]
MDL-32923 on failure print hint how to execute the failed test case

10 years agoMDL-32926 exorcise setUser(2) evil from phpunit
Petr Skoda [Sat, 12 May 2012 19:06:24 +0000 (21:06 +0200)]
MDL-32926 exorcise setUser(2) evil from phpunit

10 years agoMDL-32960 put phpunit integration tests to one test suite and execute them first
Petr Skoda [Sat, 12 May 2012 19:11:53 +0000 (21:11 +0200)]
MDL-32960 put phpunit integration tests to one test suite and execute them first

10 years agoMDL-32960 refactor phpunit integration to one class per file structure
Petr Skoda [Sat, 12 May 2012 18:53:48 +0000 (20:53 +0200)]
MDL-32960 refactor phpunit integration to one class per file structure

10 years agoMDL-32830 add new hidden yuidebug setting for module backtraces
Petr Skoda [Sat, 12 May 2012 15:06:45 +0000 (17:06 +0200)]
MDL-32830 add new hidden yuidebug setting for module backtraces

10 years agoMDL-32659 potential navigation course loading improvements
Petr Skoda [Sat, 12 May 2012 11:19:22 +0000 (13:19 +0200)]
MDL-32659 potential navigation course loading improvements

The idea is to not use inequalities in SQL queries for loading of courses in navigation because ti seems some SQL query optimiser have problems with that.

10 years agoMDL-32714 workshop: fixed SQL to load assessment form fields
David Mudrak [Tue, 8 May 2012 22:57:57 +0000 (00:57 +0200)]
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.

10 years agoMDL-26901 add new option to specify list of available fonts in TinyMCE
Petr Skoda [Tue, 8 May 2012 14:24:41 +0000 (16:24 +0200)]
MDL-26901 add new option to specify list of available fonts in TinyMCE

Also modified the list of languages appearance, textarea is more suitable for entry of long texts. It is now also possible to specify empty list of languages and fonts which removes the button from the editor toolbar. Includes release name fix.

10 years agoMDL-32375 question unit tests: fix breakage from phpunit coversion.
Tim Hunt [Fri, 11 May 2012 13:57:09 +0000 (14:57 +0100)]
MDL-32375 question unit tests: fix breakage from phpunit coversion.

Three things:

1. Fixes to select expectation.

2. Fixes to match walkthrough tests (No idea how these managed to pass
under Simpletest!)

3. Fix expected values for multianswer upgrade tests.

10 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 11 May 2012 10:18:06 +0000 (12:18 +0200)]
weekly release 2.3dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 11 May 2012 10:10:16 +0000 (12:10 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-32930 Add escaping for '_' character
Tomasz Muras [Fri, 11 May 2012 06:56:01 +0000 (08:56 +0200)]
MDL-32930 Add escaping for '_' character

10 years agoMDL-32707 Moved fix to make youtube videos use transparent wmode setting into mediali...
Aparup Banerjee [Fri, 11 May 2012 04:57:55 +0000 (12:57 +0800)]
MDL-32707 Moved fix to make youtube videos use transparent wmode setting into medialib.php

(this should have gone in with the previous merge. oops)

10 years agoMerge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Fri, 11 May 2012 04:40:38 +0000 (12:40 +0800)]
Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle

fix moved into medialib.php

Conflicts:
filter/mediaplugin/filter.php

10 years agoMDL-30649 Glossary : Fixed floating element breaking HTML
Frederic Massart [Thu, 10 May 2012 07:09:05 +0000 (15:09 +0800)]
MDL-30649 Glossary : Fixed floating element breaking HTML

10 years agoMDL-31902 general: Removing deprecated functions
Ankit Agarwal [Fri, 11 May 2012 02:30:40 +0000 (10:30 +0800)]
MDL-31902 general: Removing deprecated functions

10 years agoMDL-31941 chat: removed chat_get_participants, deprecated function
Rajesh Taneja [Fri, 11 May 2012 01:21:04 +0000 (09:21 +0800)]
MDL-31941 chat: removed chat_get_participants, deprecated function

10 years agoMerge branch 'MDL-32924' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)]
Merge branch 'MDL-32924' of git://github.com/timhunt/moodle

10 years agoMDL-32930 Improve the performance of get_tables
Tomasz Muras [Thu, 10 May 2012 21:35:18 +0000 (23:35 +0200)]
MDL-32930 Improve the performance of get_tables

10 years agoMDL-32924 improve unit test performance.
Tim Hunt [Thu, 10 May 2012 15:22:09 +0000 (16:22 +0100)]
MDL-32924 improve unit test performance.

10 years agoMDL-32340 Improve performance of calendar selection
Andrew Robert Nicols [Wed, 9 May 2012 16:34:12 +0000 (17:34 +0100)]
MDL-32340 Improve performance of calendar selection

10 years agoMDL-30305 Automatically hide the dateselector after choosing a date
Andrew Robert Nicols [Thu, 10 May 2012 13:11:19 +0000 (14:11 +0100)]
MDL-30305 Automatically hide the dateselector after choosing a date

10 years agoMDL-32881 Prevent course/view.php from being cached
Andrew Robert Nicols [Wed, 9 May 2012 14:31:41 +0000 (15:31 +0100)]
MDL-32881 Prevent course/view.php from being cached

This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.

10 years agoMDL-32910 MDL-32569 broke unit tests in third-party qtypes
Tim Hunt [Thu, 10 May 2012 10:16:06 +0000 (11:16 +0100)]
MDL-32910 MDL-32569 broke unit tests in third-party qtypes

10 years agoMerge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Thu, 10 May 2012 08:54:35 +0000 (16:54 +0800)]
Merge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
Dan Poltawski [Thu, 10 May 2012 08:51:12 +0000 (16:51 +0800)]
Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle

10 years agoMDL-28134 General : fixed CFG->branch notice during web/cli installation
Aparup Banerjee [Thu, 10 May 2012 07:43:52 +0000 (15:43 +0800)]
MDL-28134 General : fixed CFG->branch notice during web/cli installation

10 years agoMDL-31944 feedback: remove deprecated function feedback_get_participants()
Ankit Agarwal [Thu, 10 May 2012 07:16:47 +0000 (15:16 +0800)]
MDL-31944 feedback: remove deprecated function feedback_get_participants()

10 years agoMerge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 10 May 2012 06:24:20 +0000 (14:24 +0800)]
Merge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign

10 years agoMDL-32901: Default feedback plugin for gradebook was using incorrect component name
Damyon Wiese [Thu, 10 May 2012 06:16:18 +0000 (14:16 +0800)]
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.

10 years agoMDL-32899: Assignment upgrade tool fails to upgrade some online text submissions
Damyon Wiese [Thu, 10 May 2012 04:07:49 +0000 (12:07 +0800)]
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)

10 years agoMerge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
Dan Poltawski [Thu, 10 May 2012 05:44:03 +0000 (13:44 +0800)]
Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle

10 years agoMDL-31763 mod_data: Fixed array iteration reference issue
Sam Hemelryk [Thu, 10 May 2012 05:31:24 +0000 (17:31 +1200)]
MDL-31763 mod_data: Fixed array iteration reference issue

10 years agoMDL-29624 Media embedding system : phpdoc tweaks.
Aparup Banerjee [Thu, 10 May 2012 02:51:15 +0000 (10:51 +0800)]
MDL-29624 Media embedding system : phpdoc tweaks.

10 years agoMerge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle
Aparup Banerjee [Thu, 10 May 2012 02:52:32 +0000 (10:52 +0800)]
Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle

10 years agoMDL-31951 Lesson module: Removed deprecated lesson_get_participants() function
Rossiani Wijaya [Thu, 10 May 2012 02:51:05 +0000 (10:51 +0800)]
MDL-31951 Lesson module: Removed  deprecated lesson_get_participants() function

10 years agoMDL-31134 calendar: Deleting deprecated function calendar_get_link_tag()
Ankit Agarwal [Thu, 10 May 2012 02:48:25 +0000 (10:48 +0800)]
MDL-31134 calendar: Deleting deprecated function calendar_get_link_tag()

10 years agoMerge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Thu, 10 May 2012 02:11:24 +0000 (14:11 +1200)]
Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle

10 years agoMDL-31763 - data - users can only override their own presets unless they have manage...
Adrian Greeve [Wed, 2 May 2012 01:03:22 +0000 (09:03 +0800)]
MDL-31763 - data - users can only override their own presets unless they have manage presets permission.

10 years agoMerge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Thu, 10 May 2012 02:04:14 +0000 (14:04 +1200)]
Merge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle
Sam Hemelryk [Thu, 10 May 2012 01:58:12 +0000 (13:58 +1200)]
Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle
Sam Hemelryk [Thu, 10 May 2012 01:52:31 +0000 (13:52 +1200)]
Merge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle

10 years agoMDL-27322 grade: added the ability to not have suspended students included in a grade...
Andrew Davis [Wed, 2 May 2012 11:15:53 +0000 (18:15 +0700)]
MDL-27322 grade: added the ability to not have suspended students included in a grade export

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 10 May 2012 00:31:40 +0000 (00:31 +0000)]
Automatically generated installer lang files

10 years agoMerge branch 'MDL-32857' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Thu, 10 May 2012 00:15:50 +0000 (12:15 +1200)]
Merge branch 'MDL-32857' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Thu, 10 May 2012 00:00:54 +0000 (12:00 +1200)]
Merge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle

10 years agoMDL-30649 Fixed up whitespace
Sam Hemelryk [Wed, 9 May 2012 23:57:59 +0000 (11:57 +1200)]
MDL-30649 Fixed up whitespace

10 years agoMerge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Wed, 9 May 2012 23:56:58 +0000 (11:56 +1200)]
Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Wed, 9 May 2012 17:31:03 +0000 (19:31 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-29624 Media embedding system, part 3: resource module (and URL, lesson)
sam marshall [Tue, 13 Dec 2011 17:21:06 +0000 (17:21 +0000)]
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.

10 years agoMDL-29624 Media embedding system, part 2: preview in file picker
sam marshall [Tue, 13 Dec 2011 17:19:03 +0000 (17:19 +0000)]
MDL-29624 Media embedding system, part 2: preview in file picker

The JavaScript file picker API shows a preview of the media file you have chosen.
This preview facility now uses an iframe, in order not to duplicate the embed code
in JavaScript. The iframe uses the standard embed API.

10 years agoMDL-29624 Media embedding system, part 1: new API and filter changes
sam marshall [Tue, 13 Dec 2011 17:08:34 +0000 (17:08 +0000)]
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

10 years agoMDL-29624 Media embedding system, part 0: Add get_path() to moodle_url
sam marshall [Thu, 19 Apr 2012 15:59:56 +0000 (16:59 +0100)]
MDL-29624 Media embedding system, part 0: Add get_path() to moodle_url

(It may not seem directly related, but this function is needed for the
media embedding system.

10 years agoMDL-32873 Separate out course ajax enabled detection into new function
Andrew Robert Nicols [Wed, 9 May 2012 09:18:39 +0000 (10:18 +0100)]
MDL-32873 Separate out course ajax enabled detection into new function