Commit graph

68128 commits

Author SHA1 Message Date
Andrew Nicols
c63f90539a 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.
2014-04-09 15:26:34 +08:00
Frederic Massart
97b97b6330 MDL-45010 mod_chat: Use H3 instead of H2 in recent activity info 2014-04-09 15:10:16 +08:00
Damyon Wiese
2471088111 MDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3. 2014-04-09 14:57:33 +08:00
Andrew Nicols
9b2fc5741e MDL-44844 core: Fix custom menu navigation
Atto introduced a rule to hide all Nodes with the yui3-menu-hidden class
but this rule is too general and applies to non-atto content too.

As a result, when loading the menu and during the XY calculation, the
native Element.getBoundingClientRect() function was returning a bounding
box size of 0 because the Node was not visible and the node was being
hidden from view when it was later made visible.
2014-04-09 14:50:02 +08:00
Marina Glancy
039d204abd MDL-44070 availability: corrected SQL to be mysql-compatible 2014-04-09 14:41:12 +08:00
Damyon Wiese
f1dce5734e MDL-44268 Assign: Fix behat test for assigned marker filter 2014-04-09 14:29:46 +08:00
Damyon Wiese
d6a3f559db MDL-44268 Assign: Improve the "not submitted" filter 2014-04-09 14:29:46 +08:00
Jonathon Fowler
c80d59f269 MDL-44268 assign: add 'not submitted' and 'no marker' filter options 2014-04-09 14:29:46 +08:00
Dan Poltawski
3c72b71191 Merge branch 'MDL-41123-master' of git://github.com/ankitagarwal/moodle 2014-04-09 14:03:42 +08:00
Damyon Wiese
43968c9f10 Merge branch 'mdl44669-master' of https://github.com/tlock/moodle 2014-04-09 13:05:46 +08:00
Dan Poltawski
a935cccb2b Merge branch 'MDL-31679' of git://github.com/aolley/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 12:49:35 +08:00
Dan Poltawski
c559161f4a Merge branch 'MDL-39759_http_response_code_master' of https://github.com/dongsheng/moodle 2014-04-09 12:38:30 +08:00
Dan Poltawski
28c247a735 MDL-44507 filemanger: fix coding style 2014-04-09 12:10:30 +08:00
Dan Poltawski
9eeacad9b8 Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 11:52:33 +08:00
Dan Poltawski
1b9a1e8128 Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle 2014-04-09 11:38:42 +08:00
Damyon Wiese
48dc9f0175 MDL-44927 Atto: Table editor typo that prevents creation of new tables. 2014-04-09 11:31:26 +08:00
Dan Poltawski
020af1058d Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle 2014-04-09 11:12:55 +08:00
Marina Glancy
47a1315f02 Merge branch '44944-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 09:48:41 +08:00
Sam Hemelryk
e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +12:00
AMOS bot
98f5b72acc Automatically generated installer lang files 2014-04-08 22:38:25 +00:00
Sam Hemelryk
6a90bc5e05 Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle 2014-04-09 10:37:05 +12:00
Sam Hemelryk
b983a5d869 Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle 2014-04-09 10:26:33 +12:00
Sam Hemelryk
6ef3728805 Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle 2014-04-09 10:15:50 +12:00
Sam Hemelryk
0a293483e8 MDL-39833 format: tidied up API improvement to allow for future backport 2014-04-09 10:09:44 +12:00
Sam Hemelryk
da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
Damyon Wiese
86bd7af5be MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images 2014-04-08 17:04:43 +08:00
Marina Glancy
d175d25adc Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 16:55:49 +08:00
David Scotson
a1071322f7 MDL-44468 backup: use html_writer::div call
Simplify the renderer code with the new html_writer
div function.
2014-04-08 09:46:42 +01:00
David Scotson
9b2a2ffe2a MDL-44468 backup: use notification API
Replace a hardcoded div.notifyproblem with a API call that,
in Standard theme, outputs the same HTML.

Also removes the .notifyproblem class from the heading,
as that might cause problems for themers who expect it to be
used consistently with the API.
2014-04-08 09:46:42 +01:00
Ankit Agarwal
e5f4487194 MDL-41123 report_completion: Add context validations to the events 2014-04-08 16:07:35 +08:00
Jason Fowler
0d5bfb9c65 MDL-44881 Filepicker: Fix alignment and padding on file-select dialog 2014-04-08 14:44:50 +08:00
Damyon Wiese
0610d2ca92 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
2014-04-08 14:18:50 +08:00
Dan Poltawski
a5cd92574d 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 2014-04-08 14:11:59 +08:00
Frederic Massart
050159dc9f MDL-44131 atto_equation: Equation library groups are aria toolbars 2014-04-08 14:08:54 +08:00
Damyon Wiese
48395a9cdb Merge branch 'wip-MDL-40907-master' of git://github.com/marinaglancy/moodle 2014-04-08 14:01:34 +08:00
Dan Poltawski
052d51b15f Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle 2014-04-08 13:53:19 +08:00
Damyon Wiese
392cb4577a MDL-44070 Conditional availability - white space fix 2014-04-08 13:49:15 +08:00
Marina Glancy
158379e173 MDL-40907 events: additional legacy logging for module update/add events" 2014-04-08 13:45:13 +08:00
Marina Glancy
957944dca8 MDL-40907 events: view list of resources in course 2014-04-08 13:45:09 +08:00
Marina Glancy
c3ba899abd MDL-40907 events: Allow one event write several entries to the legacy log table 2014-04-08 13:44:57 +08:00
Damyon Wiese
515fe565f6 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
2014-04-08 13:30:41 +08:00
Damyon Wiese
594a5c8c02 Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle 2014-04-08 12:32:49 +08:00
Damyon Wiese
19346e06cb Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle 2014-04-08 12:16:42 +08:00
Dan Poltawski
822b055c61 Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle 2014-04-08 12:12:01 +08:00
Damyon Wiese
9a6c091f1c MDL-44342 message_airnotifier: Fix shifter warnings in JS 2014-04-08 12:11:36 +08:00
Dan Poltawski
d0a3cec564 Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle 2014-04-08 12:07:15 +08:00
Dan Poltawski
9a59ebaa6c 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
2014-04-08 12:04:41 +08:00
Dan Poltawski
a0c2ac6b86 MDL-43682 report_loglive: commit built yui files 2014-04-08 12:03:37 +08:00
Sam Hemelryk
2891559fd5 MDL-43682 report_loglive: fixed lint warning in fetchlogs JS 2014-04-08 15:41:54 +12:00
Dan Poltawski
23cc5bbdc0 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
2014-04-08 11:37:25 +08:00