moodle.git
7 years agoMerge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 29 Oct 2013 05:57:51 +0000 (13:57 +0800)]
Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js

7 years agoMerge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIM...
Damyon Wiese [Tue, 29 Oct 2013 05:44:34 +0000 (13:44 +0800)]
Merge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle

7 years agoMerge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak...
Dan Poltawski [Tue, 29 Oct 2013 05:42:56 +0000 (13:42 +0800)]
Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak/moodle

7 years agoMerge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 Oct 2013 05:16:44 +0000 (13:16 +0800)]
Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 Oct 2013 05:09:23 +0000 (13:09 +0800)]
Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 Oct 2013 04:10:44 +0000 (12:10 +0800)]
Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-42282' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 Oct 2013 03:31:32 +0000 (11:31 +0800)]
Merge branch 'wip-mdl-42282' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-42281' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 Oct 2013 03:08:45 +0000 (11:08 +0800)]
Merge branch 'wip-mdl-42281' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-40470 JavaScript: Correct issue when checking select change in Firefox
Andrew Nicols [Tue, 15 Oct 2013 04:12:56 +0000 (12:12 +0800)]
MDL-40470 JavaScript: Correct issue when checking select change in Firefox

7 years agoMDL-39810 Files: IE doesn't recognize JSON MIME Type (RFC4627).
Matteo Scaramuccia [Tue, 11 Jun 2013 18:15:42 +0000 (20:15 +0200)]
MDL-39810 Files: IE doesn't recognize JSON MIME Type (RFC4627).

Affected versions:
- IE 8+, under Compatibility View.

7 years agoMDL-42281 Behat: Automated test for MDLQA-510
Rajesh Taneja [Fri, 18 Oct 2013 04:38:36 +0000 (12:38 +0800)]
MDL-42281 Behat: Automated test for MDLQA-510

MDLQA-510: A teacher can set grade conditions to restrict availability
of an activity

7 years agoMDL-42556 Events: passing modified user info to user_deleted event
Rajesh Taneja [Mon, 28 Oct 2013 03:48:40 +0000 (11:48 +0800)]
MDL-42556 Events: passing modified user info to user_deleted event

Deleting user modifies few fields and leave rest as un-modified
So passing modified data to event, to keep it small

7 years agoMerge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 28 Oct 2013 08:31:17 +0000 (16:31 +0800)]
Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle

7 years agoMDL-42557 Events: added idnumber to course_deleted event data
Rajesh Taneja [Mon, 28 Oct 2013 08:16:25 +0000 (16:16 +0800)]
MDL-42557 Events: added idnumber to course_deleted event data

7 years agoMerge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 28 Oct 2013 07:37:05 +0000 (15:37 +0800)]
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle

Conflicts:
login/change_password.php

7 years agoMerge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 28 Oct 2013 06:53:21 +0000 (14:53 +0800)]
Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-22669 course: Display section number for orphaned activities
Frederic Massart [Mon, 7 Oct 2013 08:13:41 +0000 (16:13 +0800)]
MDL-22669 course: Display section number for orphaned activities

7 years agoMerge branch 'MDL-42285-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 28 Oct 2013 06:15:27 +0000 (14:15 +0800)]
Merge branch 'MDL-42285-master' of git://github.com/phalacee/moodle

7 years agoMerge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle
Marina Glancy [Mon, 28 Oct 2013 05:56:45 +0000 (16:56 +1100)]
Merge branch 'MDL-42028-master-4' of git://github.com/mouneyrac/moodle

7 years agoMDL-42028 EditPDF: replace the loading icon by a progress bar
Jerome Mouneyrac [Mon, 28 Oct 2013 05:48:22 +0000 (13:48 +0800)]
MDL-42028 EditPDF: replace the loading icon by a progress bar

7 years agoMDL-42557 Events: Removed timemodified hack from course_deleted event
Rajesh Taneja [Mon, 28 Oct 2013 04:55:52 +0000 (12:55 +0800)]
MDL-42557 Events: Removed timemodified hack from course_deleted event

7 years agoMerge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 28 Oct 2013 04:39:30 +0000 (12:39 +0800)]
Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-38419' of https://github.com/moodlerooms/moodle
Dan Poltawski [Mon, 28 Oct 2013 04:33:39 +0000 (12:33 +0800)]
Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle

7 years agoMerge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 28 Oct 2013 04:11:34 +0000 (12:11 +0800)]
Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-42538_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 28 Oct 2013 03:35:54 +0000 (11:35 +0800)]
Merge branch 'MDL-42538_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle
Dan Poltawski [Mon, 28 Oct 2013 03:21:26 +0000 (11:21 +0800)]
Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle

7 years agoMerge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 28 Oct 2013 03:10:43 +0000 (11:10 +0800)]
Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-41504 Theme: Remove duplicate width/height which seems to cause issues for WebKit
Andrew Nicols [Mon, 21 Oct 2013 01:19:57 +0000 (09:19 +0800)]
MDL-41504 Theme: Remove duplicate width/height which seems to cause issues for WebKit

7 years agoMDL-41504 ActionMenu: Adjust position of icons
Andrew Nicols [Thu, 17 Oct 2013 09:16:47 +0000 (17:16 +0800)]
MDL-41504 ActionMenu: Adjust position of icons

7 years agoMDL-41504 ActionMenu: Fix block icon sizes
Andrew Nicols [Thu, 17 Oct 2013 06:57:24 +0000 (14:57 +0800)]
MDL-41504 ActionMenu: Fix block icon sizes

7 years agoMDL-41504 actionmenu: Only show course actionmenu if enabled
Andrew Nicols [Thu, 17 Oct 2013 06:25:35 +0000 (14:25 +0800)]
MDL-41504 actionmenu: Only show course actionmenu if enabled

7 years agoMDL-41504 ActionMenu: Only modify margins if an actionmenu is in use
Andrew Nicols [Thu, 17 Oct 2013 06:09:46 +0000 (14:09 +0800)]
MDL-41504 ActionMenu: Only modify margins if an actionmenu is in use

7 years agoMDL-41504 course: fixed action icon spacing with JS disabled
Sam Hemelryk [Thu, 17 Oct 2013 03:15:18 +0000 (16:15 +1300)]
MDL-41504 course: fixed action icon spacing with JS disabled

7 years agoMDL-41504 completion: fixed display of completion icon
Sam Hemelryk [Wed, 16 Oct 2013 21:35:14 +0000 (10:35 +1300)]
MDL-41504 completion: fixed display of completion icon

This entailed applying a right spacing to the action menu on
the standard theme to accomodate the completion icon when it
is present.
On the clean them I had to apply a trick. The completion icon
is floated right however no other content is floated.
To ensure the completion icon moved in relation to the action
menu I had to reduce its container size to 0 and rely on
natural overflow. I had to counter this my applying spacing
to the activity container in order to accommodate the actual
size of the icon.

7 years agoMDL-42560 Events: Removed use of role->name
Rajesh Taneja [Mon, 28 Oct 2013 02:42:27 +0000 (10:42 +0800)]
MDL-42560 Events: Removed use of role->name

role->name is usually empty or localized, so should not be used in events

7 years agoMerge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 28 Oct 2013 02:52:41 +0000 (10:52 +0800)]
Merge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 28 Oct 2013 02:51:44 +0000 (10:51 +0800)]
Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-42511-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 28 Oct 2013 02:43:07 +0000 (10:43 +0800)]
Merge branch 'MDL-42511-master' of git://github.com/FMCorz/moodle

7 years agoMDL-42511 portfolio: Debugging from deprecated function in cron
Frederic Massart [Thu, 24 Oct 2013 07:34:34 +0000 (15:34 +0800)]
MDL-42511 portfolio: Debugging from deprecated function in cron

7 years agoMDL-42485 add session lock acquire timeout to memcached session driver
Petr Škoda [Thu, 24 Oct 2013 07:33:46 +0000 (09:33 +0200)]
MDL-42485 add session lock acquire timeout to memcached session driver

Credit goes to Eric Merrill, thanks!

7 years agoMDL-42110 use parent directory permissions when installing add-ons
Petr Škoda [Wed, 23 Oct 2013 09:04:59 +0000 (11:04 +0200)]
MDL-42110 use parent directory permissions when installing add-ons

7 years agoMDL-42493 revert nasty DB meta caching hack that was trying to work around shutdown...
Petr Škoda [Wed, 23 Oct 2013 09:25:58 +0000 (11:25 +0200)]
MDL-42493 revert nasty DB meta caching hack that was trying to work around shutdown issues

The original problem was resolved via new core shutdown handler support.

7 years agoon-demand release 2.6beta+
Eloy Lafuente (stronk7) [Fri, 25 Oct 2013 11:04:18 +0000 (13:04 +0200)]
on-demand release 2.6beta+

7 years agoMerge branch 'wip-mdl-42536' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Fri, 25 Oct 2013 07:55:27 +0000 (15:55 +0800)]
Merge branch 'wip-mdl-42536' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-42514-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 25 Oct 2013 07:27:48 +0000 (15:27 +0800)]
Merge branch 'MDL-42514-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 25 Oct 2013 05:47:00 +0000 (13:47 +0800)]
Merge branch 'MDL-42535-master-int' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'w43_MDL-42207_m26_messageformat' of https://github.com/skodak/moodle
Marina Glancy [Fri, 25 Oct 2013 05:16:31 +0000 (16:16 +1100)]
Merge branch 'w43_MDL-42207_m26_messageformat' of https://github.com/skodak/moodle

7 years agoMDL-42207 standardise message text formatting
Petr Škoda [Tue, 8 Oct 2013 16:29:02 +0000 (18:29 +0200)]
MDL-42207 standardise message text formatting

7 years agoMerge branch 'MDL-42220-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Fri, 25 Oct 2013 04:42:38 +0000 (12:42 +0800)]
Merge branch 'MDL-42220-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-42219-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Fri, 25 Oct 2013 04:39:37 +0000 (12:39 +0800)]
Merge branch 'MDL-42219-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 25 Oct 2013 03:56:31 +0000 (14:56 +1100)]
Merge branch 'MDL-31938-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-31938: fix syntax error in db upgrade & update plugin version
Thijs Kinkhorst [Tue, 17 Sep 2013 15:03:26 +0000 (17:03 +0200)]
MDL-31938: fix syntax error in db upgrade & update plugin version

Also correct language class name.

7 years agoMDL-31938, MDL-36138 auth_cas: upgrade phpCAS library
Iñaki Arenaza [Sun, 21 Oct 2012 22:42:44 +0000 (00:42 +0200)]
MDL-31938, MDL-36138 auth_cas: upgrade phpCAS library

Proxy mode changes testing still pending (we don't have such a setup).

7 years agoMDL-42534 mod_forum: Fix issue because cm_info is read only
Frederic Massart [Fri, 25 Oct 2013 03:34:10 +0000 (11:34 +0800)]
MDL-42534 mod_forum: Fix issue because cm_info is read only

7 years agoMerge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Fri, 25 Oct 2013 03:33:19 +0000 (11:33 +0800)]
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle

7 years agoMDl-42261 My Home: Fixed string key to show all courses
Rajesh Taneja [Fri, 25 Oct 2013 03:26:58 +0000 (11:26 +0800)]
MDl-42261 My Home: Fixed string key to show all courses

7 years agoMDL-42538 behat: Fixing wrong number of users
David Monllao [Fri, 25 Oct 2013 03:22:20 +0000 (11:22 +0800)]
MDL-42538 behat: Fixing wrong number of users

7 years agoMDL-42536 enrol_self: Added groups/lib.php required file
Rajesh Taneja [Fri, 25 Oct 2013 03:09:43 +0000 (11:09 +0800)]
MDL-42536 enrol_self: Added groups/lib.php required file

7 years agoMDL-42535 report_outline: Notice set_url() was not called
Frederic Massart [Fri, 25 Oct 2013 02:20:11 +0000 (10:20 +0800)]
MDL-42535 report_outline: Notice set_url() was not called

7 years agoMerge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle
Dan Poltawski [Fri, 25 Oct 2013 02:05:55 +0000 (10:05 +0800)]
Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle

7 years agoMDL-42491 libraries: add exception for IE11 (and hopefully later versions)
Michael de Raadt [Wed, 23 Oct 2013 06:52:08 +0000 (14:52 +0800)]
MDL-42491 libraries: add exception for IE11 (and hopefully later versions)

7 years agoMDL-42514 groups: Importing groups created unnamed groupings
Frederic Massart [Thu, 24 Oct 2013 06:28:05 +0000 (14:28 +0800)]
MDL-42514 groups: Importing groups created unnamed groupings

7 years agoMerge branch 'MDL-42377_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 23:14:04 +0000 (01:14 +0200)]
Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 23:09:25 +0000 (01:09 +0200)]
Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 21:35:24 +0000 (23:35 +0200)]
Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 21:33:42 +0000 (23:33 +0200)]
Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle

7 years agoMerge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 24 Oct 2013 21:27:11 +0000 (23:27 +0200)]
Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle

7 years agoMerge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:57:47 +0000 (16:57 +0800)]
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-42261 My Home: Fixed strings to match moodle standards
Rajesh Taneja [Tue, 15 Oct 2013 01:23:34 +0000 (09:23 +0800)]
MDL-42261 My Home: Fixed strings to match moodle standards

7 years agoMDL-42261 My Home: Added link to show all courses on my home page
Rajesh Taneja [Fri, 11 Oct 2013 04:13:48 +0000 (12:13 +0800)]
MDL-42261 My Home: Added link to show all courses on my home page

If not forced by admin, user can see all courses by clicking on link

7 years agoMerge branch 'MDL-42338' of git://github.com/rwijaya/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:28:46 +0000 (16:28 +0800)]
Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle

7 years agoMerge branch 'MDL-42388-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:15:24 +0000 (16:15 +0800)]
Merge branch 'MDL-42388-master' of git://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 24 Oct 2013 08:07:17 +0000 (16:07 +0800)]
Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 24 Oct 2013 07:55:52 +0000 (15:55 +0800)]
Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch '42299-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 24 Oct 2013 07:47:48 +0000 (15:47 +0800)]
Merge branch '42299-26' of git://github.com/samhemelryk/moodle

Conflicts:
version.php

7 years agoMerge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 24 Oct 2013 07:15:07 +0000 (15:15 +0800)]
Merge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-42272-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Thu, 24 Oct 2013 04:43:52 +0000 (12:43 +0800)]
Merge branch 'MDL-42272-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 24 Oct 2013 04:39:38 +0000 (12:39 +0800)]
Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle

7 years agoMDL-42285 Behat: Automate MDLQA-93 - A teacher can delete questions from the question...
Jason Fowler [Tue, 22 Oct 2013 03:29:10 +0000 (11:29 +0800)]
MDL-42285 Behat: Automate MDLQA-93 - A teacher can delete questions from the question bank

7 years agoMerge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 24 Oct 2013 04:33:15 +0000 (12:33 +0800)]
Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle
Marina Glancy [Thu, 24 Oct 2013 04:29:15 +0000 (15:29 +1100)]
Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle

7 years agoMerge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle
Marina Glancy [Thu, 24 Oct 2013 03:15:05 +0000 (14:15 +1100)]
Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle

7 years agoMDL-42481 Editor: Temporarily unhide the editor to calculate its size
Andrew Nicols [Thu, 24 Oct 2013 03:11:11 +0000 (11:11 +0800)]
MDL-42481 Editor: Temporarily unhide the editor to calculate its size

7 years agoMDL-42338 lti_mod: convert hardcoded string.
rwijaya [Tue, 15 Oct 2013 10:53:35 +0000 (18:53 +0800)]
MDL-42338 lti_mod: convert hardcoded string.

7 years agoMerge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle
Damyon Wiese [Thu, 24 Oct 2013 02:29:05 +0000 (10:29 +0800)]
Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Thu, 24 Oct 2013 02:27:23 +0000 (10:27 +0800)]
Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Thu, 24 Oct 2013 02:19:47 +0000 (10:19 +0800)]
Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle

Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js

7 years agoMDL-42477 filter_glossary: Alert was not showing
Frederic Massart [Thu, 24 Oct 2013 01:11:15 +0000 (09:11 +0800)]
MDL-42477 filter_glossary: Alert was not showing

7 years agoMDL-29070 enrol_imsenterprise: more code cleanups
Dan Poltawski [Thu, 3 Oct 2013 03:22:50 +0000 (11:22 +0800)]
MDL-29070 enrol_imsenterprise: more code cleanups

Including:
* fix whitespace
* coding style fixes:
* Declare method visibility
* Don't have variable names with underscores
* Comments without .
* if/for loop spacing
* Unused variables
* Split long lines
* Removed outdates files
* moodlecheck warnings
* code checker warnings

7 years agoMDL-29070 enrol_imsenterprise: Code cleanup
Brian Biggs [Tue, 24 Sep 2013 03:44:42 +0000 (11:44 +0800)]
MDL-29070 enrol_imsenterprise: Code cleanup

In preparation for new features.

7 years agoMDL-40976 behat: Updating tests according to new behaviour
David Monllao [Wed, 23 Oct 2013 08:19:33 +0000 (16:19 +0800)]
MDL-40976 behat: Updating tests according to new behaviour

We only open the actions menu when is collapsed.

7 years agoMDL-42283 Behat: Automated MDLQA-1777
Rajesh Taneja [Tue, 22 Oct 2013 04:09:43 +0000 (12:09 +0800)]
MDL-42283 Behat: Automated MDLQA-1777

MDLQA-1777: A teacher can set grade conditions to restrict availability of a section

7 years agoMerge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 23 Oct 2013 07:26:54 +0000 (15:26 +0800)]
Merge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 23 Oct 2013 07:12:22 +0000 (15:12 +0800)]
Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 23 Oct 2013 06:36:07 +0000 (14:36 +0800)]
Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-42219 quiz: Fix alternate name warnings in quiz
Ankit Agarwal [Mon, 21 Oct 2013 08:05:28 +0000 (16:05 +0800)]
MDL-42219 quiz: Fix alternate name warnings in quiz

Fix the alternate name warning which is generated when submitting an attempt for a quiz

7 years agoMerge branch '42246-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 23 Oct 2013 06:22:28 +0000 (17:22 +1100)]
Merge branch '42246-26' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-42220 quiz: Fix name fields warning in quiz
Ankit Agarwal [Wed, 23 Oct 2013 06:21:15 +0000 (14:21 +0800)]
MDL-42220 quiz: Fix name fields warning in quiz

Fix warnings generated when manually grading a quiz attempts

7 years agoMerge branch 'MDL-42210_master' of git://github.com/grabs/moodle
Damyon Wiese [Wed, 23 Oct 2013 06:06:04 +0000 (14:06 +0800)]
Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle

7 years agoMerge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 23 Oct 2013 05:37:24 +0000 (13:37 +0800)]
Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle