moodle.git
8 years agoMDL-42942 behat: increment version
Dan Poltawski [Wed, 27 Nov 2013 03:33:11 +0000 (11:33 +0800)]
MDL-42942 behat: increment version

8 years agoMerge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 27 Nov 2013 03:32:23 +0000 (11:32 +0800)]
Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 26 Nov 2013 23:36:02 +0000 (12:36 +1300)]
Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'master_MDL-43045' of git://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 26 Nov 2013 20:27:35 +0000 (21:27 +0100)]
Merge branch 'master_MDL-43045' of git://github.com/totara/moodle

8 years agoMerge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 26 Nov 2013 08:56:20 +0000 (16:56 +0800)]
Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle

8 years agoMDL-43008 calendar: Allow calendar plugins to display setting pages.
Adrian Greeve [Thu, 21 Nov 2013 09:14:07 +0000 (17:14 +0800)]
MDL-43008 calendar: Allow calendar plugins to display setting pages.

8 years agoMerge branch 'MDL-43000' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 26 Nov 2013 07:05:42 +0000 (15:05 +0800)]
Merge branch 'MDL-43000' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 26 Nov 2013 06:52:21 +0000 (14:52 +0800)]
Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-42851' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 26 Nov 2013 06:48:21 +0000 (14:48 +0800)]
Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 26 Nov 2013 05:24:02 +0000 (13:24 +0800)]
Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 26 Nov 2013 04:09:45 +0000 (12:09 +0800)]
Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle

8 years agoMDL-40741 behat: Changing xpaths for clean theme
David Monllao [Mon, 5 Aug 2013 05:02:06 +0000 (13:02 +0800)]
MDL-40741 behat: Changing xpaths for clean theme

Keeps compatibility with standard theme.

8 years agoMerge branch 'master-mdl42998' of https://github.com/tlock/moodle
Damyon Wiese [Tue, 26 Nov 2013 02:49:32 +0000 (10:49 +0800)]
Merge branch 'master-mdl42998' of https://github.com/tlock/moodle

8 years agoMDL-42842 behat: Adding a new formatter
David Monllao [Wed, 20 Nov 2013 05:37:26 +0000 (13:37 +0800)]
MDL-42842 behat: Adding a new formatter

Based on ProgressFormatter, the site info
will be displayed when the suite begins.

8 years agoMDL-42842 testing: Generalization of the site info
David Monllao [Wed, 20 Nov 2013 05:31:06 +0000 (13:31 +0800)]
MDL-42842 testing: Generalization of the site info

8 years agoMerge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 26 Nov 2013 02:42:04 +0000 (10:42 +0800)]
Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle

8 years agoMDL-43050 behat: Fixing moodlehq/behat-extension version
David Monllao [Mon, 25 Nov 2013 07:48:04 +0000 (15:48 +0800)]
MDL-43050 behat: Fixing moodlehq/behat-extension version

8 years agoMerge branch 'wip-mdl-41635' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 26 Nov 2013 02:24:59 +0000 (10:24 +0800)]
Merge branch 'wip-mdl-41635' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 26 Nov 2013 01:29:44 +0000 (09:29 +0800)]
Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 25 Nov 2013 19:42:25 +0000 (08:42 +1300)]
Merge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-43037_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 25 Nov 2013 19:36:36 +0000 (08:36 +1300)]
Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle

8 years agoMDL-43045 report: Fix missing role name in security overview report
Simon Coggins [Mon, 25 Nov 2013 03:25:51 +0000 (16:25 +1300)]
MDL-43045 report: Fix missing role name in security overview report

8 years agoMerge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Nov 2013 07:43:44 +0000 (15:43 +0800)]
Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-42858 Course Management: Update phpunit test for core_course_management_helper_test
rwijaya [Mon, 25 Nov 2013 07:35:26 +0000 (15:35 +0800)]
MDL-42858 Course Management: Update phpunit test for core_course_management_helper_test

8 years agoMerge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 25 Nov 2013 06:52:26 +0000 (14:52 +0800)]
Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41257-Calendar-Day-and-Upcoming-Events-View-not-processed-through...
Damyon Wiese [Mon, 25 Nov 2013 06:04:05 +0000 (14:04 +0800)]
Merge branch 'MDL-41257-Calendar-Day-and-Upcoming-Events-View-not-processed-through-text-filters' of git://github.com/michael-milette/moodle

8 years agoMerge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 25 Nov 2013 05:40:54 +0000 (13:40 +0800)]
Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 25 Nov 2013 05:16:04 +0000 (13:16 +0800)]
Merge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle
Damyon Wiese [Mon, 25 Nov 2013 05:11:24 +0000 (13:11 +0800)]
Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle

8 years agoMerge branch '43016-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 25 Nov 2013 04:21:20 +0000 (12:21 +0800)]
Merge branch '43016-27' of git://github.com/samhemelryk/moodle

8 years agoMDL-43006 behat: adding javascript tag because of behat bug
Marina Glancy [Mon, 25 Nov 2013 03:59:28 +0000 (14:59 +1100)]
MDL-43006 behat: adding javascript tag because of behat bug

behat without JS does not submit the empty textarea field causing notice in the form processing

8 years agoMerge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 25 Nov 2013 03:17:47 +0000 (11:17 +0800)]
Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Nov 2013 03:06:39 +0000 (11:06 +0800)]
Merge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 25 Nov 2013 02:48:33 +0000 (10:48 +0800)]
Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-42957 quiz statistics : Hardcoded sql LIMIT clause
James Pratt [Tue, 19 Nov 2013 14:11:50 +0000 (21:11 +0700)]
MDL-42957 quiz statistics : Hardcoded sql LIMIT clause

8 years agoMerge branch 'MDL-42547_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Nov 2013 02:37:33 +0000 (10:37 +0800)]
Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle

8 years agoMDL-37016 fix sloppy mysql nulls in event.uuid
Petr Škoda [Thu, 21 Nov 2013 01:44:41 +0000 (09:44 +0800)]
MDL-37016 fix sloppy mysql nulls in event.uuid

8 years agoMDL-43037 mod_quiz: retrieve all name fields for the user override pages
Mark Nelson [Sat, 23 Nov 2013 23:06:58 +0000 (15:06 -0800)]
MDL-43037 mod_quiz: retrieve all name fields for the user override pages

8 years agoMDL-43000 shortanswer qtype: handle patterns with many *s
Tim Hunt [Fri, 22 Nov 2013 11:29:56 +0000 (11:29 +0000)]
MDL-43000 shortanswer qtype: handle patterns with many *s

Teachers were typing patterns like
********************************<em>****************************</em>
which translates into a pattern like .*.*.*.*, which is very inefficient
to try to match, althought it is equivalent ot a single .*. At a certain
point preg was just giving up.

Since people actually do this, we should simplify the regex by treating
runs of * like a single *.

8 years agoMDL-42508 folder: add module generator
Marina Glancy [Fri, 22 Nov 2013 04:23:52 +0000 (15:23 +1100)]
MDL-42508 folder: add module generator

8 years agoMDL-42851 frontpage: fix rtl in clean theme for course listings
rwijaya [Wed, 13 Nov 2013 09:38:09 +0000 (17:38 +0800)]
MDL-42851 frontpage: fix rtl in clean theme for course listings

8 years agoMDL-42508 imspcp: add module generator
Marina Glancy [Tue, 19 Nov 2013 03:50:21 +0000 (14:50 +1100)]
MDL-42508 imspcp: add module generator

8 years agoMDL-42508 scorm: add module generator
Marina Glancy [Tue, 19 Nov 2013 03:49:45 +0000 (14:49 +1100)]
MDL-42508 scorm: add module generator

8 years agoMDL-43024 course: fixed bug for accessing section options
Marina Glancy [Fri, 22 Nov 2013 01:39:55 +0000 (12:39 +1100)]
MDL-43024 course: fixed bug for accessing section options

8 years agoMDL-43016 block_navigation: fixed category link display
Sam Hemelryk [Thu, 21 Nov 2013 19:55:39 +0000 (08:55 +1300)]
MDL-43016 block_navigation: fixed category link display

8 years agoweekly on-sync release 2.7dev
Eloy Lafuente (stronk7) [Thu, 21 Nov 2013 18:33:52 +0000 (19:33 +0100)]
weekly on-sync release 2.7dev

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Eloy Lafuente (stronk7) [Thu, 21 Nov 2013 18:33:47 +0000 (19:33 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoMDL-42858 Course Management: fix regression for subcategories visibility
rwijaya [Thu, 21 Nov 2013 07:32:50 +0000 (15:32 +0800)]
MDL-42858 Course Management: fix regression for subcategories visibility

8 years agoMDL-42733 behat: Removing the restriction of an started output to handle the PHP...
David Monllao [Thu, 21 Nov 2013 06:34:56 +0000 (14:34 +0800)]
MDL-42733 behat: Removing the restriction of an started output to handle the PHP errors

8 years agoMDL-43005 blogs: Fix issues with blog tags
Ankit Agarwal [Thu, 21 Nov 2013 05:36:48 +0000 (13:36 +0800)]
MDL-43005 blogs: Fix issues with blog tags

8 years agoMDL-42925 course: Changed help string for course format selection
Marina Glancy [Thu, 21 Nov 2013 02:29:31 +0000 (13:29 +1100)]
MDL-42925 course: Changed help string for course format selection

8 years agoMDL-42985 curl: Correctly apply rule proxybypass
Frederic Massart [Wed, 20 Nov 2013 07:54:01 +0000 (15:54 +0800)]
MDL-42985 curl: Correctly apply rule proxybypass

8 years agoMDL-40850 editor: Manage files popup correctly sets the course/cm context
Marina Glancy [Thu, 21 Nov 2013 00:55:20 +0000 (11:55 +1100)]
MDL-40850 editor: Manage files popup correctly sets the course/cm context

8 years agoMDL-42998: Fix user selection search options autoselectunique.
Tim Lock [Wed, 20 Nov 2013 22:47:04 +0000 (09:17 +1030)]
MDL-42998: Fix user selection search options autoselectunique.

8 years agoMDL-42992 SCORM: Always allow IE to resize window
Dan Marsden [Wed, 20 Nov 2013 21:18:43 +0000 (10:18 +1300)]
MDL-42992 SCORM: Always allow IE to resize window

8 years agoMDL-42930 Release upgrade line: Fix ordering for tinymce
Damyon Wiese [Wed, 20 Nov 2013 03:47:35 +0000 (11:47 +0800)]
MDL-42930 Release upgrade line: Fix ordering for tinymce

8 years agoMDL-41635 Reports: Added missing string in loglive reports
FilipBenco [Tue, 8 Oct 2013 19:19:16 +0000 (21:19 +0200)]
MDL-41635 Reports: Added missing string in loglive reports

Under course administration navigation log live doesn't appear
or appear with empty string (in some themes), this is happening
because text passed is empty.

8 years agoMerge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Wed, 20 Nov 2013 02:20:17 +0000 (13:20 +1100)]
Merge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-42913 lib/grouplib.php: Avoid cache sometimes for groups_get_all_groups
Aaron Barnes [Fri, 15 Nov 2013 00:34:06 +0000 (13:34 +1300)]
MDL-42913 lib/grouplib.php: Avoid cache sometimes for groups_get_all_groups

The new groups cache returns unexpected results when you pass
in a field parameter than would normally change the result array index

8 years agoMDL-41257 calendar: Day and Upcoming-Events view not processed through text_filters...
Michael Milette [Tue, 19 Nov 2013 13:33:04 +0000 (08:33 -0500)]
MDL-41257 calendar: Day and Upcoming-Events view not processed through text_filters() function

This fix adds text filtering to the Calendar Day view and Upcoming Events view, specifically the event name and event description.

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
8 years agoMDL-42767 events: Remove ob_clean from tests
Ankit Agarwal [Tue, 19 Nov 2013 08:34:49 +0000 (16:34 +0800)]
MDL-42767 events: Remove ob_clean from tests

8 years agoMDL-42767 notes: Delete notes on a course delete
Ankit Agarwal [Fri, 8 Nov 2013 06:26:02 +0000 (14:26 +0800)]
MDL-42767 notes: Delete notes on a course delete

8 years agoMDL-42547 tool_uploaduser: trim values before uploading users
Mark Nelson [Thu, 14 Nov 2013 01:25:48 +0000 (17:25 -0800)]
MDL-42547 tool_uploaduser: trim values before uploading users

8 years agoMDL-42924 Administration: use normalize_component to extract plugin name and type
Rajesh Taneja [Tue, 19 Nov 2013 03:51:20 +0000 (11:51 +0800)]
MDL-42924 Administration: use normalize_component to extract plugin name and type

8 years agoMerge branch 'wip-mdl-42403' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 19 Nov 2013 03:43:39 +0000 (11:43 +0800)]
Merge branch 'wip-mdl-42403' of https://github.com/rajeshtaneja/moodle

8 years agoMDL-42403 course: Added behat to check visibility of bluk move action
Rajesh Taneja [Thu, 31 Oct 2013 05:27:47 +0000 (13:27 +0800)]
MDL-42403 course: Added behat to check visibility of bluk move action

