62756 Commits

Author SHA1 Message Date
Sam Hemelryk
6aed99dd0a Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle 2013-08-05 15:46:59 +12:00
Sam Hemelryk
2c5c56e974 Merge branch 'MDL-38758_master' of https://github.com/markn86/moodle 2013-08-05 15:37:37 +12:00
Sam Hemelryk
176a60227d Merge branch 'MDL-35922-master' of git://github.com/phalacee/moodle 2013-08-05 15:33:09 +12:00
Marina Glancy
f64777a93f Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle 2013-08-05 13:15:25 +10:00
Sam Hemelryk
4c7f0562d0 Merge branch 'MDL-35927' of git://github.com/rwijaya/moodle 2013-08-05 14:38:47 +12:00
Marina Glancy
40e0dbd5ac Merge branch 'MDL-40320-master' of git://github.com/sammarshallou/moodle 2013-08-05 12:30:56 +10:00
Marina Glancy
e22e263fa0 Merge branch 'MDL-35981-master' of git://github.com/damyon/moodle 2013-08-05 12:19:45 +10:00
Sam Hemelryk
2b80bb33df Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle 2013-08-05 14:15:27 +12:00
Sam Hemelryk
335fcfa4f9 Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle 2013-08-05 14:06:26 +12:00
Damyon Wiese
31d861d19b MDL-35981 comments: Fix for keyboard control of "add a comment" 2013-08-05 09:49:38 +08:00
Sam Hemelryk
324b489bdb Merge branch 'wip-MDL-34785-master' of git://github.com/marinaglancy/moodle 2013-08-05 13:36:56 +12:00
Marina Glancy
98260b31a5 Merge branch 'wip-mdl-40933' of git://github.com/rajeshtaneja/moodle 2013-08-05 10:48:36 +10:00
Marina Glancy
a9881c1750 MDL-34785 performance improvement with big list of courses 2013-08-05 10:13:19 +10:00
Petr Škoda
6b32d6bc93 MDL-40995 simplify minify integration and fix all known issues 2013-08-03 17:16:17 +02:00
Petr Škoda
528a7b447a MDL-41017 improve purify caching
The improvements include:

* HTMLPurifier cache is stored in localcachedir
* allowobjectembed changes are not ignored any more
* the cache keys include revision and all options which makes
  this suitable for local caches on cluster nodes
* unchanged test is replaced by "true" value which should
  significantly improve performance
* removal of purge_all_caches() hack for directory recreation
* comments and coding style cleanup
2013-08-03 11:31:18 +02:00
Petr Škoda
7c3943ad0c MDL-40889 prevent 304 when minimising JS 2013-08-02 16:27:34 +02:00
Damyon Wiese
fe1c01e751 MDL-35981 comments: Add comment about keycodes for space and enter. 2013-08-02 11:42:45 +08:00
Damyon Wiese
afc9ebd3e8 MDL-35981 comments: Remove confirm step from behat delete comments. 2013-08-02 11:42:45 +08:00
Damyon Wiese
ba29e212cd MDL-35981 comments: Make delete comment keyboard accessible. 2013-08-02 11:42:44 +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 marshall
be108c7ab0 MDL-40320 Course page: Text greyed when conditional activity available 2013-08-01 14:14:43 +01:00
Sam Hemelryk
6cd213567b MDL-40842 behat: fixed a typo 2013-08-01 20:15:29 +12:00
Rossiani Wijaya
f26cc2bea7 MDL-35927 filepicker: add aria attribute to display modal error 2013-08-01 15:38:07 +08: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
Jason Fowler
1641bee253 MDL-35922 - Adding aria attributes to create-folder modal 2013-07-31 16:40:43 +08: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
Davo Smith
2a081f127d MDL-40937 mod_assign - remove debugging code from 'previous submissions' javascript, that was breaking in IE8/IE9 2013-07-30 11:35:30 +01:00
Paul Charsley
d1ec5c839a MDL-40547 assign: tests for workflow/allocation 2013-07-30 16:02:21 +08:00
Rajesh Taneja
d9cfe855ac MDL-40933 Administration: Added 'is after' and 'is before' to date filter 2013-07-30 15:45:09 +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