moodle.git
8 years agoMerge branch 'wip-MDL-42441-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 Oct 2013 09:28:25 +0000 (17:28 +0800)]
Merge branch 'wip-MDL-42441-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-42441 modules: Remove unnecessary code when creating the module in D&D
Marina Glancy [Sun, 20 Oct 2013 23:50:40 +0000 (10:50 +1100)]
MDL-42441 modules: Remove unnecessary code when creating the module in D&D

property groupmodelink is not used at all and groupmode is already processed
properly in core functions (respecting groupmodeforce property in course).
This looks like old code that has not been updated. It's a shame we
duplicate module creation login in draganddrop library

8 years agoMDL-42555 fix moodle_url typo in namespaces
Petr Škoda [Sun, 27 Oct 2013 09:22:44 +0000 (10:22 +0100)]
MDL-42555 fix moodle_url typo in namespaces

8 years agoMDL-42102 TinyMCE - Matching toolbar UI from other areas of Moodle
Jason Fowler [Tue, 29 Oct 2013 08:48:12 +0000 (16:48 +0800)]
MDL-42102 TinyMCE - Matching toolbar UI from other areas of Moodle

8 years agoMDL-42102 tinymce: new icons
Barbara Ramiro [Tue, 29 Oct 2013 08:45:06 +0000 (16:45 +0800)]
MDL-42102 tinymce: new icons

8 years agoMerge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 29 Oct 2013 08:42:48 +0000 (16:42 +0800)]
Merge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle

8 years agoMDL-42407 upgrade.txt clarify description
Dan Poltawski [Tue, 29 Oct 2013 07:15:19 +0000 (15:15 +0800)]
MDL-42407 upgrade.txt clarify description

8 years agoMerge branch 'MDL-42407-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 29 Oct 2013 07:08:13 +0000 (15:08 +0800)]
Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 29 Oct 2013 07:03:52 +0000 (15:03 +0800)]
Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle

8 years agoMDL-42407 Filepicker: generate a smarter zIndex for the filepicker
Jason Fowler [Mon, 28 Oct 2013 02:01:36 +0000 (10:01 +0800)]
MDL-42407 Filepicker: generate a smarter zIndex for the filepicker

8 years agoMerge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 Oct 2013 06:54:44 +0000 (14:54 +0800)]
Merge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 29 Oct 2013 06:48:27 +0000 (14:48 +0800)]
Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-42401-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)]
Merge branch 'MDL-42401-master' of git://github.com/damyon/moodle

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

8 years agoMDL-42236 fix trailing whitespace
Dan Poltawski [Tue, 29 Oct 2013 06:41:03 +0000 (14:41 +0800)]
MDL-42236 fix trailing whitespace

8 years agoMDL-41473 book: Book html zip import, incorrect url produced for internal linking...
John Beedell [Thu, 24 Oct 2013 12:31:52 +0000 (13:31 +0100)]
MDL-41473 book: Book html zip import, incorrect url produced for internal linking to other chapters

8 years agoMDL-42236 File Manager - Fixing files and whitespace for UI consistency project
Jason Fowler [Tue, 22 Oct 2013 00:08:26 +0000 (08:08 +0800)]
MDL-42236 File Manager - Fixing files and whitespace for UI consistency project

8 years agoMDL-42149 Usability - Adding new icons for file manager/picker
Barbara Ramiro [Thu, 17 Oct 2013 07:46:21 +0000 (15:46 +0800)]
MDL-42149 Usability - Adding new icons for file manager/picker

8 years agoMDL-42236 File Manger/Picker - Matching UI with standard UI
Jason Fowler [Mon, 14 Oct 2013 07:44:27 +0000 (15:44 +0800)]
MDL-42236 File Manger/Picker - Matching UI with standard UI

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 years agoMDL-42463 chat: do not set property of cm_info class
Marina Glancy [Tue, 22 Oct 2013 08:58:11 +0000 (19:58 +1100)]
MDL-42463 chat: do not set property of cm_info class

MDL-41192 made all properties of class cm_info read-only

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 years agoMDL-40683 administration: Include alternate name fields in CSV user import.
Adrian Greeve [Mon, 28 Oct 2013 01:14:44 +0000 (09:14 +0800)]
MDL-40683 administration: Include alternate name fields in CSV user import.

Removal of firstname and lastname from STD_FIELDS

8 years agoMDL-40683 libraries: Include alternate name fields in CSV user import.
Adrian Greeve [Tue, 16 Jul 2013 08:15:11 +0000 (16:15 +0800)]
MDL-40683 libraries: Include alternate name fields in CSV user import.

8 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!

8 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

8 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.

8 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+

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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).

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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)

8 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

8 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

8 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

8 years agoMDL-42528 Activity Completion: DnD upload should obey default setting
Eric Merrill [Thu, 24 Oct 2013 21:36:38 +0000 (17:36 -0400)]
MDL-42528 Activity Completion: DnD upload should obey default setting

Make activities created by drad and drop obey Default completion
tracking setting.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 years agoMDL-42401 EditPDF: Allow dragging the edit pdf window.
Damyon Wiese [Thu, 24 Oct 2013 05:50:58 +0000 (13:50 +0800)]
MDL-42401 EditPDF: Allow dragging the edit pdf window.

Also move the location of the call the centerDialogue so it fires after the drawing region is
added to the window.

8 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