8 years agoMDL-42403 course: Show bluk move to category only when something selected
Rajesh Taneja [Wed, 30 Oct 2013 06:56:27 +0000 (14:56 +0800)]
MDL-42403 course: Show bluk move to category only when something selected

8 years agoMerge branch '42060-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 19 Nov 2013 02:39:30 +0000 (10:39 +0800)]
Merge branch '42060-27' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-42504' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 19 Nov 2013 02:30:16 +0000 (10:30 +0800)]
Merge branch 'MDL-42504' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-42181' of git://github.com/mkassaei/moodle
Dan Poltawski [Tue, 19 Nov 2013 02:04:59 +0000 (10:04 +0800)]
Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle

8 years agoMerge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
Damyon Wiese [Tue, 19 Nov 2013 01:49:57 +0000 (09:49 +0800)]
Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:37:28 +0000 (14:37 +1300)]
Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-42553_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:31:51 +0000 (14:31 +1300)]
Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:19:20 +0000 (14:19 +1300)]
Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle

8 years agoAutomatically generated installer lang files
AMOS bot [Tue, 19 Nov 2013 00:40:26 +0000 (00:40 +0000)]
Automatically generated installer lang files

8 years agoMDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db
Dan Marsden [Tue, 19 Nov 2013 00:20:34 +0000 (13:20 +1300)]
MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db

8 years agoMerge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:28:08 +0000 (12:28 +1300)]
Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:24:56 +0000 (12:24 +1300)]
Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:06:29 +0000 (12:06 +1300)]
Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-42863' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:03:41 +0000 (12:03 +1300)]
Merge branch 'MDL-42863' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-42865' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 18 Nov 2013 22:50:44 +0000 (11:50 +1300)]
Merge branch 'MDL-42865' of git://github.com/timhunt/moodle

8 years agoMDL-42852 theme_bootstrapbase: fixed whitespace
Sam Hemelryk [Mon, 18 Nov 2013 22:44:29 +0000 (11:44 +1300)]
MDL-42852 theme_bootstrapbase: fixed whitespace

8 years agoMerge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Mon, 18 Nov 2013 22:42:25 +0000 (11:42 +1300)]
Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)]
Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 18 Nov 2013 21:08:45 +0000 (10:08 +1300)]
Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-42100_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 18 Nov 2013 08:08:57 +0000 (16:08 +0800)]
Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-42880b' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Nov 2013 07:37:01 +0000 (15:37 +0800)]
Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 18 Nov 2013 07:12:56 +0000 (15:12 +0800)]
Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)]
Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-42884_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 18 Nov 2013 06:41:06 +0000 (14:41 +0800)]
Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-42930-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 18 Nov 2013 06:32:55 +0000 (14:32 +0800)]
Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle

Conflicts:
mod/scorm/db/upgrade.php

8 years agoMerge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 18 Nov 2013 06:05:17 +0000 (14:05 +0800)]
Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle

8 years agoMDL-42612 add support for Russian Ruble in PayPal
Petr Škoda [Wed, 30 Oct 2013 08:50:36 +0000 (09:50 +0100)]
MDL-42612 add support for Russian Ruble in PayPal

8 years agoMDL-42930 Add 2.6.0 upgrade line
Damyon Wiese [Mon, 18 Nov 2013 03:46:40 +0000 (11:46 +0800)]
MDL-42930 Add 2.6.0 upgrade line

8 years agoMDL-42850 administration: Updated bulk user upload errors to be more descriptive.
Adrian Greeve [Thu, 14 Nov 2013 07:55:00 +0000 (15:55 +0800)]
MDL-42850 administration: Updated bulk user upload errors to be more descriptive.

8 years agoMDL-42060 block_course_list: fixed sorting of mycourses
Sam Hemelryk [Sun, 17 Nov 2013 20:37:01 +0000 (09:37 +1300)]
MDL-42060 block_course_list: fixed sorting of mycourses

8 years agoMDL-41695 SCORM: allow unlimited decimal places in CMIDecimal
Dan Marsden [Fri, 8 Nov 2013 00:51:39 +0000 (13:51 +1300)]
MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal

8 years agoMDL-40223 SCORM: update scorm->launch param after restore - also check that scorm...
Dan Marsden [Thu, 7 Nov 2013 01:27:25 +0000 (14:27 +1300)]
MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid.

8 years agoMDL-42852 lib: Blocks disappear in Clean in RTL.
Gareth J Barnard [Sun, 17 Nov 2013 13:33:30 +0000 (13:33 +0000)]
MDL-42852 lib: Blocks disappear in Clean in RTL.