moodle.git
9 years agoMerge branch 'MDL-33105' of https://github.com/ppichet/moodle
Dan Poltawski [Tue, 18 Jun 2013 02:35:47 +0000 (10:35 +0800)]
Merge branch 'MDL-33105' of https://github.com/ppichet/moodle

9 years agoMerge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 18 Jun 2013 02:29:08 +0000 (14:29 +1200)]
Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle

Conflicts:
admin/cli/install.php

9 years agoMerge branch 'MDL-17468-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 18 Jun 2013 02:06:33 +0000 (14:06 +1200)]
Merge branch 'MDL-17468-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-40036-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 18 Jun 2013 02:01:54 +0000 (14:01 +1200)]
Merge branch 'MDL-40036-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-39865-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 18 Jun 2013 01:54:39 +0000 (13:54 +1200)]
Merge branch 'MDL-39865-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-38079_master' of git://github.com/mr-russ/moodle
Marina Glancy [Tue, 18 Jun 2013 01:18:30 +0000 (11:18 +1000)]
Merge branch 'MDL-38079_master' of git://github.com/mr-russ/moodle

9 years agoMDL-40137 Whitespace fix
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 23:47:13 +0000 (01:47 +0200)]
MDL-40137 Whitespace fix

9 years agoMerge branch 'wip-MDL-40137-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 23:43:57 +0000 (01:43 +0200)]
Merge branch 'wip-MDL-40137-m26' of git://github.com/samhemelryk/moodle

9 years agoMDL-40022 badges: Fix missing calls to setType in course criteria settings
Yuliya Bozhko [Wed, 12 Jun 2013 04:48:23 +0000 (16:48 +1200)]
MDL-40022 badges: Fix missing calls to setType in course criteria settings

9 years agoMerge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 17 Jun 2013 23:38:05 +0000 (11:38 +1200)]
Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle

9 years agoMDL-40103 doc create_temptable_from_real_table() deletion.
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 23:35:11 +0000 (01:35 +0200)]
MDL-40103 doc create_temptable_from_real_table() deletion.

9 years agoMDL-40103 Fix wrong call, causing restore to fail.
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 23:24:20 +0000 (01:24 +0200)]
MDL-40103 Fix wrong call, causing restore to fail.

9 years agoMDL-40103 Bump version & whitespace/punctuation
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 23:14:40 +0000 (01:14 +0200)]
MDL-40103 Bump version & whitespace/punctuation

9 years agoMerge branch 'MDL-40103_temptable' of https://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 23:30:07 +0000 (01:30 +0200)]
Merge branch 'MDL-40103_temptable' of https://github.com/mr-russ/moodle

Conflicts:
lib/db/upgrade.php

9 years agoMerge branch 'MDL-32253-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 17 Jun 2013 23:26:23 +0000 (11:26 +1200)]
Merge branch 'MDL-32253-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'wip-MDL-26998-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 17 Jun 2013 23:22:40 +0000 (11:22 +1200)]
Merge branch 'wip-MDL-26998-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'wip-mdl-39863' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 17 Jun 2013 23:19:35 +0000 (11:19 +1200)]
Merge branch 'wip-mdl-39863' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-40109_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 17 Jun 2013 23:08:45 +0000 (11:08 +1200)]
Merge branch 'MDL-40109_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-39626_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 17 Jun 2013 23:03:21 +0000 (11:03 +1200)]
Merge branch 'MDL-39626_master' of git://github.com/kordan/moodle

Conflicts:
theme/formal_white/style/course.css

9 years agoMerge branch 'w25_MDL-40210_m26_badgescaps' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 22:55:53 +0000 (00:55 +0200)]
Merge branch 'w25_MDL-40210_m26_badgescaps' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-33562-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 22:40:36 +0000 (00:40 +0200)]
Merge branch 'MDL-33562-master' of git://github.com/danpoltawski/moodle

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

9 years agoMerge branch 'MDL-30132_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Jun 2013 22:27:11 +0000 (10:27 +1200)]
Merge branch 'MDL-30132_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'wip-mdl-16982' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 17 Jun 2013 22:04:18 +0000 (10:04 +1200)]
Merge branch 'wip-mdl-16982' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-40210 do not use CAP_PREVENT for role defaults!
Petr Škoda [Mon, 17 Jun 2013 10:12:36 +0000 (12:12 +0200)]
MDL-40210 do not use CAP_PREVENT for role defaults!

9 years agoMDL-38079 mod_feedback - Hide "add question to activity" button
Russell Smith [Mon, 17 Jun 2013 09:50:13 +0000 (19:50 +1000)]
MDL-38079 mod_feedback - Hide "add question to activity" button

9 years agoMerge branch 'MDL-40110_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 17 Jun 2013 09:02:11 +0000 (17:02 +0800)]
Merge branch 'MDL-40110_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges
Dan Poltawski [Mon, 17 Jun 2013 08:40:24 +0000 (16:40 +0800)]
Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges

9 years agoMerge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 17 Jun 2013 07:36:15 +0000 (15:36 +0800)]
Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-31680' of https://github.com/ppichet/moodle
Dan Poltawski [Mon, 17 Jun 2013 06:53:19 +0000 (14:53 +0800)]
Merge branch 'MDL-31680' of https://github.com/ppichet/moodle

9 years agoMerge branch 'wip-MDL-40136-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 17 Jun 2013 05:37:18 +0000 (13:37 +0800)]
Merge branch 'wip-MDL-40136-m26' of git://github.com/samhemelryk/moodle

9 years agoMDL-16982 Administration: Moved bulk action outside loop and using profile api to...
Rajesh Taneja [Tue, 11 Jun 2013 02:58:52 +0000 (10:58 +0800)]
MDL-16982 Administration: Moved bulk action outside loop and using profile api to save data

9 years agoMerge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com...
Sam Hemelryk [Mon, 17 Jun 2013 04:14:00 +0000 (16:14 +1200)]
Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle

9 years agoMerge branch 'MDL-21933_master' of https://github.com/mr-russ/moodle
Sam Hemelryk [Mon, 17 Jun 2013 03:45:56 +0000 (15:45 +1200)]
Merge branch 'MDL-21933_master' of https://github.com/mr-russ/moodle

9 years agoMerge branch 'wip-MDL-40091-master' of git://github.com/satrun77/moodle
Sam Hemelryk [Mon, 17 Jun 2013 03:43:31 +0000 (15:43 +1200)]
Merge branch 'wip-MDL-40091-master' of git://github.com/satrun77/moodle

9 years agoMerge branch 'MDL-39369' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 17 Jun 2013 03:10:41 +0000 (15:10 +1200)]
Merge branch 'MDL-39369' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 17 Jun 2013 02:30:24 +0000 (14:30 +1200)]
Merge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle

9 years agoMerge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 17 Jun 2013 00:43:29 +0000 (10:43 +1000)]
Merge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle

9 years agoMDL-39949 dock: fixed whitespace
Sam Hemelryk [Sun, 16 Jun 2013 22:24:39 +0000 (10:24 +1200)]
MDL-39949 dock: fixed whitespace

9 years agoMerge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 16 Jun 2013 22:01:10 +0000 (10:01 +1200)]
Merge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle

9 years agoMDL-40137 theme_clean: corrected lib.php function names
Sam Hemelryk [Wed, 12 Jun 2013 01:01:26 +0000 (13:01 +1200)]
MDL-40137 theme_clean: corrected lib.php function names

9 years agoMDL-40136 cache: fixed dirroot change bugs with plugin caches
Sam Hemelryk [Wed, 12 Jun 2013 02:14:24 +0000 (14:14 +1200)]
MDL-40136 cache: fixed dirroot change bugs with plugin caches

9 years agoMDL-40142 navigation: fixed chainable issue with navigation JS
Sam Hemelryk [Wed, 12 Jun 2013 04:23:13 +0000 (16:23 +1200)]
MDL-40142 navigation: fixed chainable issue with navigation JS

9 years agoMDL-26455 add support for custom DB port and socket in CLI installer
Petr Škoda [Sat, 15 Jun 2013 13:07:28 +0000 (15:07 +0200)]
MDL-26455 add support for custom DB port and socket in CLI installer

9 years agoMDL-26455 add custom DB port and socket to web installer
Petr Škoda [Sat, 15 Jun 2013 12:35:02 +0000 (14:35 +0200)]
MDL-26455 add custom DB port and socket to web installer

9 years agoMDL-40103 Backup: Move install.xml templates to inline XML
Russell Smith [Tue, 11 Jun 2013 10:56:06 +0000 (20:56 +1000)]
MDL-40103 Backup: Move install.xml templates to inline XML

9 years agoMDL-40103 stats: Move db temp templates to inline xmldb tables
Russell Smith [Tue, 11 Jun 2013 09:06:15 +0000 (19:06 +1000)]
MDL-40103 stats: Move db temp templates to inline xmldb tables

Move all statistics temporary tables into the code.  We are not
going to continue to use database templates.  They were a mix
of reading the install.xml and tables in the database.  It is
much clearer to have them created inline at the point they are
used in the code.

9 years agoMDL-40091 book: revision must be incremented after editing a chapter
Mohamed Alsharaf [Tue, 11 Jun 2013 23:54:42 +0000 (11:54 +1200)]
MDL-40091 book: revision must be incremented after editing a chapter

9 years agoMDL-17468 tool_uploaduser: seperate capability for user pictures
Dan Poltawski [Fri, 7 Jun 2013 04:03:24 +0000 (12:03 +0800)]
MDL-17468 tool_uploaduser: seperate capability for user pictures

9 years agoweekly release 2.6dev
Marina Glancy [Fri, 14 Jun 2013 03:18:50 +0000 (13:18 +1000)]
weekly release 2.6dev

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Marina Glancy [Fri, 14 Jun 2013 02:53:23 +0000 (12:53 +1000)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMDL-39369: Lesson module: change settype PARAM_TEXT to PARAM_NOTAGS
Rossiani Wijaya [Thu, 13 Jun 2013 07:34:18 +0000 (15:34 +0800)]
MDL-39369: Lesson module: change settype PARAM_TEXT to PARAM_NOTAGS

9 years agoMDL-39369: Lesson module: fix setType() properly
Rossiani Wijaya [Mon, 13 May 2013 08:11:40 +0000 (16:11 +0800)]
MDL-39369: Lesson module: fix setType() properly

9 years agoMDL-37621 assign: Fix for DB error on update.
Damyon Wiese [Wed, 12 Jun 2013 15:09:59 +0000 (23:09 +0800)]
MDL-37621 assign: Fix for DB error on update.

This properly handles the case when the teamsubmissiongroupingid is disabled.

9 years agoMDL-39824: theme_bootstrap: initalise array before use
Dan Poltawski [Thu, 13 Jun 2013 06:22:59 +0000 (14:22 +0800)]
MDL-39824: theme_bootstrap: initalise array before use

This causes warnings when no navigation items are returned.

Also fixed some bad whitespace.

9 years agoRevert "MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf...
Dan Poltawski [Thu, 13 Jun 2013 05:56:11 +0000 (13:56 +0800)]
Revert "MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1"

This reverts commit 3960c00e3cf129c60b01fecdfe2851ba9ef7ba59.

9 years agoRevert "MDL-39832 Files: Fixed ETag format according with RFC2616."
Dan Poltawski [Thu, 13 Jun 2013 05:56:09 +0000 (13:56 +0800)]
Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."

This reverts commit 9ab37ae3e07f54bc08644f8462d94bed68ff6c9b.

9 years agoMDL-37459 admin: Set the default setting flags on a new install.
Damyon Wiese [Thu, 13 Jun 2013 04:46:45 +0000 (12:46 +0800)]
MDL-37459 admin: Set the default setting flags on a new install.

Make sure the default flags for all settings are saved on a new install.

9 years agoMDL-21933 course: Allow users to search participants course permission
Russell Smith [Thu, 13 Jun 2013 00:25:44 +0000 (10:25 +1000)]
MDL-21933 course: Allow users to search participants course permission

Capability checks are performed at the top of the page and do not need
to be completed again.

Search is an expected feature for users and it was confusion to only
appear after 3 pages.  This has been changed to enable search when
there are more records than are visible on the screen.  If users
are unable to use browser search, they will be able to use Moodle's
search.

9 years agoMerge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 13 Jun 2013 02:15:25 +0000 (10:15 +0800)]
Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

9 years agoMDL-37459 admin: Fix for error on updating a locked checkbox
Damyon Wiese [Wed, 12 Jun 2013 15:03:43 +0000 (23:03 +0800)]
MDL-37459 admin: Fix for error on updating a locked checkbox

Changed the way apply_admin_locked_flags gets the current value for the field.

The old way was plain wrong (looking at getValue from the quickform element).

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 13 Jun 2013 00:41:25 +0000 (00:41 +0000)]
Automatically generated installer lang files

9 years agoMDL-38555 forms: Prevent same data submission multiple times.
Ruslan Kabalin [Tue, 19 Mar 2013 15:09:50 +0000 (15:09 +0000)]
MDL-38555 forms: Prevent same data submission multiple times.

This disables Submit button when the form has been submitted to
prevent consequent submissions before the page has been loaded.

9 years agoMDL-30312 User: Changed page layout from mydashboard to mypublic in user/profile.php
Mary Evans [Wed, 12 Jun 2013 12:29:45 +0000 (13:29 +0100)]
MDL-30312 User: Changed page layout from mydashboard to mypublic in user/profile.php

9 years agoMDL-38359: assign - prevent loss of associated marker
Dan Marsden [Wed, 12 Jun 2013 09:29:39 +0000 (21:29 +1200)]
MDL-38359: assign - prevent loss of associated marker

certain markers don't see the marker allocation column.

9 years agoMDL-38359: assign - fix some issues with releasing grades
Dan Marsden [Wed, 12 Jun 2013 09:16:12 +0000 (21:16 +1200)]
MDL-38359: assign - fix some issues with releasing grades

9 years agoMerge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 12 Jun 2013 08:49:29 +0000 (16:49 +0800)]
Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 12 Jun 2013 08:47:38 +0000 (16:47 +0800)]
Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

9 years agoMDL-38359: assign - remove some old debug code.
Dan Marsden [Wed, 12 Jun 2013 08:18:07 +0000 (20:18 +1200)]
MDL-38359: assign - remove some old debug code.

9 years agoRevert "MDL-39489 behat: Updating to 2.6 moodlehq/behat-extension tag"
Dan Poltawski [Wed, 12 Jun 2013 08:08:50 +0000 (16:08 +0800)]
Revert "MDL-39489 behat: Updating to 2.6 moodlehq/behat-extension tag"

Wasn't ready for the prime time

This reverts commit ca96789d77b34bd733e6c491ba79e3ab21d7e86f.

9 years agoMerge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle
Marina Glancy [Wed, 12 Jun 2013 07:22:22 +0000 (17:22 +1000)]
Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle

9 years agoMerge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle
Marina Glancy [Wed, 12 Jun 2013 06:53:49 +0000 (16:53 +1000)]
Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle

9 years agoMDL-37621 assign: Improvements to default settings.
Damyon Wiese [Wed, 12 Jun 2013 05:45:48 +0000 (13:45 +0800)]
MDL-37621 assign: Improvements to default settings.

Added a new adminsetting_configempty type so that module settings
which can have no sensible defaults can still be configured as advanced.

9 years agoMDL-37621 assign: Improvements to assignment default settings.
Damyon Wiese [Wed, 12 Jun 2013 05:05:56 +0000 (13:05 +0800)]
MDL-37621 assign: Improvements to assignment default settings.

Remove locked flag from datetime settings.
Change requiresubmissionstatement to use the new admin flags instead of it's previous custom behaviour.
This means there is a language change:

AMOS BEGIN
 CPY [requiresubmissionstatementassignment_help,mod_assign],[requiresubmissionstatement_help,mod_assign]
AMOS END

9 years agoMDL-37459 admin: Code improvements for admin defaults.
Damyon Wiese [Wed, 12 Jun 2013 06:10:55 +0000 (14:10 +0800)]
MDL-37459 admin: Code improvements for admin defaults.

Split apply_admin_defaults_after_data so the defaults are set before
set_data is called.

Change function from private to protected.

Change check for if module for is an add or an update.

9 years agoMerge branch 'MDL-39472-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Wed, 12 Jun 2013 05:56:39 +0000 (13:56 +0800)]
Merge branch 'MDL-39472-master' of git://github.com/sammarshallou/moodle

9 years agoMDL-37459 admin: Change the behaviour of locked admin settings.
Damyon Wiese [Wed, 12 Jun 2013 04:28:47 +0000 (12:28 +0800)]
MDL-37459 admin: Change the behaviour of locked admin settings.

Now the defaults for settings will never force changes to the module update
form, and settings will only be locked if their value matches the admin default.

9 years agoMDL-32253 - Adding link to forum discussion on text emails
Daniel Neis Araujo [Thu, 29 Mar 2012 02:22:58 +0000 (23:22 -0300)]
MDL-32253 - Adding link to forum discussion on text emails

9 years agoRevert "MDL-38555 forms: Prevent same data submission multiple times."
Sam Hemelryk [Wed, 12 Jun 2013 02:22:01 +0000 (14:22 +1200)]
Revert "MDL-38555 forms: Prevent same data submission multiple times."

This reverts commit 9f2f313e9f7c88eab154450de394c2451f530f58.

9 years agoMDL-37459 admin: Default styles for flags for admin settings
Damyon Wiese [Wed, 12 Jun 2013 02:06:06 +0000 (10:06 +0800)]
MDL-37459 admin: Default styles for flags for admin settings

9 years agoMerge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 12 Jun 2013 01:33:23 +0000 (09:33 +0800)]
Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMerge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 11 Jun 2013 23:36:40 +0000 (11:36 +1200)]
Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle

9 years agoMerge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 11 Jun 2013 22:21:45 +0000 (10:21 +1200)]
Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 11 Jun 2013 22:14:14 +0000 (10:14 +1200)]
Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle

9 years agoMDL-39629 theme_formal_white: added missing pluginfile func
Sam Hemelryk [Tue, 11 Jun 2013 21:58:55 +0000 (09:58 +1200)]
MDL-39629 theme_formal_white: added missing pluginfile func

9 years agoMerge branch 'MDL-39629_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:48:56 +0000 (09:48 +1200)]
Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle

9 years agoMDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway.
Dan Marsden [Mon, 13 May 2013 22:37:18 +0000 (10:37 +1200)]
MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway.

9 years agoMerge branch 'MDL-30320' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:38:38 +0000 (09:38 +1200)]
Merge branch 'MDL-30320' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)]
Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:08:55 +0000 (09:08 +1200)]
Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-39940-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:07:01 +0000 (09:07 +1200)]
Merge branch 'MDL-39940-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:04:22 +0000 (09:04 +1200)]
Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle

Conflicts:
lib/deprecatedlib.php

9 years agoMerge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:00:24 +0000 (09:00 +1200)]
Merge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Jun 2013 20:54:09 +0000 (08:54 +1200)]
Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Tue, 11 Jun 2013 20:51:59 +0000 (08:51 +1200)]
Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMerge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle
Sam Hemelryk [Tue, 11 Jun 2013 20:48:00 +0000 (08:48 +1200)]
Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMDL-39474 Library: Make a fast way to check developer debug mode
sam marshall [Thu, 2 May 2013 16:23:54 +0000 (17:23 +0100)]
MDL-39474 Library: Make a fast way to check developer debug mode

9 years agoMDL-38109 use always get_plugin_list() to get list of plugins
Petr Škoda [Fri, 7 Jun 2013 15:26:01 +0000 (17:26 +0200)]
MDL-38109 use always get_plugin_list() to get list of plugins

get_list_of_plugins() is NOT intended for real plugins, only plugin like directories.

9 years agoMDL-38359 courselib: Fix unit tests
Damyon Wiese [Tue, 11 Jun 2013 08:20:55 +0000 (16:20 +0800)]
MDL-38359 courselib: Fix unit tests

The courselib tests have hardcoded test data sets for forum and assign
modules that need to be updated every time we add a new feature.

9 years agoMerge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle
Dan Poltawski [Tue, 11 Jun 2013 08:00:18 +0000 (16:00 +0800)]
Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMerge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 11 Jun 2013 07:41:11 +0000 (15:41 +0800)]
Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle