62732 Commits

Author SHA1 Message Date
Damyon Wiese
e1e9ade581 MDL-30852 grade: Coding style fix for user report. 2013-08-02 14:40:23 +08:00
Steve Bader
f19dd840ff MDL-30852 grade report: Add aria attributes
Converted to git branch by Damyon
2013-08-02 13:57:27 +08:00
Sam Hemelryk
a31e811563 weekly release 2.6dev 2013-08-02 08:21:15 +12:00
Sam Hemelryk
3d2128f6d4 NOBUG: fix file permissions 2013-08-02 08:17:40 +12:00
Sam Hemelryk
b3db9ddaf8 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-08-02 08:11:35 +12:00
Sam Hemelryk
6cd213567b MDL-40842 behat: fixed a typo 2013-08-01 20:15:29 +12:00
Sam Hemelryk
81387cafd5 MDL-40842 behat: Reverting to backtrace catchall as xdebug warnings were being missed 2013-08-01 17:03:25 +12:00
Sam Hemelryk
4c2892c654 MDL-40842 output: fixed fatal error display bug - thanks Marina for spotting it! 2013-08-01 16:52:34 +12:00
Damyon Wiese
1444b2ee5a MDL-39814 actionmenu: Version bump for css changes. 2013-08-01 09:42:42 +08:00
Sam Hemelryk
f803ce267f MDL-39814 actionmenu: tweaked the action menu post integration
The following changes have been made:
 * course_section_cm_edit_actions now allows the caller more options for the
   display of the action menu.
 * The site menu block now disables the JS enhancement of the actionmenu so
   that it displays as it did before. After more testing this seemed like the
   only option that worked in the limited space of the block when it had
   several modules.
 * draganddrop of resources now triggers the action menu enhancement as well.
 * Fixed display of title when the menu is not being enhanced by JS.
 * Fixed the alignment of the completion icon in the bootstrapbase theme.
 * Tweaked the CSS for the standard theme.
2013-08-01 13:05:04 +12:00
Sam Hemelryk
4a4d57ae1f Merge branch 'MDL-35053' of git://github.com/timhunt/moodle 2013-08-01 09:47:57 +12:00
Tim Hunt
1cca4e4327 MDL-35053 question files outside attempts. Fix back-compatibility. 2013-07-31 18:00:52 +01:00
Sam Hemelryk
b05cfa0e67 MDL-39430 phpunit: skip unmet optional environment checks 2013-07-31 10:46:44 +12:00
Sam Hemelryk
6867a78d75 Merge branch 'w31_MDL-39430_m26_opcache' of https://github.com/skodak/moodle 2013-07-31 09:11:22 +12:00
Paul Charsley
d1ec5c839a MDL-40547 assign: tests for workflow/allocation 2013-07-30 16:02:21 +08:00
Dan Poltawski
6d2fc575a6 Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle 2013-07-30 14:09:24 +08:00
Dan Poltawski
857e3ecb6c Merge branch 'w31_MDL-40898_m26_openhandles' of https://github.com/skodak/moodle 2013-07-30 14:06:04 +08:00
Petr Škoda
fba8cef3a3 MDL-39915 fix core_code_testcase regression
Thanks Dan!
2013-07-30 07:56:24 +02:00
Dan Poltawski
e4469ed8bf Merge branch 'wip-MDL-39814-m26' of git://github.com/samhemelryk/moodle 2013-07-30 12:19:39 +08:00
Sam Hemelryk
ea5a01fbe5 MDL-39814 frontend: pre-integration fixes:
* Fixed IE8 display of icons.
* Fixed blocks using course renderer.
* Fixed behat tests.
* codecheckers fixes
* Removed alt from icons with descriptive text
* Tweaked actionmenu initialisation for performance
2013-07-30 16:15:58 +12:00
Sam Hemelryk
10fc156933 MDL-39814 frontend: added options to disable new action menus
Also:
 * Tidied up patch as per peer-reviews
2013-07-30 16:15:52 +12:00
Sam Hemelryk
3665af78ca MDL-39814 actionmenu: improved alignment, constraint handling, and accessibility 2013-07-30 16:15:26 +12:00
Sam Hemelryk
e5de4933b0 MDL-39814 frontend: redeveloped overlay to correct tab-flow
Also:
 * fixed zindex issue + spinner placement
 * added notes to course format and theme upgrade texts
 * fixed behat tests after action menu changes
2013-07-30 16:15:19 +12:00
Sam Hemelryk
202fcfa130 MDL-39814 frontend: increased size of editing icons for activities 2013-07-30 16:15:12 +12:00
Sam Hemelryk
cf69a00a1c MDL-39814 frontend: introduced an action_menu_action class 2013-07-30 16:15:05 +12:00
Sam Hemelryk
b59f2e3bef MDL-39814 frontend: improved display of activities and the menu 2013-07-30 16:14:56 +12:00
Sam Hemelryk
e282c679e3 MDL-39814 frontend: improvements to course/block editing 2013-07-30 16:07:26 +12:00
Dan Poltawski
d713ba95f0 Merge branch 'MDL-40548' of https://github.com/Lightwork-Marking/moodle 2013-07-30 09:58:21 +08:00
Sam Hemelryk
56c3e4762f Merge branch 'MDL-40902_master' of https://github.com/nadavkav/moodle 2013-07-30 10:36:49 +12:00
Sam Hemelryk
c6457b8acf Merge branch 'MDL-35053' of git://github.com/timhunt/moodle 2013-07-30 10:21:38 +12:00
Sam Hemelryk
4960ca0738 Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle 2013-07-30 10:19:41 +12:00
Sam Hemelryk
9459ccc974 NOBUG fixed whitespace 2013-07-30 10:08:51 +12:00
Sam Hemelryk
a2d847842e Merge branch 'MDL-40746_master' of git://github.com/grabs/moodle 2013-07-30 09:40:40 +12:00
Sam Hemelryk
816f873068 Merge branch 'wip-MDL-40897-master' of git://github.com/marinaglancy/moodle 2013-07-30 09:39:03 +12:00
Sam Hemelryk
867eba7641 Merge branch 'w31_MDL-39786_m26_metarole' of https://github.com/skodak/moodle 2013-07-30 09:33:56 +12:00
Frederic Massart
d72d541db5 MDL-40615 Repository: Updated Amazon S3 library
Fixed insecure use of CURLOPT_SSL_VERIFYHOST
2013-07-30 09:03:59 +12:00
Sam Hemelryk
6cef3dfe8e Merge branch 'MDL-39461_dev' of https://github.com/totara/openbadges 2013-07-30 08:59:58 +12:00
Sam Hemelryk
0d33dbd9b8 Merge branch 'MDL-38759-master' of https://github.com/mackensen/moodle 2013-07-30 08:58:14 +12:00
Sam Hemelryk
73b4c1da84 Merge branch 'MDL-40678-m' of git://github.com/andrewnicols/moodle 2013-07-30 08:55:35 +12:00
Sam Hemelryk
fb947a424a Merge branch 'wip-MDL-40660-master' of git://github.com/phalacee/moodle 2013-07-30 08:47:34 +12:00
Dan Poltawski
ef3a268060 Merge branch 'w31_MDL-40900_m26_32unzip' of https://github.com/skodak/moodle 2013-07-29 16:56:40 +08:00
Dan Poltawski
f7d374bd8f Merge branch 'w31_MDL-40887_m26_minify' of https://github.com/skodak/moodle 2013-07-29 16:49:39 +08:00
Dan Poltawski
0ae497f03a Merge branch 'MDL-39404' of git://github.com/jmvedrine/moodle 2013-07-29 16:29:59 +08:00
Petr Škoda
f83037e8e7 MDL-40887 import latest minify 2.1.7 2013-07-29 09:50:20 +02:00
Dan Poltawski
b47b4ffd91 Merge branch 'wip-MDL-40847-m26' of git://github.com/samhemelryk/moodle 2013-07-29 15:28:17 +08:00
Dan Poltawski
86005f4884 Merge branch 'MDL-40867' of git://github.com/timhunt/moodle 2013-07-29 15:23:42 +08:00
Dan Poltawski
50aa2587a4 Merge branch 'MDL-40618_restore_get_questions' of https://github.com/mr-russ/moodle 2013-07-29 14:14:58 +08:00
Dan Poltawski
48638b915d Merge branch 'MDL-40323-master' of https://github.com/mackensen/moodle 2013-07-29 13:59:55 +08:00
Dan Poltawski
8cb1af9a18 Merge branch 'MDL-40857' of git://github.com/timhunt/moodle 2013-07-29 13:55:25 +08:00
Dan Poltawski
62ea0cb846 Merge branch 'wip-MDL-40842-m26' of git://github.com/samhemelryk/moodle 2013-07-29 13:48:19 +08:00