moodle.git
8 years agoMDL-38547 behat: coding style fixes.
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:40:50 +0000 (22:40 +0200)]
MDL-38547 behat: coding style fixes.

8 years agoMerge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:32:06 +0000 (22:32 +0200)]
Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:23:58 +0000 (22:23 +0200)]
Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:17:12 +0000 (22:17 +0200)]
Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 11:25:31 +0000 (13:25 +0200)]
Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 11:17:20 +0000 (13:17 +0200)]
Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 11:12:08 +0000 (13:12 +0200)]
Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle

8 years agoMDL-38817 behat: New test
David Monllao [Mon, 1 Apr 2013 05:57:01 +0000 (13:57 +0800)]
MDL-38817 behat: New test

According to MDLQA-50, in a survey activity
a teacher can set three types of survey

8 years agoMDL-38788 behat: Add a block and add an activity steps definitions compatible with...
David Monllao [Thu, 28 Mar 2013 10:05:05 +0000 (18:05 +0800)]
MDL-38788 behat: Add a block and add an activity steps definitions compatible with JS disabled

8 years agoMDL-38788 behat: Generic form elements interaction compatibile with JS disabled
David Monllao [Thu, 28 Mar 2013 10:03:27 +0000 (18:03 +0800)]
MDL-38788 behat: Generic form elements interaction compatibile with JS disabled

8 years agoMDL-38788 behat: New tests with Javascript disabled
David Monllao [Thu, 28 Mar 2013 10:02:30 +0000 (18:02 +0800)]
MDL-38788 behat: New tests with Javascript disabled

Add a block and add an activity/resource
tests. The add an activity with JS disabled
test includes MDLQA-2446 automation.

8 years agoMDL-38787 behat: Move to the new Javascript-based test class manager
David Monllao [Thu, 28 Mar 2013 08:59:18 +0000 (16:59 +0800)]
MDL-38787 behat: Move to the new Javascript-based test class manager

8 years agoweekly release 2.5dev
Damyon Wiese [Thu, 28 Mar 2013 06:44:31 +0000 (14:44 +0800)]
weekly release 2.5dev

8 years agoFix permissions
Damyon Wiese [Thu, 28 Mar 2013 06:36:33 +0000 (14:36 +0800)]
Fix permissions

8 years agoMerge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle
Damyon Wiese [Thu, 28 Mar 2013 01:39:05 +0000 (09:39 +0800)]
Merge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle

8 years agoMerge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:56:57 +0000 (23:56 +0100)]
Merge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:38:33 +0000 (23:38 +0100)]
Merge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle

8 years agoMDL-38516 JavaScript: Migrate moodle-block_navigation-navigation to use Shifter
Andrew Robert Nicols [Sat, 16 Mar 2013 22:30:02 +0000 (22:30 +0000)]
MDL-38516 JavaScript: Migrate moodle-block_navigation-navigation to use Shifter

8 years agoMerge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:20:18 +0000 (23:20 +0100)]
Merge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:06:46 +0000 (23:06 +0100)]
Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 21:42:33 +0000 (22:42 +0100)]
Merge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 21:29:21 +0000 (22:29 +0100)]
Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 20:43:30 +0000 (21:43 +0100)]
Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 17:50:34 +0000 (18:50 +0100)]
Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle

8 years agoMDL-38499 behat: Steps definitions for section visibility management
David Monllao [Tue, 19 Mar 2013 06:09:14 +0000 (14:09 +0800)]
MDL-38499 behat: Steps definitions for section visibility management

8 years agoMDL-38499 behat: New test
David Monllao [Tue, 19 Mar 2013 05:46:44 +0000 (13:46 +0800)]
MDL-38499 behat: New test

The show/hide section icon functions
correctly. According to MDLQA-1579,
MDLQA-1580, MDLQA-1581, MDLQA-1582
and MDLQA-1583.

