Dan Poltawski [Thu, 31 Oct 2013 10:38:25 +0000 (18:38 +0800)]
Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
Barbara Ramiro [Wed, 30 Oct 2013 10:00:13 +0000 (18:00 +0800)]
MDL-42102 TinyMCE: Update icons
Marina Glancy [Thu, 31 Oct 2013 10:16:37 +0000 (21:16 +1100)]
Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle
Andrew Nicols [Wed, 30 Oct 2013 10:00:26 +0000 (18:00 +0800)]
MDL-42012 TinyMCE: Remove black background on foreground color picker
Jason Fowler [Thu, 31 Oct 2013 01:53:28 +0000 (09:53 +0800)]
MDL-42102 TinyMCE: Fixing dropdown positioning
Sam Hemelryk [Tue, 15 Oct 2013 04:59:30 +0000 (17:59 +1300)]
MDL-42300 course: improved category re-sort controls.
* The top action now works on top level categories and has
a better title.
* Each category has its own resort actions now.
Marina Glancy [Thu, 31 Oct 2013 04:59:54 +0000 (15:59 +1100)]
Merge branch 'MDL-42587' of git://github.com/aolley/moodle
Marina Glancy [Thu, 31 Oct 2013 04:49:22 +0000 (15:49 +1100)]
Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Thu, 31 Oct 2013 04:20:38 +0000 (12:20 +0800)]
Merge branch 'MDL-42517-m' of git://github.com/micaherne/moodle
Dan Poltawski [Thu, 31 Oct 2013 04:14:50 +0000 (12:14 +0800)]
Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Dan Poltawski [Thu, 31 Oct 2013 03:54:07 +0000 (11:54 +0800)]
Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 31 Oct 2013 03:48:00 +0000 (11:48 +0800)]
Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 31 Oct 2013 03:27:49 +0000 (11:27 +0800)]
Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Dan Poltawski [Thu, 31 Oct 2013 02:56:45 +0000 (10:56 +0800)]
Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 29 Oct 2013 05:21:43 +0000 (13:21 +0800)]
MDL-42589: Fix file picker display in ie9/ie10
CSS change to fix blank file picker bug in IE.
Dan Poltawski [Thu, 31 Oct 2013 02:08:23 +0000 (10:08 +0800)]
Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle
Barbara Ramiro [Wed, 30 Oct 2013 09:18:32 +0000 (17:18 +0800)]
MDL-42102 TinyMCE: Correct additional icons
Dan Poltawski [Wed, 30 Oct 2013 09:24:06 +0000 (17:24 +0800)]
Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
Barbara Ramiro [Wed, 30 Oct 2013 08:41:43 +0000 (16:41 +0800)]
MDL-42102 tinymce: improved icons
Damyon Wiese [Wed, 30 Oct 2013 09:21:00 +0000 (17:21 +0800)]
Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 30 Oct 2013 08:28:51 +0000 (16:28 +0800)]
ie9 svg compatibility fixes
Damyon Wiese [Wed, 30 Oct 2013 08:21:37 +0000 (16:21 +0800)]
Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 30 Oct 2013 08:03:31 +0000 (16:03 +0800)]
MDL-41092 Assign: Expose SQL error in cron unit test
David Monllao [Wed, 30 Oct 2013 06:20:46 +0000 (14:20 +0800)]
MDL-42236 behat: New steps to look for elements visibility
Jason Fowler [Wed, 30 Oct 2013 05:48:36 +0000 (13:48 +0800)]
MDL-42236 Filepicker: fixing search box for repositories
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Wed, 30 Oct 2013 08:00:30 +0000 (16:00 +0800)]
Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 30 Oct 2013 07:44:13 +0000 (15:44 +0800)]
Merge branch 'MDL-42558-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Wed, 30 Oct 2013 06:15:44 +0000 (14:15 +0800)]
Merge branch 'MDL-42284_behat' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Wed, 30 Oct 2013 05:44:56 +0000 (13:44 +0800)]
Merge branch 'MDL-42574-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 30 Oct 2013 04:08:20 +0000 (12:08 +0800)]
Merge branch 'MDL-41251_c' of git://github.com/rwijaya/moodle
Damyon Wiese [Wed, 30 Oct 2013 03:38:30 +0000 (11:38 +0800)]
Merge branch 'MDL-42579_m26_2' of git://github.com/sbourget/moodle
Damyon Wiese [Wed, 30 Oct 2013 02:31:08 +0000 (10:31 +0800)]
Merge branch 'wip-MDL-41337-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 30 Oct 2013 00:40:08 +0000 (08:40 +0800)]
Merge branch 'MDL-42542-master' of git://github.com/FMCorz/moodle
Conflicts:
version.php
Mary Evans [Wed, 30 Oct 2013 23:46:47 +0000 (23:46 +0000)]
MDL-40971 grade: Importing Outcomes breaks Clean theme.
Mark Nelson [Wed, 30 Oct 2013 04:36:45 +0000 (12:36 +0800)]
MDL-41664 core_calendar: replaced class variables that stored minimum and maximum years with functions
Also made slight changes to the existing functions.
Adrian Greeve [Mon, 9 Sep 2013 03:36:25 +0000 (11:36 +0800)]
MDL-41664 - Calendar: Add method for formating years in the new calendar plugin.
Adrian Greeve [Wed, 30 Oct 2013 03:25:59 +0000 (11:25 +0800)]
MDL-42599 forum rss: Update the sql statements to return all user name fields.
Stephen Bourget [Wed, 30 Oct 2013 02:56:53 +0000 (22:56 -0400)]
MDL-42579 Glossary: Fix debug notice from missing name fields.
Petr Škoda [Tue, 29 Oct 2013 10:57:35 +0000 (11:57 +0100)]
MDL-40683 fix user upload form validation problem
Marina Glancy [Tue, 29 Oct 2013 05:56:20 +0000 (16:56 +1100)]
MDL-41337 files: Fixed bug with accidental delete of the root directory
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
Rajesh Taneja [Tue, 29 Oct 2013 09:27:53 +0000 (17:27 +0800)]
MDL-42594 Navigation: Site admin navigation will show loading icon
While loading site admin navigation loading icon will be displayed
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
Petr Škoda [Sun, 27 Oct 2013 09:22:44 +0000 (10:22 +0100)]
MDL-42555 fix moodle_url typo in namespaces
Jason Fowler [Tue, 29 Oct 2013 08:48:12 +0000 (16:48 +0800)]
MDL-42102 TinyMCE - Matching toolbar UI from other areas of Moodle
Barbara Ramiro [Tue, 29 Oct 2013 08:45:06 +0000 (16:45 +0800)]
MDL-42102 tinymce: new icons
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
Dan Poltawski [Tue, 29 Oct 2013 07:15:19 +0000 (15:15 +0800)]
MDL-42407 upgrade.txt clarify description
Dan Poltawski [Tue, 29 Oct 2013 07:08:13 +0000 (15:08 +0800)]
Merge branch 'MDL-42407-master' of git://github.com/phalacee/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
Jason Fowler [Mon, 28 Oct 2013 02:01:36 +0000 (10:01 +0800)]
MDL-42407 Filepicker: generate a smarter zIndex for the filepicker
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
Dan Poltawski [Tue, 29 Oct 2013 06:48:27 +0000 (14:48 +0800)]
Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/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
Dan Poltawski [Tue, 29 Oct 2013 06:41:03 +0000 (14:41 +0800)]
MDL-42236 fix trailing whitespace
Michael de Raadt [Tue, 29 Oct 2013 06:38:48 +0000 (14:38 +0800)]
MDL-41092 assign: Fix duplicate key error in assign cron
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
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
Barbara Ramiro [Thu, 17 Oct 2013 07:46:21 +0000 (15:46 +0800)]
MDL-42149 Usability - Adding new icons for file manager/picker
Jason Fowler [Mon, 14 Oct 2013 07:44:27 +0000 (15:44 +0800)]
MDL-42236 File Manger/Picker - Matching UI with standard UI
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
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
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
Dan Poltawski [Tue, 29 Oct 2013 05:16:44 +0000 (13:16 +0800)]
Merge branch 'wip-mdl-42557' of https://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
Dan Poltawski [Tue, 29 Oct 2013 04:10:44 +0000 (12:10 +0800)]
Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle
Adam Olley [Tue, 29 Oct 2013 03:48:43 +0000 (14:18 +1030)]
MDL-42587: calendar: Fix regression that stops dates autocorrecting
Dan Poltawski [Tue, 29 Oct 2013 03:31:32 +0000 (11:31 +0800)]
Merge branch 'wip-mdl-42282' 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
Andrew Nicols [Tue, 15 Oct 2013 04:12:56 +0000 (12:12 +0800)]
MDL-40470 JavaScript: Correct issue when checking select change in Firefox
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
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.
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
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
Dan Poltawski [Mon, 28 Oct 2013 08:31:17 +0000 (16:31 +0800)]
Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle
Rajesh Taneja [Mon, 28 Oct 2013 08:16:25 +0000 (16:16 +0800)]
MDL-42557 Events: added idnumber to course_deleted event data
Ankit Agarwal [Mon, 28 Oct 2013 07:39:55 +0000 (15:39 +0800)]
MDL-42574 blocks: Fix strict standards warning in community block
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
Dan Poltawski [Mon, 28 Oct 2013 06:53:21 +0000 (14:53 +0800)]
Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle
Frederic Massart [Mon, 7 Oct 2013 08:13:41 +0000 (16:13 +0800)]
MDL-22669 course: Display section number for orphaned activities
Dan Poltawski [Mon, 28 Oct 2013 06:15:27 +0000 (14:15 +0800)]
Merge branch 'MDL-42285-master' of git://github.com/phalacee/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
Jerome Mouneyrac [Mon, 28 Oct 2013 05:48:22 +0000 (13:48 +0800)]
MDL-42028 EditPDF: replace the loading icon by a progress bar
Rajesh Taneja [Mon, 28 Oct 2013 04:55:52 +0000 (12:55 +0800)]
MDL-42557 Events: Removed timemodified hack from course_deleted event
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
Dan Poltawski [Mon, 28 Oct 2013 04:33:39 +0000 (12:33 +0800)]
Merge branch 'MDL-38419' of https://github.com/moodlerooms/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
Ankit Agarwal [Mon, 28 Oct 2013 03:50:07 +0000 (11:50 +0800)]
MDL-42558 events: Enrollment actions are administration not teaching
Dan Poltawski [Mon, 28 Oct 2013 03:35:54 +0000 (11:35 +0800)]
Merge branch 'MDL-42538_master' of git://github.com/dmonllao/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
Dan Poltawski [Mon, 28 Oct 2013 03:10:43 +0000 (11:10 +0800)]
Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle
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
Andrew Nicols [Thu, 17 Oct 2013 09:16:47 +0000 (17:16 +0800)]
MDL-41504 ActionMenu: Adjust position of icons
Andrew Nicols [Thu, 17 Oct 2013 06:57:24 +0000 (14:57 +0800)]
MDL-41504 ActionMenu: Fix block icon sizes
Andrew Nicols [Thu, 17 Oct 2013 06:25:35 +0000 (14:25 +0800)]
MDL-41504 actionmenu: Only show course actionmenu if enabled
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
Sam Hemelryk [Thu, 17 Oct 2013 03:15:18 +0000 (16:15 +1300)]
MDL-41504 course: fixed action icon spacing with JS disabled
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.
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
Damyon Wiese [Mon, 28 Oct 2013 02:52:41 +0000 (10:52 +0800)]
Merge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle
