Dan Poltawski [Mon, 8 Jul 2013 03:39:21 +0000 (11:39 +0800)]
MDL-40536 course: unit tests for course_external::import_course
Basic import operations and a specific test case which identifies
a bug.
Damyon Wiese [Fri, 12 Jul 2013 01:46:52 +0000 (09:46 +0800)]
weekly release 2.6dev
Damyon Wiese [Fri, 12 Jul 2013 01:41:55 +0000 (09:41 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
AMOS bot [Fri, 12 Jul 2013 00:45:55 +0000 (00:45 +0000)]
Automatically generated installer lang files
David Monllao [Thu, 11 Jul 2013 07:36:32 +0000 (09:36 +0200)]
MDL-39815 mod_glossary: Fixing behat test
Frederic Massart [Thu, 11 Jul 2013 01:57:06 +0000 (09:57 +0800)]
MDL-40369 theme: Renaming Afterburner i/roles to i/assignroles
Marina Glancy [Thu, 11 Jul 2013 04:47:58 +0000 (14:47 +1000)]
MDL-37565 fixed PDW plugin to calculate number of button rows
Marina Glancy [Wed, 10 Jul 2013 10:16:21 +0000 (20:16 +1000)]
Merge branch 'wip-MDL-31776-master-alternatenamesfix' of git://github.com/abgreeve/moodle
Adrian Greeve [Wed, 10 Jul 2013 09:41:06 +0000 (17:41 +0800)]
MDL-31776 - lib: Alternate name fields - update of gradebook sql query.
Rajesh Taneja [Wed, 10 Jul 2013 07:30:47 +0000 (15:30 +0800)]
MDL-40358 Enrolments: Fixed sql when user is suspended
Adrian Greeve [Wed, 10 Jul 2013 07:28:08 +0000 (15:28 +0800)]
MDL-31776 - lib: Alternate name fields - fixed up user object in question code.
Adrian Greeve [Wed, 10 Jul 2013 01:54:38 +0000 (09:54 +0800)]
MDL-31776 - lib: mod/forums - Fixed discussion sql query.
Marina Glancy [Wed, 10 Jul 2013 06:22:38 +0000 (16:22 +1000)]
Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 10 Jul 2013 05:46:25 +0000 (13:46 +0800)]
MDL-38366 repository_filesystem: Prevent use of empty subdir
Frederic Massart [Tue, 9 Jul 2013 08:57:37 +0000 (16:57 +0800)]
MDL-38366 repository: get_option() returns proper values
Previously, even when a specific setting had to be returned, this method
would return an empty array. Now, the behaviour is the same whether
some options or none are set: if the requested setting is not found
null is returned.
Sam Hemelryk [Wed, 10 Jul 2013 04:23:46 +0000 (16:23 +1200)]
MDL-40368 tool_capability: fixed regression marking single result selected
Jamie Pratt [Tue, 2 Jul 2013 13:07:23 +0000 (20:07 +0700)]
MDL-40449 use data generator to create random qs
Marina Glancy [Wed, 10 Jul 2013 03:15:37 +0000 (13:15 +1000)]
Merge branch 'MDL-40354-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 10 Jul 2013 02:49:11 +0000 (10:49 +0800)]
MDL-40354 groups: Fix issues in groups_group_visible()
Ankit Agarwal [Tue, 2 Jul 2013 03:57:17 +0000 (11:57 +0800)]
MDL-40354 groups:groups_get_activity_allowed_groups() should use passed userid to check capabilities
Ankit Agarwal [Tue, 2 Jul 2013 04:06:41 +0000 (12:06 +0800)]
MDL-40354 groups: Add new api groups_group_visible()
Ankit Agarwal [Tue, 2 Jul 2013 05:47:32 +0000 (13:47 +0800)]
MDL-40354 groups: Add unit tests for the api groups_group_visible()
Marina Glancy [Wed, 10 Jul 2013 01:58:44 +0000 (11:58 +1000)]
Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle
Raymond Wijaya [Fri, 7 Jun 2013 05:32:47 +0000 (15:02 +0930)]
MDL-40093: mod/assign: Remove count of drafts in offline assignment's grading summary screen
Marina Glancy [Wed, 10 Jul 2013 01:08:49 +0000 (11:08 +1000)]
Merge branch 'w28_MDL-40488_m26_admin' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 10 Jul 2013 00:19:05 +0000 (12:19 +1200)]
Merge branch 'wip-MDL-40593-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 10 Jul 2013 00:02:04 +0000 (10:02 +1000)]
Merge branch 'MDL-40441' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 9 Jul 2013 23:58:09 +0000 (09:58 +1000)]
Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 9 Jul 2013 23:07:00 +0000 (11:07 +1200)]
Merge branch 'master_MDL-20867' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 9 Jul 2013 23:02:21 +0000 (11:02 +1200)]
Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:43:28 +0000 (10:43 +1200)]
Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:35:18 +0000 (10:35 +1200)]
Merge branch 'MDL-39815' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:31:39 +0000 (10:31 +1200)]
Merge branch 'MDL-40527' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:19:13 +0000 (10:19 +1200)]
Merge branch 'MDL-40466-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:12:44 +0000 (10:12 +1200)]
Merge branch 'MDL-40516-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:10:11 +0000 (10:10 +1200)]
Merge branch 'master_MDL-40512' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 9 Jul 2013 22:07:10 +0000 (10:07 +1200)]
MDL-40358 enrol: whitespace clean up
Sam Hemelryk [Tue, 9 Jul 2013 21:54:38 +0000 (09:54 +1200)]
Merge branch 'wip-mdl-40358' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 9 Jul 2013 21:51:15 +0000 (09:51 +1200)]
Merge branch 'MDL-40496-master' of git://github.com/danpoltawski/moodle
Conflicts:
lib/deprecatedlib.php
Damyon Wiese [Tue, 9 Jul 2013 14:43:54 +0000 (22:43 +0800)]
Merge branch 'MDL-39420' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 9 Jul 2013 14:28:51 +0000 (22:28 +0800)]
Merge branch 'MDL-36479' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 9 Jul 2013 13:51:41 +0000 (21:51 +0800)]
Merge branch 'MDL-40392' of git://github.com/stronk7/moodle
Marina Glancy [Tue, 9 Jul 2013 12:24:02 +0000 (22:24 +1000)]
MDL-40593 fixed SQL query to be postgres-compartible
Marina Glancy [Tue, 9 Jul 2013 12:01:49 +0000 (22:01 +1000)]
MDL-40472 fixed missing semicolon
Marina Glancy [Tue, 9 Jul 2013 11:34:49 +0000 (21:34 +1000)]
Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle
Tim Hunt [Tue, 2 Jul 2013 15:44:31 +0000 (16:44 +0100)]
MDL-39420 multichoice: fix layout of multi-line choices.
Tim Hunt [Tue, 2 Jul 2013 10:08:55 +0000 (11:08 +0100)]
MDL-40441 fix obscure notice in the quiz.
This can only happen if you have both a user with both a real attempt
and a preview, and then edit the quiz settings.
Also clean up this code a bit.
Dan Poltawski [Tue, 9 Jul 2013 08:57:07 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 9 Jul 2013 08:52:52 +0000 (16:52 +0800)]
Merge branch 'wip-MDL-40429-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 9 Jul 2013 08:42:18 +0000 (16:42 +0800)]
Merge branch 'MDL-40425-master' of git://github.com/ankitagarwal/moodle
Adrian Greeve [Fri, 5 Jul 2013 03:23:44 +0000 (11:23 +0800)]
MDL-40430 - Libraries: Deprecate print_context_name().
Adrian Greeve [Fri, 5 Jul 2013 02:07:02 +0000 (10:07 +0800)]
MDL-40429 - Libraries: Deprecate get_contextlevel_name().
Marina Glancy [Tue, 9 Jul 2013 08:06:33 +0000 (18:06 +1000)]
Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 9 Jul 2013 08:05:02 +0000 (16:05 +0800)]
Merge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 9 Jul 2013 08:00:12 +0000 (16:00 +0800)]
Merge branch 'wip-mdl-40427' of git://github.com/rajeshtaneja/moodle
Ankit Agarwal [Fri, 5 Jul 2013 03:48:36 +0000 (11:48 +0800)]
MDL-40425 libraries: Remove context_instance_preload() from core
Ankit Agarwal [Fri, 5 Jul 2013 03:19:46 +0000 (11:19 +0800)]
MDL-40425 libraries: Deprecate context_instance_preload()
Dan Poltawski [Tue, 9 Jul 2013 07:55:20 +0000 (15:55 +0800)]
Merge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle
(moved a deprecation warning around to try and avoid more conflicts in
upgrade.txt)
Conflicts:
lib/upgrade.txt
Rajesh Taneja [Fri, 5 Jul 2013 03:27:23 +0000 (11:27 +0800)]
MDL-40427 Libraries: Deprecated context_moved in favor of context::update_moved()
Dan Poltawski [Tue, 9 Jul 2013 07:49:45 +0000 (15:49 +0800)]
Merge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/upgrade.txt
Dan Poltawski [Tue, 9 Jul 2013 07:47:07 +0000 (15:47 +0800)]
Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/upgrade.txt
Rajesh Taneja [Fri, 5 Jul 2013 00:56:00 +0000 (08:56 +0800)]
MDL-40407 Libraries: deprecated preload_course_contexts
Dan Poltawski [Tue, 9 Jul 2013 07:43:43 +0000 (15:43 +0800)]
Merge branch 'wip-mdl-40404' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/upgrade.txt
Frederic Massart [Thu, 4 Jul 2013 06:06:00 +0000 (14:06 +0800)]
MDL-40406 libraries: Deprecate rebuild_contexts()
Frederic Massart [Thu, 4 Jul 2013 05:55:27 +0000 (13:55 +0800)]
MDL-40406 libraries: Deprecate build_context_path()
Frederic Massart [Thu, 4 Jul 2013 05:51:39 +0000 (13:51 +0800)]
MDL-40406 libraries: Deprecate cleanup_contexts()
Frederic Massart [Thu, 4 Jul 2013 05:42:54 +0000 (13:42 +0800)]
MDL-40406 libraries: Deprecate create_contexts()
Frederic Massart [Thu, 4 Jul 2013 03:52:03 +0000 (11:52 +0800)]
MDL-40405 libraries: Deprecate get_child_contexts()
Damyon Wiese [Tue, 9 Jul 2013 07:28:31 +0000 (15:28 +0800)]
Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 9 Jul 2013 07:20:07 +0000 (15:20 +0800)]
Merge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 9 Jul 2013 07:15:47 +0000 (15:15 +0800)]
Merge branch 'MDL-40443' of git://github.com/timhunt/moodle
Jamie Pratt [Mon, 24 Jun 2013 07:06:01 +0000 (14:06 +0700)]
MDL-40171 question saving test
Jamie Pratt [Thu, 20 Jun 2013 06:18:42 +0000 (13:18 +0700)]
MDL-40176 mock_submit method for testing
Rajesh Taneja [Fri, 5 Jul 2013 04:40:03 +0000 (12:40 +0800)]
MDL-40404 Libraries: Moved DEVELOPER_DEBUG outside loop
Rajesh Taneja [Thu, 4 Jul 2013 04:59:06 +0000 (12:59 +0800)]
MDL-40404 Libraries: Deprecated get_parent_contextid()
Marina Glancy [Tue, 9 Jul 2013 06:32:16 +0000 (16:32 +1000)]
Merge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle
Andrew Davis [Tue, 16 Apr 2013 08:56:22 +0000 (16:56 +0800)]
MDL-34454 core_message: removed a deprecated function
Conflicts:
lib/deprecatedlib.php
Rajesh Taneja [Tue, 9 Jul 2013 06:08:46 +0000 (14:08 +0800)]
MDL-40218 Assignment: updated upgrade.txt and version number
Rajesh Taneja [Wed, 3 Jul 2013 06:40:36 +0000 (14:40 +0800)]
MDL-40218 Assignment: Added lazy loading for showactiveenrol option and supended users
Marina Glancy [Tue, 9 Jul 2013 05:55:51 +0000 (15:55 +1000)]
Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 9 Jul 2013 05:54:45 +0000 (15:54 +1000)]
Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 9 Jul 2013 05:44:01 +0000 (13:44 +0800)]
Merge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 9 Jul 2013 05:38:10 +0000 (13:38 +0800)]
Merge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle
Frederic Massart [Thu, 4 Jul 2013 03:11:23 +0000 (11:11 +0800)]
MDL-40403 tests: Fix pointless assertion
Frederic Massart [Thu, 4 Jul 2013 03:07:12 +0000 (11:07 +0800)]
MDL-40403 libraries: Deprecate get_parent_contexts()
Damyon Wiese [Tue, 9 Jul 2013 05:33:42 +0000 (13:33 +0800)]
Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle
Rajesh Taneja [Fri, 21 Jun 2013 08:30:07 +0000 (16:30 +0800)]
MDL-40218 Assignment: Added unit test to check suspended users
Rajesh Taneja [Fri, 21 Jun 2013 08:30:57 +0000 (16:30 +0800)]
MDL-40218 Assignment: User should not be able to view submissions, whithout proper permissions
Rajesh Taneja [Thu, 20 Jun 2013 07:54:15 +0000 (15:54 +0800)]
MDL-40218 Assignment: Participants/submission/grade count only include active users
Rajesh Taneja [Thu, 20 Jun 2013 07:15:47 +0000 (15:15 +0800)]
MDL-40218 Assignment: Show suspended user, similar to the way they are shown in grader report
Rajesh Taneja [Tue, 18 Jun 2013 09:07:44 +0000 (17:07 +0800)]
MDL-40218 Assignment: Added show/hide suspended users functionality
Damyon Wiese [Tue, 9 Jul 2013 05:26:49 +0000 (13:26 +0800)]
Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle
Damyon Wiese [Tue, 9 Jul 2013 05:02:04 +0000 (13:02 +0800)]
MDL-23646: Tinymce wrap plugin fixes.
Added info to upgrade.txt
Removed wrap plugins from the tinymce plugin list.
Fix trailing comma in wrap plugin javascript.
Removed non functioning "!" handling.
Fixed icons for wrap plugin.
Damyon Wiese [Fri, 5 Jul 2013 05:54:38 +0000 (13:54 +0800)]
MDL-23646 tinymce: Fix for pdw plugin
This plugin was changing the display of the toolbar tables from "display: table"
to "display: block" when hiding/unhiding the toolbars.
This broke the wrapping plugin.
Damyon Wiese [Fri, 5 Jul 2013 05:52:59 +0000 (13:52 +0800)]
MDL-23646 tinymce: Add upgrade algorithm for custom toolbars.
Damyon Wiese [Fri, 5 Jul 2013 04:04:42 +0000 (12:04 +0800)]
MDL-23646 tinymce: Add plugin to wrap toolbar on small screens
Jason Fowler [Fri, 14 Jun 2013 05:52:51 +0000 (13:52 +0800)]
MDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance of the editor
Damyon Wiese [Tue, 9 Jul 2013 04:34:31 +0000 (12:34 +0800)]
Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle
Jamie Pratt [Tue, 2 Jul 2013 05:43:14 +0000 (12:43 +0700)]
MDL-40388 Reset globals after each unit test
Tony Levi [Thu, 6 Jun 2013 04:41:19 +0000 (14:11 +0930)]
MDL-40035: Avoid rebuild_course_cache always for empty course