8 years agoMDL-38486 behat: New test
David Monllao [Fri, 15 Mar 2013 03:27:19 +0000 (11:27 +0800)]
MDL-38486 behat: New test

Section highlighting can be turned off
correctly using the toggle highlighting
icon. According to MDLQA-1591, MDLQA-1592,
MDLQA-1593, MDLQA-1594 and MDLQA-1595

8 years agoMDL-38486 behat: Course's topics highlighting steps definitions
David Monllao [Fri, 15 Mar 2013 03:26:18 +0000 (11:26 +0800)]
MDL-38486 behat: Course's topics highlighting steps definitions

8 years agoMerge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 27 Mar 2013 06:11:27 +0000 (14:11 +0800)]
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-38147 fixed bug with windows PHP different function behaviour
Marina Glancy [Wed, 27 Mar 2013 06:06:27 +0000 (17:06 +1100)]
MDL-38147 fixed bug with windows PHP different function behaviour

8 years agoMDL-38147 added comments for SQL-based course search that might not work on some DB
Marina Glancy [Wed, 27 Mar 2013 06:05:51 +0000 (17:05 +1100)]
MDL-38147 added comments for SQL-based course search that might not work on some DB

8 years agoMDL-38147 do not use DB->sql_length because it does not work on MSSQL
Marina Glancy [Wed, 27 Mar 2013 05:07:29 +0000 (16:07 +1100)]
MDL-38147 do not use DB->sql_length because it does not work on MSSQL

8 years agoMerge branch 'MDL-38632' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 27 Mar 2013 05:07:10 +0000 (13:07 +0800)]
Merge branch 'MDL-38632' of git://github.com/stronk7/moodle

8 years agoMerge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 27 Mar 2013 04:17:47 +0000 (12:17 +0800)]
Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-38717 Admin: Change setType for email to PARAM_EMAIL
Damyon Wiese [Wed, 27 Mar 2013 04:11:06 +0000 (12:11 +0800)]
MDL-38717 Admin: Change setType for email to PARAM_EMAIL

8 years agoMerge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)]
Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-38659' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 27 Mar 2013 02:38:31 +0000 (10:38 +0800)]
Merge branch 'MDL-38659' of git://github.com/stronk7/moodle

8 years agoMDL-38736 mod_choice: fix missing param type
Dan Poltawski [Wed, 27 Mar 2013 02:08:40 +0000 (10:08 +0800)]
MDL-38736 mod_choice: fix missing param type

8 years agoMDL-35876: Whitespace, indenting and more verbose upgrade.txt
Damyon Wiese [Wed, 27 Mar 2013 02:16:09 +0000 (10:16 +0800)]
MDL-35876: Whitespace, indenting and more verbose upgrade.txt

8 years agoMDL-38717 admin: missing setType on email
Dan Poltawski [Wed, 27 Mar 2013 02:12:46 +0000 (10:12 +0800)]
MDL-38717 admin: missing setType on email

8 years agoMerge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
Damyon Wiese [Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)]
Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)]
Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle

8 years agoMerge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)]
Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 00:49:10 +0000 (01:49 +0100)]
Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/base/style/core.css

8 years agoMerge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:47:32 +0000 (00:47 +0100)]
Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:46:05 +0000 (00:46 +0100)]
Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:43:19 +0000 (00:43 +0100)]
Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38557' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:38:07 +0000 (23:38 +0100)]
Merge branch 'MDL-38557' of git://github.com/timhunt/moodle

Conflicts:
lib/db/upgrade.php
version.php

8 years agoMerge branch 'MDL-38651' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:27:16 +0000 (23:27 +0100)]
Merge branch 'MDL-38651' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38647' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:22:25 +0000 (23:22 +0100)]
Merge branch 'MDL-38647' of git://github.com/timhunt/moodle

8 years agoMerge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:14:24 +0000 (23:14 +0100)]
Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle

8 years agoMerge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:13:33 +0000 (23:13 +0100)]
Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:10:11 +0000 (23:10 +0100)]
Merge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:04:48 +0000 (23:04 +0100)]
Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

8 years agoMDL-37742 add debugging message when $DB->sql_empty() used
Petr Škoda [Tue, 26 Mar 2013 19:00:52 +0000 (20:00 +0100)]
MDL-37742 add debugging message when $DB->sql_empty() used

8 years agoMDL-25631 backup Decoupling legacy files from course config settigs. If they are...
Eric Merrill [Tue, 26 Mar 2013 19:18:10 +0000 (15:18 -0400)]
MDL-25631 backup Decoupling legacy files from course config settigs. If they are present, they will be restored.

8 years agoMerge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 15:09:06 +0000 (16:09 +0100)]
Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle

8 years agoMerge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 15:07:12 +0000 (16:07 +0100)]
Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38582' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 15:03:37 +0000 (16:03 +0100)]
Merge branch 'MDL-38582' of git://github.com/timhunt/moodle

8 years agoMDL-38659 environment: fix incorrect feedback messages
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 14:34:50 +0000 (15:34 +0100)]
MDL-38659 environment: fix incorrect feedback messages

8 years agoMDL-38659 environment: verify feedback matches levels
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 01:13:52 +0000 (02:13 +0100)]
MDL-38659 environment: verify feedback matches levels

8 years agoMerge branch 'MDL-38719'
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 12:37:13 +0000 (13:37 +0100)]
Merge branch 'MDL-38719'

8 years agoMDL-38719 forms: detectMissingSetType() handle of repetitions.
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 12:20:23 +0000 (13:20 +0100)]
MDL-38719 forms: detectMissingSetType() handle of repetitions.

It seems that formslib, for repetition, relies in the type
especified by the main (non existent at the end) element, instead
of assingning a type to each repetition.

Surely a result of storing types apart from elements. :-(

With the patch, detectMissingSetType() will detect
repeated elements (name containing '[') and will
perform the verification against that main element type.

8 years agoMDL-38719 forms: add some missing types.
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 11:13:40 +0000 (12:13 +0100)]
MDL-38719 forms: add some missing types.

This just adds some missing types to different places
causing phpunit tests to fail.

8 years agoMDL-38564 fixed whitespace
Aparup Banerjee [Tue, 26 Mar 2013 09:22:22 +0000 (17:22 +0800)]
MDL-38564 fixed whitespace

8 years agoMerge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)]
Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 26 Mar 2013 09:12:18 +0000 (17:12 +0800)]
Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle

8 years agoMDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and...
Ankit Agarwal [Wed, 20 Mar 2013 05:17:48 +0000 (13:17 +0800)]
MDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and compare_activities_by_time_desc()

8 years agoMerge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle
Damyon Wiese [Tue, 26 Mar 2013 08:11:47 +0000 (16:11 +0800)]
Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle

8 years agoMerge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on'...
Damyon Wiese [Tue, 26 Mar 2013 07:40:04 +0000 (15:40 +0800)]
Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle

8 years agoMDL-38468 Filelib: Fix ordering of new mimetypes
Damyon Wiese [Tue, 26 Mar 2013 07:16:15 +0000 (15:16 +0800)]
MDL-38468 Filelib: Fix ordering of new mimetypes

8 years agoMerge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara...
Damyon Wiese [Tue, 26 Mar 2013 07:13:35 +0000 (15:13 +0800)]
Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle

Conflicts:
lib/db/upgrade.php
version.php

8 years agoMerge branch 'MDL-38528' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:57:04 +0000 (14:57 +0800)]
Merge branch 'MDL-38528' of git://github.com/timhunt/moodle

8 years agoMDL-35875: Version bump for CSS changes
Damyon Wiese [Tue, 26 Mar 2013 06:50:18 +0000 (14:50 +0800)]
MDL-35875: Version bump for CSS changes

8 years agoMerge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:49:34 +0000 (14:49 +0800)]
Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/upgrade.txt

8 years agoMerge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:29:57 +0000 (14:29 +0800)]
Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle

8 years agoMDL-38147 Course: Added version bump for cache definitions.
Damyon Wiese [Tue, 26 Mar 2013 06:22:35 +0000 (14:22 +0800)]
MDL-38147 Course: Added version bump for cache definitions.

8 years agoMerge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:22:11 +0000 (14:22 +0800)]
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/upgrade.txt

8 years agoMDL-35876 - Blocks - Adding verbose move here descriptions to blocks for accessibility
Jason Fowler [Mon, 11 Mar 2013 06:56:35 +0000 (14:56 +0800)]
MDL-35876 - Blocks - Adding verbose move here descriptions to blocks for accessibility

8 years agoMerge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:46:29 +0000 (13:46 +0800)]
Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle

Conflicts:
course/moodleform_mod.php
lib/upgrade.txt

8 years agoMDL-38598 Forms: Version bump for js changes.
Damyon Wiese [Tue, 26 Mar 2013 05:33:52 +0000 (13:33 +0800)]
MDL-38598 Forms: Version bump for js changes.

8 years agoMerge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:28:57 +0000 (13:28 +0800)]
Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-38380' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:23:53 +0000 (13:23 +0800)]
Merge branch 'MDL-38380' of git://github.com/lazydaisy/moodle

8 years agoMDL-38147 bug fix, changed usage of non-existing function
Marina Glancy [Tue, 26 Mar 2013 05:17:34 +0000 (16:17 +1100)]
MDL-38147 bug fix, changed usage of non-existing function

8 years agoMerge branch 'MDL-38390' of git://github.com/jonof/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:12:29 +0000 (13:12 +0800)]
Merge branch 'MDL-38390' of git://github.com/jonof/moodle

8 years agoMerge branch 'MDL-38429' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:59:53 +0000 (12:59 +0800)]
Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-38569-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:19:05 +0000 (12:19 +0800)]
Merge branch 'MDL-38569-master' of git://github.com/FMCorz/moodle

8 years agoMDL-38147 fixed small bug on changed categories cache
Marina Glancy [Tue, 26 Mar 2013 03:09:00 +0000 (14:09 +1100)]
MDL-38147 fixed small bug on changed categories cache

8 years agoMerge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Mar 2013 02:41:33 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Mar 2013 02:04:31 +0000 (10:04 +0800)]
Merge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle
Damyon Wiese [Tue, 26 Mar 2013 01:38:46 +0000 (09:38 +0800)]
Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle

8 years agoMDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.
Gareth J Barnard [Mon, 25 Mar 2013 10:26:35 +0000 (10:26 +0000)]
MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.

8 years agoMerge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 25 Mar 2013 08:00:00 +0000 (16:00 +0800)]
Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38668' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:51:01 +0000 (15:51 +0800)]
Merge branch 'MDL-38668' of git://github.com/stronk7/moodle

8 years agoMerge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:36:25 +0000 (15:36 +0800)]
Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle

8 years agoMDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase.
Rossiani Wijaya [Mon, 25 Mar 2013 06:07:18 +0000 (14:07 +0800)]
MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase.

8 years agoMDL-38654 Deprecating gdversion setting: Fix typo for new install
Damyon Wiese [Mon, 25 Mar 2013 06:05:17 +0000 (14:05 +0800)]
MDL-38654 Deprecating gdversion setting: Fix typo for new install

8 years agoMerge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Mar 2013 06:02:31 +0000 (14:02 +0800)]
Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle

Conflicts:
lang/en/admin.php

8 years agoMDL-38429: lesson report - Improve lesson statistics code.
Roman Tsukanov [Mon, 25 Mar 2013 05:07:18 +0000 (13:07 +0800)]
MDL-38429: lesson report - Improve lesson statistics code.

8 years agoMerge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Mar 2013 04:27:32 +0000 (12:27 +0800)]
Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle