Dan Poltawski [Fri, 11 Apr 2014 03:39:56 +0000 (11:39 +0800)]
weekly release 2.7dev
Dan Poltawski [Fri, 11 Apr 2014 03:39:56 +0000 (11:39 +0800)]
NOBUG: Fixed file access permissions
Dan Poltawski [Fri, 11 Apr 2014 03:39:52 +0000 (11:39 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Fri, 11 Apr 2014 01:47:57 +0000 (09:47 +0800)]
Revert "MDL-44758 editor-atto: prevent table-in-table creation"
This reverts commit
3a6511a530015813f7bfda5547f8fc9de750efcf.
Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
lib/editor/atto/plugins/table/yui/src/button/js/button.js
AMOS bot [Thu, 10 Apr 2014 22:38:35 +0000 (22:38 +0000)]
Automatically generated installer lang files
Juan Leyva [Thu, 10 Apr 2014 09:26:23 +0000 (11:26 +0200)]
MDL-44342 air notifier: Fixied checking for empty values in event object
Juan Leyva [Thu, 10 Apr 2014 08:23:28 +0000 (10:23 +0200)]
MDL-44342 airnotifier: Added new functions to the Mobile service
Dan Poltawski [Thu, 10 Apr 2014 06:51:42 +0000 (14:51 +0800)]
Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Rajesh Taneja [Thu, 10 Apr 2014 06:28:28 +0000 (14:28 +0800)]
MDL-44070 core_completion: Removed unwanted tag
Frederic Massart [Thu, 10 Apr 2014 06:22:10 +0000 (14:22 +0800)]
MDL-44868 editor_atto: Remember the last focused button in the toolbar
Damyon Wiese [Thu, 10 Apr 2014 06:13:45 +0000 (14:13 +0800)]
MDL-44170 LTI - fix unit tests.
Dan Poltawski [Thu, 10 Apr 2014 06:09:15 +0000 (14:09 +0800)]
Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle
Damyon Wiese [Thu, 10 Apr 2014 05:33:50 +0000 (13:33 +0800)]
Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle
Damyon Wiese [Thu, 10 Apr 2014 05:24:28 +0000 (13:24 +0800)]
MDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry)
Damyon Wiese [Thu, 10 Apr 2014 05:16:40 +0000 (13:16 +0800)]
MDL-44342 Airnotifier: Bug in retrieving user prefs (fixes fail in unit test)
Juan Leyva [Wed, 9 Apr 2014 09:47:45 +0000 (11:47 +0200)]
MDL-44342 airnotifier: Change default Airnotifier url to use SSL
This commit include also a fix for checking forced settings
Sam Hemelryk [Wed, 9 Apr 2014 21:26:07 +0000 (09:26 +1200)]
Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle
sam marshall [Wed, 9 Apr 2014 15:45:08 +0000 (16:45 +0100)]
MDL-44070 Behat: Fixed restrict_activity_by_date.feature
Rajesh Taneja [Wed, 9 Apr 2014 09:51:29 +0000 (17:51 +0800)]
MDL-44070 core_completion: Fixed behat
Dan Poltawski [Wed, 9 Apr 2014 09:37:24 +0000 (17:37 +0800)]
Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle
Damyon Wiese [Wed, 9 Apr 2014 08:44:40 +0000 (16:44 +0800)]
MDL-43856 MathJax: Delay setting of lang until after MathJax startup
Damyon Wiese [Wed, 9 Apr 2014 07:44:39 +0000 (15:44 +0800)]
Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle
Mark Nelson [Wed, 9 Apr 2014 07:00:25 +0000 (00:00 -0700)]
MDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error
Dan Poltawski [Wed, 9 Apr 2014 07:32:30 +0000 (15:32 +0800)]
Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle
Marina Glancy [Wed, 9 Apr 2014 07:31:49 +0000 (15:31 +0800)]
MDL-40843 chat: fixed bug in SQL query in recent activity block
Andrew Nicols [Wed, 9 Apr 2014 07:26:32 +0000 (15:26 +0800)]
MDL-44760 editor_atto: Address issues with focus when closing menus
Safari fires it's events in a slightly different order for the focusoutside
event which causes the focusAfterHide to be called *after* we change focus.
As a result, we must keep track of the menus which are currently open and
remove their focusAfterHide.
Damyon Wiese [Wed, 9 Apr 2014 06:57:33 +0000 (14:57 +0800)]
MDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3.
Marina Glancy [Wed, 9 Apr 2014 06:41:12 +0000 (14:41 +0800)]
MDL-44070 availability: corrected SQL to be mysql-compatible
Damyon Wiese [Wed, 9 Apr 2014 06:26:57 +0000 (14:26 +0800)]
MDL-44268 Assign: Fix behat test for assigned marker filter
Damyon Wiese [Wed, 9 Apr 2014 06:07:40 +0000 (14:07 +0800)]
MDL-44268 Assign: Improve the "not submitted" filter
Jonathon Fowler [Tue, 18 Feb 2014 06:46:51 +0000 (16:46 +1000)]
MDL-44268 assign: add 'not submitted' and 'no marker' filter options
Dan Poltawski [Wed, 9 Apr 2014 06:03:42 +0000 (14:03 +0800)]
Merge branch 'MDL-41123-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 9 Apr 2014 05:05:46 +0000 (13:05 +0800)]
Merge branch 'mdl44669-master' of https://github.com/tlock/moodle
Dan Poltawski [Wed, 9 Apr 2014 04:49:35 +0000 (12:49 +0800)]
Merge branch 'MDL-31679' of git://github.com/aolley/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 9 Apr 2014 04:38:30 +0000 (12:38 +0800)]
Merge branch 'MDL-39759_http_response_code_master' of https://github.com/dongsheng/moodle
Dan Poltawski [Wed, 9 Apr 2014 04:00:31 +0000 (12:00 +0800)]
MDL-44507 filemanger: fix coding style
Dan Poltawski [Wed, 9 Apr 2014 03:52:33 +0000 (11:52 +0800)]
Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 9 Apr 2014 03:38:42 +0000 (11:38 +0800)]
Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle
Damyon Wiese [Wed, 9 Apr 2014 03:31:26 +0000 (11:31 +0800)]
MDL-44927 Atto: Table editor typo that prevents creation of new tables.
Dan Poltawski [Wed, 9 Apr 2014 03:12:55 +0000 (11:12 +0800)]
Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle
Marina Glancy [Wed, 9 Apr 2014 01:48:41 +0000 (09:48 +0800)]
Merge branch '44944-27' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)]
Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle
AMOS bot [Tue, 8 Apr 2014 22:38:25 +0000 (22:38 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Tue, 8 Apr 2014 22:37:05 +0000 (10:37 +1200)]
Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:26:33 +0000 (10:26 +1200)]
Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:15:50 +0000 (10:15 +1200)]
Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle
Sam Hemelryk [Mon, 7 Apr 2014 22:11:23 +0000 (10:11 +1200)]
MDL-39833 format: tidied up API improvement to allow for future backport
Sam Hemelryk [Tue, 8 Apr 2014 22:09:02 +0000 (10:09 +1200)]
Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle
Damyon Wiese [Tue, 8 Apr 2014 09:02:58 +0000 (17:02 +0800)]
MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images
Marina Glancy [Tue, 8 Apr 2014 08:55:49 +0000 (16:55 +0800)]
Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Ankit Agarwal [Tue, 8 Apr 2014 08:07:35 +0000 (16:07 +0800)]
MDL-41123 report_completion: Add context validations to the events
Jason Fowler [Thu, 3 Apr 2014 01:00:53 +0000 (09:00 +0800)]
MDL-44881 Filepicker: Fix alignment and padding on file-select dialog
Damyon Wiese [Tue, 8 Apr 2014 06:18:50 +0000 (14:18 +0800)]
Merge branch 'MDL-44131-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
lib/editor/atto/plugins/equation/yui/src/button/js/button.js
Dan Poltawski [Tue, 8 Apr 2014 06:11:59 +0000 (14:11 +0800)]
Merge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error-Content-Displayed-in-red' of https://github.com/michael-milette/moodle
Frederic Massart [Thu, 3 Apr 2014 07:53:06 +0000 (15:53 +0800)]
MDL-44131 atto_equation: Equation library groups are aria toolbars
Damyon Wiese [Tue, 8 Apr 2014 06:01:34 +0000 (14:01 +0800)]
Merge branch 'wip-MDL-40907-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 8 Apr 2014 05:53:19 +0000 (13:53 +0800)]
Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 8 Apr 2014 05:49:15 +0000 (13:49 +0800)]
MDL-44070 Conditional availability - white space fix
Marina Glancy [Tue, 25 Feb 2014 09:26:34 +0000 (17:26 +0800)]
MDL-40907 events: additional legacy logging for module update/add events"
Marina Glancy [Tue, 25 Feb 2014 09:25:10 +0000 (17:25 +0800)]
MDL-40907 events: view list of resources in course
Marina Glancy [Thu, 6 Mar 2014 08:51:54 +0000 (16:51 +0800)]
MDL-40907 events: Allow one event write several entries to the legacy log table
Damyon Wiese [Tue, 8 Apr 2014 05:30:41 +0000 (13:30 +0800)]
Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
theme/bootstrapbase/less/moodle/forms.less
theme/bootstrapbase/style/moodle.css
version.php
Damyon Wiese [Tue, 8 Apr 2014 04:32:49 +0000 (12:32 +0800)]
Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 8 Apr 2014 04:16:42 +0000 (12:16 +0800)]
Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 8 Apr 2014 04:12:01 +0000 (12:12 +0800)]
Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 8 Apr 2014 04:10:33 +0000 (12:10 +0800)]
MDL-44342 message_airnotifier: Fix shifter warnings in JS
Dan Poltawski [Tue, 8 Apr 2014 04:07:15 +0000 (12:07 +0800)]
Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 8 Apr 2014 04:04:41 +0000 (12:04 +0800)]
Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
Dan Poltawski [Tue, 8 Apr 2014 04:03:37 +0000 (12:03 +0800)]
MDL-43682 report_loglive: commit built yui files
Sam Hemelryk [Tue, 8 Apr 2014 03:41:39 +0000 (15:41 +1200)]
MDL-43682 report_loglive: fixed lint warning in fetchlogs JS
Dan Poltawski [Tue, 8 Apr 2014 03:37:25 +0000 (11:37 +0800)]
Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
Dan Poltawski [Tue, 8 Apr 2014 03:27:59 +0000 (11:27 +0800)]
Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 8 Apr 2014 03:14:52 +0000 (11:14 +0800)]
Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle
Marina Glancy [Tue, 8 Apr 2014 03:13:43 +0000 (11:13 +0800)]
Merge branch 'MDL-44948' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 8 Apr 2014 03:13:17 +0000 (11:13 +0800)]
Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 8 Apr 2014 02:55:33 +0000 (10:55 +0800)]
MDL-44342 message_airnotifier: Fix for unit tests.
Damyon Wiese [Tue, 8 Apr 2014 02:09:21 +0000 (10:09 +0800)]
Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle
Sam Hemelryk [Tue, 8 Apr 2014 01:46:28 +0000 (13:46 +1200)]
Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 8 Apr 2014 01:45:07 +0000 (09:45 +0800)]
Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 8 Apr 2014 01:27:48 +0000 (09:27 +0800)]
Merge branch 'MDL-44342' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 8 Apr 2014 01:22:38 +0000 (09:22 +0800)]
Merge branch '42317-27' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Tue, 8 Apr 2014 00:53:58 +0000 (08:53 +0800)]
Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle
Marina Glancy [Tue, 8 Apr 2014 00:53:49 +0000 (08:53 +0800)]
Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle
Marina Glancy [Tue, 8 Apr 2014 00:53:35 +0000 (08:53 +0800)]
Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 8 Apr 2014 00:34:24 +0000 (08:34 +0800)]
Merge branch 'MDL-44954' of git://github.com/jleyva/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:44:21 +0000 (11:44 +1200)]
Merge branch 'MDL-44408' of git://github.com/jleyva/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:42:29 +0000 (11:42 +1200)]
Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:38:13 +0000 (11:38 +1200)]
Merge branch 'MDL-44933-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:35:34 +0000 (11:35 +1200)]
Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 7 Apr 2014 23:22:23 +0000 (11:22 +1200)]
Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle
AMOS bot [Mon, 7 Apr 2014 22:39:43 +0000 (22:39 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Mon, 7 Apr 2014 20:59:54 +0000 (08:59 +1200)]
Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
lib/editor/atto/plugins/table/yui/src/button/js/button.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
Sam Hemelryk [Mon, 7 Apr 2014 20:51:17 +0000 (08:51 +1200)]
MDL-43682 report_loglive: fixed whitespace issue
Sam Hemelryk [Mon, 7 Apr 2014 20:50:38 +0000 (08:50 +1200)]
Merge branch 'MDL-43682-master' of git://github.com/ankitagarwal/moodle
Justin Filip [Mon, 7 Apr 2014 20:00:21 +0000 (16:00 -0400)]
MDL-22999 code_grades: Added Behat tests for configurable grade point maximum.
James McQuillan [Mon, 7 Apr 2014 20:00:20 +0000 (16:00 -0400)]
MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity.
sam marshall [Fri, 21 Mar 2014 12:26:23 +0000 (12:26 +0000)]
MDL-44070 Conditional availability enhancements (10): autogenerated
Includes all the autogenerated files (to make it easier/less worrying
when reviewing and rebasing).
sam marshall [Fri, 21 Mar 2014 11:34:15 +0000 (11:34 +0000)]
MDL-44070 Conditional availability enhancements (9): wider changes
Changes to arbitrary areas of code that are necessary after the new
API (mostly to replace deprecated function calls).
sam marshall [Wed, 26 Mar 2014 13:24:58 +0000 (13:24 +0000)]
MDL-44070 Conditional availability enhancements (8): display
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.
This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
sam marshall [Wed, 26 Mar 2014 11:49:44 +0000 (11:49 +0000)]
MDL-44070 Conditional availability enhancements (7): forms
Changes to the module and section editing forms to use the new
fields and JavaScript.
