Dan Poltawski [Mon, 4 Nov 2013 04:30:12 +0000 (12:30 +0800)]
Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
Marina Glancy [Mon, 4 Nov 2013 04:13:42 +0000 (15:13 +1100)]
Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 4 Nov 2013 04:10:39 +0000 (12:10 +0800)]
Merge branch 'MDL-40515' of git://github.com/aolley/moodle
Damyon Wiese [Mon, 4 Nov 2013 03:53:40 +0000 (11:53 +0800)]
Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle
Petr Škoda [Tue, 8 Oct 2013 16:38:31 +0000 (18:38 +0200)]
MDL-41941 clean message text
Damyon Wiese [Mon, 4 Nov 2013 03:33:04 +0000 (11:33 +0800)]
Merge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle
Jerome Mouneyrac [Mon, 4 Nov 2013 03:11:46 +0000 (14:11 +1100)]
MDL-40874 Retire MyMobile as a standard theme
Tim Hunt [Tue, 17 Sep 2013 17:26:53 +0000 (18:26 +0100)]
MDL-41820 XSS in the quiz responses report.
Thanks to Michael Hess for finding this bug and reporting it to us.
Damyon Wiese [Mon, 4 Nov 2013 02:56:12 +0000 (10:56 +0800)]
Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle
Damyon Wiese [Mon, 4 Nov 2013 02:49:06 +0000 (10:49 +0800)]
Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 4 Nov 2013 02:37:59 +0000 (10:37 +0800)]
Merge branch '42452-26' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 4 Nov 2013 02:22:18 +0000 (10:22 +0800)]
MDL-42452 actionmenu: improved constraint code
Marina Glancy [Mon, 4 Nov 2013 02:17:58 +0000 (13:17 +1100)]
Merge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com/mudrd8mz/moodle
Marina Glancy [Mon, 4 Nov 2013 01:52:15 +0000 (12:52 +1100)]
Merge branch 'MDL-42583-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Mon, 4 Nov 2013 01:38:38 +0000 (09:38 +0800)]
Merge branch 'MDL-38850' of git://github.com/rwijaya/moodle
Andrew Nicols [Sat, 2 Nov 2013 00:51:19 +0000 (08:51 +0800)]
MDL-42452 ActionMenu: Change constrains mechanism to show the entire menu
Andreas Grabs [Sun, 3 Nov 2013 18:11:27 +0000 (19:11 +0100)]
MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme
Sam Hemelryk [Thu, 31 Oct 2013 07:54:16 +0000 (15:54 +0800)]
MDL-42452 block: action menu is now constrained to the block container
Damyon Wiese [Sat, 2 Nov 2013 14:39:37 +0000 (22:39 +0800)]
Merge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Sat, 2 Nov 2013 14:34:16 +0000 (22:34 +0800)]
Merge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle
Damyon Wiese [Sat, 2 Nov 2013 14:24:19 +0000 (22:24 +0800)]
Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle
Damyon Wiese [Fri, 1 Nov 2013 13:31:57 +0000 (21:31 +0800)]
Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle
Conflicts:
version.php
Petr Škoda [Sun, 20 Oct 2013 21:11:25 +0000 (23:11 +0200)]
MDL-42387 standardise file lifetime handling
Petr Škoda [Thu, 24 Oct 2013 17:13:18 +0000 (19:13 +0200)]
MDL-42497 add listing of orphaned subplugin types
Dan Poltawski [Fri, 1 Nov 2013 09:31:17 +0000 (17:31 +0800)]
Merge branch 'MDL-42287-master' of git://github.com/ankitagarwal/moodle
David Monllao [Fri, 1 Nov 2013 03:47:17 +0000 (11:47 +0800)]
MDL-42663 mod_lesson: Move definitions to show_clock()
Seems that the required data is not always set
before timer.js is included.
David Mudrák [Fri, 1 Nov 2013 06:36:24 +0000 (07:36 +0100)]
MDL-42664 Fix the filter_manager instantiation
For legacy reasons, the $CFG->perfdebug uses values 7 for disabled and 15 for
enabled. Because of this typo, Moodle has always created instance of the slower
performance_measuring_filter_manager instead of the standard filter_manager,
regardless the perfdebug setting.
Dan Poltawski [Fri, 1 Nov 2013 07:49:16 +0000 (15:49 +0800)]
on-demand release 2.6beta+
Dan Poltawski [Fri, 1 Nov 2013 07:47:31 +0000 (15:47 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Marina Glancy [Tue, 29 Oct 2013 01:22:59 +0000 (12:22 +1100)]
MDL-28463 conditionlib: use MUC for caching grades, reset when grades are changed
Rajesh Taneja [Thu, 24 Oct 2013 01:57:26 +0000 (09:57 +0800)]
MDL-42492 course: Show option to move category to top level
added behat to test move category
Dan Poltawski [Fri, 1 Nov 2013 04:06:21 +0000 (12:06 +0800)]
MDL-42546 question: fix some bad phpdocs
Marina Glancy [Fri, 1 Nov 2013 02:23:30 +0000 (13:23 +1100)]
Merge branch '42619-26' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Thu, 31 Oct 2013 01:18:08 +0000 (09:18 +0800)]
MDL-42619 block_community: delete course redirect bug fix
Damyon Wiese [Thu, 31 Oct 2013 06:24:40 +0000 (14:24 +0800)]
MDL-42102 TinyMCE: Toolbar wrapping < 480px.
Prevent wrap plugin from wrapping toolbars shorter than 5 buttons.
Marina Glancy [Fri, 1 Nov 2013 02:04:29 +0000 (13:04 +1100)]
Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle
Conflicts:
lib/classes/event/user_deleted.php
Marina Glancy [Fri, 1 Nov 2013 01:42:17 +0000 (12:42 +1100)]
Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Fri, 1 Nov 2013 01:16:20 +0000 (12:16 +1100)]
Merge branch 'MDL-42356-master' of git://github.com/mouneyrac/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Marina Glancy [Fri, 1 Nov 2013 00:07:47 +0000 (11:07 +1100)]
Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 31 Oct 2013 11:53:44 +0000 (22:53 +1100)]
Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Marina Glancy [Thu, 31 Oct 2013 11:17:40 +0000 (22:17 +1100)]
Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle
Dan Poltawski [Thu, 31 Oct 2013 10:39:29 +0000 (18:39 +0800)]
MDL-42102 ie9 SVG fixes
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
David Scotson [Thu, 24 Oct 2013 13:31:36 +0000 (21:31 +0800)]
MDL-40722 Theme: Add back a more-specific selector for some blocks
This addresses an issue on narrow devices whereby block width is
incorrectly overridden with a more-specific selector.
Ankit Agarwal [Thu, 31 Oct 2013 05:43:37 +0000 (13:43 +0800)]
MDL-42583 events: Fix snapshot issues with note events
Mary Evans [Wed, 30 Oct 2013 23:46:47 +0000 (23:46 +0000)]
MDL-40971 grade: Importing Outcomes breaks Clean theme.
Jean-Michel Vedrine [Wed, 30 Oct 2013 16:55:34 +0000 (17:55 +0100)]
MDL-41624 DragMath crashes Firefox
Ankit Agarwal [Wed, 30 Oct 2013 06:20:57 +0000 (14:20 +0800)]
MDL-42565 assign: Status of grading is not displayed anymore
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.
Damyon Wiese [Tue, 29 Oct 2013 14:18:19 +0000 (22:18 +0800)]
MDL-42351 EditPDF: Fix jiggling of relatively positioned elements
When calling setX/setY with YUI - YUI takes into account the position style
of the element. If none is set it assumes position relative. Position relative
is bad because relatively positioned elements still take up space in the page,
and all the elements after that node are positioned, taking into account the size
of that node. So when a node is resized or deleted, all nodes after that one in
the list of drawables are affected.
The magic fix - is just to set position: absolute on the drawables before calling setX/setY.
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
Rajesh Taneja [Tue, 29 Oct 2013 04:43:56 +0000 (12:43 +0800)]
MDL-42584 Events: modified get_description in events
blog_entry_created - Removed summary field
blog_entry_deleted - Removed summary field and unwanted entry record
blog_entry_updated - Fixed single quotes and removed summary field
course_module_created - Removed subject
course_module_updated - Removed subject
user_deleted - Removed user firstname and last name
course_module_viewed - Fixed description
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
