moodle.git
9 years agoMerge branch 'MDL-35959-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 30 Oct 2012 00:31:30 +0000 (13:31 +1300)]
Merge branch 'MDL-35959-master' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'WIP-MDL-36070-master' of git://github.com/nadavkav/moodle
Sam Hemelryk [Tue, 30 Oct 2012 00:02:24 +0000 (13:02 +1300)]
Merge branch 'WIP-MDL-36070-master' of git://github.com/nadavkav/moodle

9 years agoMerge branch 'MDL-36076' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 29 Oct 2012 23:59:23 +0000 (12:59 +1300)]
Merge branch 'MDL-36076' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-36101-master' of git://github.com/micaherne/moodle
Sam Hemelryk [Mon, 29 Oct 2012 23:54:56 +0000 (12:54 +1300)]
Merge branch 'MDL-36101-master' of git://github.com/micaherne/moodle

9 years agoMerge branch 'MDL-36103' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 29 Oct 2012 23:52:00 +0000 (12:52 +1300)]
Merge branch 'MDL-36103' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-36105-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Mon, 29 Oct 2012 23:31:22 +0000 (12:31 +1300)]
Merge branch 'MDL-36105-master' of https://github.com/mackensen/moodle

9 years agoMerge branch 'wip-mdl-36131' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 29 Oct 2012 23:24:31 +0000 (12:24 +1300)]
Merge branch 'wip-mdl-36131' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-36137_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 29 Oct 2012 23:17:11 +0000 (12:17 +1300)]
Merge branch 'MDL-36137_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-34910_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 29 Oct 2012 07:36:07 +0000 (15:36 +0800)]
Merge branch 'MDL-34910_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'master_MDL-35215' of git://github.com/totara/moodle
Dan Poltawski [Mon, 29 Oct 2012 07:33:43 +0000 (15:33 +0800)]
Merge branch 'master_MDL-35215' of git://github.com/totara/moodle

9 years agoMerge branch 'MDL-34363' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 29 Oct 2012 07:21:39 +0000 (15:21 +0800)]
Merge branch 'MDL-34363' of git://github.com/merrill-oakland/moodle

9 years agoMDL-34910 blog Remove new entry link when the context doesn't allows to add new entries
David Monllao [Wed, 15 Aug 2012 08:02:52 +0000 (16:02 +0800)]
MDL-34910 blog Remove new entry link when the context doesn't allows to add new entries

9 years agoMerge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:59:45 +0000 (14:59 +0800)]
Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle

9 years agoMerge branch 'wip-MDL-36075_MASTER' of git://github.com/jason-platts/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:57:14 +0000 (14:57 +0800)]
Merge branch 'wip-MDL-36075_MASTER' of git://github.com/jason-platts/moodle

9 years agoMDL-34354 - remove unused line
Dan Poltawski [Mon, 29 Oct 2012 06:54:14 +0000 (14:54 +0800)]
MDL-34354 - remove unused line

9 years agoMerge branch 'MDL-34354-master' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:53:43 +0000 (14:53 +0800)]
Merge branch 'MDL-34354-master' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-36099-master' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:50:23 +0000 (14:50 +0800)]
Merge branch 'MDL-36099-master' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-35880-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:35:21 +0000 (14:35 +0800)]
Merge branch 'MDL-35880-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-35990-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:32:11 +0000 (14:32 +0800)]
Merge branch 'MDL-35990-master' of git://github.com/FMCorz/moodle

9 years agoMDL-35116 - update version numbers
Dan Poltawski [Mon, 29 Oct 2012 06:08:28 +0000 (14:08 +0800)]
MDL-35116 - update version numbers

9 years agoMDL-35116 upgrade: Rename backup files having used short name previously
Frederic Massart [Fri, 19 Oct 2012 02:55:07 +0000 (10:55 +0800)]
MDL-35116 upgrade: Rename backup files having used short name previously

9 years agoMerge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Oct 2012 06:03:57 +0000 (14:03 +0800)]
Merge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Oct 2012 05:55:06 +0000 (13:55 +0800)]
Merge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'w43_MDL-35843_m42_expiryself' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 29 Oct 2012 05:49:47 +0000 (13:49 +0800)]
Merge branch 'w43_MDL-35843_m42_expiryself' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-35964' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 29 Oct 2012 05:48:44 +0000 (13:48 +0800)]
Merge branch 'MDL-35964' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-34343-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 29 Oct 2012 04:39:06 +0000 (12:39 +0800)]
Merge branch 'wip-MDL-34343-m24' of git://github.com/samhemelryk/moodle

9 years agoMDL-34399 - bump version to reload cache definition
Dan Poltawski [Mon, 29 Oct 2012 04:36:22 +0000 (12:36 +0800)]
MDL-34399 - bump version to reload cache definition

9 years agoMerge branch 'MDL-34399' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 29 Oct 2012 04:18:01 +0000 (12:18 +0800)]
Merge branch 'MDL-34399' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-36086-workshop' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 29 Oct 2012 04:11:51 +0000 (12:11 +0800)]
Merge branch 'MDL-36086-workshop' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'wip-MDL-36052-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 29 Oct 2012 03:52:25 +0000 (11:52 +0800)]
Merge branch 'wip-MDL-36052-m24' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'wip-MDL-36115-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 29 Oct 2012 03:48:55 +0000 (11:48 +0800)]
Merge branch 'wip-MDL-36115-m24' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-35297' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 29 Oct 2012 01:50:20 +0000 (09:50 +0800)]
Merge branch 'MDL-35297' of git://github.com/stronk7/moodle

9 years agoMDL-34399 quiz cleanup: remove ugly question/page number hack
Tim Hunt [Thu, 18 Oct 2012 19:25:57 +0000 (03:25 +0800)]
MDL-34399 quiz cleanup: remove ugly question/page number hack

It used to be necessary to store the question number and question page
by adding them as random extra fields on the question object (but
I can no longer remember what that reason was). Now it is possible
to store this sensibly in the quiz_attempt object, which is much
cleaner, so do that.

9 years agoMDL-34399 questions cleanup: straighten out strange links to question objects.
Tim Hunt [Thu, 18 Oct 2012 19:23:32 +0000 (03:23 +0800)]
MDL-34399 questions cleanup: straighten out strange links to question objects.

9 years agoMDL-34399 quiz cleanup: remove never used function.
Tim Hunt [Thu, 18 Oct 2012 19:20:49 +0000 (03:20 +0800)]
MDL-34399 quiz cleanup: remove never used function.

This got added during the Moodle 2.0 files API conversion, but was
always part of a failed experiemnt, so should have been deleted
long ago. It was never actually used.

9 years agoMDL-34399 questions: cache to help load question definitions.
Tim Hunt [Wed, 17 Oct 2012 09:25:04 +0000 (17:25 +0800)]
MDL-34399 questions: cache to help load question definitions.

At the moment, it takes several DB queries to load each question definition,
so this cache is potentially a big win.

9 years agoMDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual...
Andrew Robert Nicols [Sun, 7 Oct 2012 08:55:08 +0000 (09:55 +0100)]
MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events

9 years agoMDL-35297 book: replay some steps lost when book landed to core
Eloy Lafuente (stronk7) [Sun, 21 Oct 2012 07:56:01 +0000 (15:56 +0800)]
MDL-35297 book: replay some steps lost when book landed to core

This commit replays, conditionally, all the upgrade steps from
MOODLE_19_STABLE to MOODLE_23_STABLE in the mod_book activity. That
guarentees that any site using the mod_book before landing to core,
no matter if it was the latest or an outdated one will upgrade
perfectly to the expected current version.

As a general rule, everytime one contrib plugin lands to core, its
complete upgrade code must be kept, at least until the core version
that introduced it, is out completely from the upgrade requirement
conditions.

In this case, with the missing upgrade code being added to 2.4, it
will be safe to delete the upgrade steps once 2.5 (or upwards) become
a requirement. Never always.

9 years agoMDL-36137 theme_magazine: changed forum and description info from center to left...
Mary Evans [Fri, 19 Oct 2012 22:39:01 +0000 (23:39 +0100)]
MDL-36137 theme_magazine: changed forum and description info from center to left aligned.

9 years agoMDL-36086 Fix SQL parameters array
David Mudrák [Wed, 17 Oct 2012 05:39:33 +0000 (07:39 +0200)]
MDL-36086 Fix SQL parameters array

9 years agoMDL-36131 AJAX: Conditional activities will behave same as in non-ajax mode
Rajesh Taneja [Fri, 19 Oct 2012 03:58:25 +0000 (11:58 +0800)]
MDL-36131 AJAX: Conditional activities will behave same as in non-ajax mode

9 years agoMDL-36103 tablelib: links to user profiles are wrong in courses.
Tim Hunt [Fri, 19 Oct 2012 08:49:34 +0000 (16:49 +0800)]
MDL-36103 tablelib: links to user profiles are wrong in courses.

9 years agoMDL-36033 - Left align Numeric value fields in Calculated and Numeric question, when...
Nadav Kavalerchik [Sun, 14 Oct 2012 11:44:47 +0000 (13:44 +0200)]
MDL-36033 - Left align Numeric value fields in Calculated and Numeric question, when in RTL mode

9 years agoMDL-36070 - Points label hides UP and Down ordering arrows and Delete Icon on Quiz...
Nadav Kavalerchik [Tue, 16 Oct 2012 08:44:34 +0000 (10:44 +0200)]
MDL-36070 - Points label hides UP and Down ordering arrows and Delete Icon on Quiz edit page, in RTL mode (theme/standard)

9 years agoMDL-35843 implement self enrolment expiry notification
Petr Škoda [Sat, 13 Oct 2012 21:01:34 +0000 (23:01 +0200)]
MDL-35843 implement self enrolment expiry notification

9 years agoMDL-35843 refactor expiry notifications to core enrol feature
Petr Škoda [Sat, 13 Oct 2012 20:23:35 +0000 (22:23 +0200)]
MDL-35843 refactor expiry notifications to core enrol feature

9 years agoMDL-35843 prepare fox expiry refactoring to core enrol feature
Petr Škoda [Sat, 13 Oct 2012 19:43:28 +0000 (21:43 +0200)]
MDL-35843 prepare fox expiry refactoring to core enrol feature

AMOS BEGIN
  MOV [errorthresholdlow,enrol_manual],[errorthresholdlow,core_enrol]
  MOV [expirynotify,enrol_manual],[expirynotify,core_enrol]
  MOV [expirynotify_help,enrol_manual],[expirynotify_help,core_enrol]
  MOV [expirynotifyall,enrol_manual],[expirynotifyall,core_enrol]
  MOV [expirynotifyteacher,enrol_manual],[expirynotifyenroller,core_enrol]
  MOV [notifyhour,enrol_manual],[expirynotifyhour,core_enrol]
  MOV [expirythreshold,enrol_manual],[expirythreshold,core_enrol]
  MOV [expirythreshold_help,enrol_manual],[expirythreshold_help,core_enrol]
AMOS END

9 years agoMDL-36052 cache: Tidied up language in readme and added missing definition args
Sam Hemelryk [Fri, 19 Oct 2012 02:23:38 +0000 (10:23 +0800)]
MDL-36052 cache: Tidied up language in readme and added missing definition args

9 years agoMDL-36052 cache: Fixed up the cache README file.
Sam Hemelryk [Mon, 15 Oct 2012 09:35:49 +0000 (17:35 +0800)]
MDL-36052 cache: Fixed up the cache README file.

9 years agoMDL-36115 cache: Fixed up requirements check in cache admin interfaces
Sam Hemelryk [Thu, 18 Oct 2012 06:40:51 +0000 (14:40 +0800)]
MDL-36115 cache: Fixed up requirements check in cache admin interfaces

9 years agoMDL-25290 conversion: Added db column cache to pgsql + mysql
Sam Hemelryk [Mon, 13 Aug 2012 23:38:13 +0000 (11:38 +1200)]
MDL-25290 conversion: Added db column cache to pgsql + mysql

9 years agoweekly release 2.4dev
Aparup Banerjee [Thu, 18 Oct 2012 11:41:39 +0000 (19:41 +0800)]
weekly release 2.4dev

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Aparup Banerjee [Thu, 18 Oct 2012 11:20:30 +0000 (19:20 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMDL-35117 backup: Read information from backup XML file when removing excess backups
Frederic Massart [Thu, 11 Oct 2012 03:26:03 +0000 (11:26 +0800)]
MDL-35117 backup: Read information from backup XML file when removing excess backups

9 years agoMDL-35117 librairies: File Packer can only extract a specific list a files
Frederic Massart [Thu, 11 Oct 2012 01:15:04 +0000 (09:15 +0800)]
MDL-35117 librairies: File Packer can only extract a specific list a files

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 18 Oct 2012 00:34:54 +0000 (00:34 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'WIP-MDL-35583' of git://github.com/nadavkav/moodle
Aparup Banerjee [Wed, 17 Oct 2012 19:45:06 +0000 (03:45 +0800)]
Merge branch 'WIP-MDL-35583' of git://github.com/nadavkav/moodle

9 years agoMDL-36105 grades: use consistent icon classs
Charles Fulton [Wed, 17 Oct 2012 18:07:12 +0000 (11:07 -0700)]
MDL-36105 grades: use consistent icon classs

9 years agoMDL-35583 - blocks header and footer right align fixes, profile picture right align...
Nadav Kavalerchik [Wed, 17 Oct 2012 17:34:16 +0000 (19:34 +0200)]
MDL-35583 - blocks header and footer right align fixes, profile picture right align (update)

9 years agoMDL-36101 auth_shibboleth Show appropriate error message for suspended accounts
Michael Aherne [Wed, 17 Oct 2012 11:37:43 +0000 (12:37 +0100)]
MDL-36101 auth_shibboleth Show appropriate error message for suspended accounts

9 years agoMDL-36099 AJAX Ensure that a galleryversion is always set for yui_module calls
Andrew Robert Nicols [Wed, 17 Oct 2012 09:14:56 +0000 (10:14 +0100)]
MDL-36099 AJAX Ensure that a galleryversion is always set for yui_module calls

9 years agoMDL-36076 qtype multichoice: validation fails on '0' answer.
Tim Hunt [Wed, 17 Oct 2012 05:54:45 +0000 (13:54 +0800)]
MDL-36076 qtype multichoice: validation fails on '0' answer.

9 years agoMDL-31683 mod_assign: Fixed up whitespace and cap check changes as required
Sam Hemelryk [Wed, 17 Oct 2012 03:17:53 +0000 (11:17 +0800)]
MDL-31683 mod_assign: Fixed up whitespace and cap check changes as required

9 years agoMerge branch 'MDL-31683' of git://github.com/Lightwork-Marking/moodle
Sam Hemelryk [Wed, 17 Oct 2012 02:57:36 +0000 (10:57 +0800)]
Merge branch 'MDL-31683' of git://github.com/Lightwork-Marking/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Wed, 17 Oct 2012 00:34:37 +0000 (00:34 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'WIP-MDL-35583' of git://github.com/nadavkav/moodle
Aparup Banerjee [Wed, 17 Oct 2012 00:25:27 +0000 (08:25 +0800)]
Merge branch 'WIP-MDL-35583' of git://github.com/nadavkav/moodle

9 years agoMDL-31683 added mod_assign_get_assignments web service function
Paul Charsley [Wed, 17 Oct 2012 00:21:44 +0000 (13:21 +1300)]
MDL-31683 added mod_assign_get_assignments web service function

9 years agoMDL-36075 Forms: Date selector in forms errors in IE7
Jason Platts [Tue, 16 Oct 2012 11:06:03 +0000 (12:06 +0100)]
MDL-36075 Forms: Date selector in forms errors in IE7

9 years agoMerge branch 'MDL-35412-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 16 Oct 2012 09:41:49 +0000 (17:41 +0800)]
Merge branch 'MDL-35412-master' of git://github.com/FMCorz/moodle

9 years agoMDL-35412 phpunit: date_format_string() is case insensitive
Frederic Massart [Tue, 16 Oct 2012 09:21:11 +0000 (17:21 +0800)]
MDL-35412 phpunit: date_format_string() is case insensitive

9 years agoMerge branch 'wip-mdl-30691' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 16 Oct 2012 08:27:37 +0000 (16:27 +0800)]
Merge branch 'wip-mdl-30691' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-34228 - version.php bump for new capability
Dan Poltawski [Tue, 16 Oct 2012 08:20:43 +0000 (16:20 +0800)]
MDL-34228 - version.php bump for new capability

9 years agoMerge branch 'MDL-34228-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 16 Oct 2012 08:19:25 +0000 (16:19 +0800)]
Merge branch 'MDL-34228-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'wip-mdl-27309' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 16 Oct 2012 06:59:04 +0000 (14:59 +0800)]
Merge branch 'wip-mdl-27309' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'w42_MDL-35904_m24_mainadmin' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 16 Oct 2012 06:50:30 +0000 (14:50 +0800)]
Merge branch 'w42_MDL-35904_m24_mainadmin' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 16 Oct 2012 06:35:28 +0000 (14:35 +0800)]
Merge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-35990 repository: Added MOODLE_INTERNAL check and removed config inclusion
Frederic Massart [Tue, 16 Oct 2012 06:01:29 +0000 (14:01 +0800)]
MDL-35990 repository: Added MOODLE_INTERNAL check and removed config inclusion

9 years agoMDL-35990 Repository Library should not include the main config.php file
Matteo Scaramuccia [Thu, 11 Oct 2012 20:34:30 +0000 (22:34 +0200)]
MDL-35990 Repository Library should not include the main config.php file

9 years agoMerge branch 'MDL-34367_message_lib' of git://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 16 Oct 2012 05:47:46 +0000 (13:47 +0800)]
Merge branch 'MDL-34367_message_lib' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-35769-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 16 Oct 2012 05:41:17 +0000 (13:41 +0800)]
Merge branch 'wip-MDL-35769-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-33857 fixed up whitespace
Sam Hemelryk [Tue, 16 Oct 2012 05:32:34 +0000 (13:32 +0800)]
MDL-33857 fixed up whitespace

9 years agoMerge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 16 Oct 2012 05:31:44 +0000 (13:31 +0800)]
Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-35880 user: Adding a heading to profile edit page
Ankit Agarwal [Tue, 16 Oct 2012 05:16:41 +0000 (13:16 +0800)]
MDL-35880 user: Adding a heading to profile edit page

9 years agoMDL-35412 core: Moving get_string out of if statement
Frederic Massart [Tue, 16 Oct 2012 03:50:25 +0000 (11:50 +0800)]
MDL-35412 core: Moving get_string out of if statement

9 years agoMDL-35198 cache: Fixed up key_exists call in cache
Sam Hemelryk [Tue, 16 Oct 2012 03:25:02 +0000 (11:25 +0800)]
MDL-35198 cache: Fixed up key_exists call in cache

9 years agoMerge branch 'MDL-35198' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)]
Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-32148-master' of git://github.com/StudiUM/moodle
Sam Hemelryk [Tue, 16 Oct 2012 03:16:33 +0000 (11:16 +0800)]
Merge branch 'MDL-32148-master' of git://github.com/StudiUM/moodle

9 years agoMerge branch 'MDL-33815' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 16 Oct 2012 03:08:58 +0000 (11:08 +0800)]
Merge branch 'MDL-33815' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'wip-MDL-35850-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Tue, 16 Oct 2012 03:08:01 +0000 (11:08 +0800)]
Merge branch 'wip-MDL-35850-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'WIP-MDL-35563-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Tue, 16 Oct 2012 02:54:29 +0000 (10:54 +0800)]
Merge branch 'WIP-MDL-35563-master' of git://github.com/nadavkav/moodle

9 years agoMerge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle
Dan Poltawski [Tue, 16 Oct 2012 02:48:23 +0000 (10:48 +0800)]
Merge branch 'wip-MDL-32184-master' of github.com/phalacee/moodle

9 years agoMerge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Tue, 16 Oct 2012 02:46:11 +0000 (10:46 +0800)]
Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle

Conflicts:
version.php

9 years agoMerge branch 'MDL-35664-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 16 Oct 2012 02:42:51 +0000 (10:42 +0800)]
Merge branch 'MDL-35664-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-32294-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 16 Oct 2012 02:41:24 +0000 (10:41 +0800)]
Merge branch 'MDL-32294-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-32092' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 16 Oct 2012 02:37:52 +0000 (10:37 +0800)]
Merge branch 'MDL-32092' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-35892-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 16 Oct 2012 02:31:56 +0000 (10:31 +0800)]
Merge branch 'MDL-35892-master' of git://github.com/FMCorz/moodle

9 years agoMDL-21801 - mod_lesson: version bump
Dan Poltawski [Tue, 16 Oct 2012 02:26:53 +0000 (10:26 +0800)]
MDL-21801 - mod_lesson: version bump

To reflect the new (ppt-less) state

9 years agoMerge branch 'MDL-21801_b' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 16 Oct 2012 02:29:49 +0000 (10:29 +0800)]
Merge branch 'MDL-21801_b' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-35726' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Tue, 16 Oct 2012 02:16:26 +0000 (10:16 +0800)]
Merge branch 'MDL-35726' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 16 Oct 2012 02:11:04 +0000 (10:11 +0800)]
Merge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle