47432 Commits

Author SHA1 Message Date
Petr Skoda
b8df9414bd weekly release 2.1dev 2011-04-27 12:09:15 +02:00
Petr Skoda
e0dd7cb005 MDL-23532 fix missing include 2011-04-27 08:56:12 +02:00
Aparup Banerjee
20b503841b MDL-25840 blog - fixed broken image file image attachment display 2011-04-27 11:39:01 +08:00
Aparup Banerjee
60b5a2fec7 MDL-27251 Files API - added timeout re-calculation as an optional argument. added setting for minimum Kbps for large files fetched from internet where the passed in timeout maybe too low.
allowed turning off the http HEAD request timeout calculation with zero (or negative) bitrate

	This was added in to allow servers that have a problem with
	HEAD requests to carry on with the given timeout without re-calculations.
	See PULL-651 for the discussion.

	the optional argument to force recalculation of timeout has been forced within scorm/locallib.php

	timeout re-calculation only increments timeout.
2011-04-27 10:49:40 +08:00
Eloy Lafuente (stronk7)
b90b28e2cb Merge branch 'w17_MDL-26249_m21_usercourses' of git://github.com/skodak/moodle 2011-04-26 11:33:46 +02:00
Eloy Lafuente (stronk7)
0cd053b40b Merge branch 'w17_MDL-27253_m21_swfsize' of git://github.com/skodak/moodle 2011-04-26 11:08:05 +02:00
Eloy Lafuente (stronk7)
0540e39af9 Merge branch 'w17_MDL-27263_m21_loggedintypo' of git://github.com/skodak/moodle 2011-04-26 11:04:39 +02:00
Petr Skoda
039d221e49 Merge branch 'wip-MDL-26770-master' of git://github.com/samhemelryk/moodle 2011-04-25 17:51:41 +02:00
Petr Skoda
6bc62c4486 Merge branch 'wip-MDL-23532-master' of git://github.com/samhemelryk/moodle 2011-04-25 17:50:01 +02:00
Petr Skoda
3364dbb5a4 MDL-26249 external enrol functions: get list of courses user is enrolled in 2011-04-25 10:53:29 +02:00
Petr Skoda
7774aca0fb MDL-27253 add default swf size and allow #d=100x50 URL resizing in mod/url 2011-04-21 20:35:48 +02:00
Petr Skoda
3c2fffbaa7 MDL-27263 fix already logged in error message typo 2011-04-21 20:35:16 +02:00
Sam Hemelryk
75ee207b81 MDL-26770 enrol - Added support for bulk operations by enrol plugins 2011-04-21 10:13:13 +08:00
Sam Hemelryk
884faffda3 MDL-23532 enrol - fixed up SQL indenting and added missing sesskey calls that were removed after refactoring 2011-04-21 10:02:55 +08:00
Sam Hemelryk
d4c98cffa8 MDL-23532 enrol - rebased after latest weekly and split new UI components out to the manual plugin 2011-04-21 10:02:55 +08:00
Sam Hemelryk
12a52d7c6e MDL-23532 enrol - removed general handling of user enrolment editing/unenrolment plugins are now responsible for this 2011-04-21 10:02:55 +08:00
Sam Hemelryk
8c6e0ebebb MDL-23532 enrol-self - Self enrolments now manages its own enrolment editing and unenrolment 2011-04-21 10:02:55 +08:00
Sam Hemelryk
24a0c1ea66 MDL-23532 enrol-manual - manual enrolments now manages its own enrolment editing and unenrolment 2011-04-21 10:02:55 +08:00
Sam Hemelryk
291215f441 MDL-23532 enrol - abstracted user enrolment action icons to the enrolment plugin class 2011-04-21 10:02:54 +08:00
Sam Hemelryk
410135aa10 MDL-23532 theme-base - added base styles for the changes to tne enrolment UI 2011-04-21 10:02:54 +08:00
Sam Hemelryk
076995bf91 MDL-23532 enrol - fixed regressions after latest weekly and improved moodle_page handling 2011-04-21 10:02:54 +08:00
Sam Hemelryk
cf855c0b7a MDL-23532 enrol - separated AJAX functions from enrol/ajax.php to their respective enrol plugins 2011-04-21 10:02:54 +08:00
Sam Hemelryk
b69ca6bee4 MDL-23532 enrol - moved UI enrolment components from core enrol to their respective enrolment plugins 2011-04-21 10:02:54 +08:00
stabijoh
6e405dafde MDL-27252 themes - fix for nonzero current section highlighting 2011-04-20 12:54:45 -04:00
Eloy Lafuente (stronk7)
4452ed6f17 weekly release 2.1dev 2011-04-20 13:35:08 +02:00
Eloy Lafuente (stronk7)
329b79139e Fix permissions 2011-04-20 11:08:21 +02:00
Aparup Banerjee
eb183fe469 MDL-26580 adding precautionary upgrade_set_timeout() calls to some loops which may timeout in very edge cases 2011-04-19 17:52:35 +08:00
Aparup Banerjee
f5fa4c0e02 MDL-26580 adding some upgrade_set_timeout() calls to 2010080901 upgrade block, upgrades on questions were timing out 2011-04-19 17:38:54 +08:00
Sam Hemelryk
4d8bd3f570 Merged with small fix branch MDL-26516_head from git://github.com/rwijaya/moodle.git 2011-04-19 16:25:40 +08:00
John Stabinger
572427d2f8 Fixes for MDL-27138, add correct page headers and footer 2011-04-19 11:06:54 +08:00
Sam Hemelryk
d1d087991f MDL-26835 Fixed up styles being used for suspended users in the grader report. 2011-04-19 10:42:49 +08:00
Sam Hemelryk
9146566c65 Merged with conflict resolution branch MDL-26835_MASTER_grader_highlight_suspended_users from git://github.com/andyjdavis/moodle.git 2011-04-19 10:35:50 +08:00
Sam Hemelryk
fc3e922e65 MDL-25999 Fixed URL bug with admin bookmark changes 2011-04-19 10:22:46 +08:00
Sam Hemelryk
d0542700f5 Merge branch 'MDL-25999_head' of git://github.com/rwijaya/moodle 2011-04-19 10:16:39 +08:00
Rossiani Wijaya
f4700b91c1 MDL-26516: fix calendar event type (user overides)- master 2011-04-18 18:27:10 +08:00
Eloy Lafuente (stronk7)
f50a61fb47 MDL-26167 lib/form: minor coding tweaks 2011-04-18 11:42:27 +02:00
Rossiani Wijaya
53758125dc MDL-25999: update Admin Bookmarks block to work properly in head 2011-04-18 17:31:35 +08:00
Eloy Lafuente (stronk7)
ff6b4cdb6d Merge branch 'MDL-26167-master' of git://github.com/agwells/moodle 2011-04-18 11:09:38 +02:00
Eloy Lafuente (stronk7)
e62ea95dfc Merge branch 'w16_MDL-17344_m21_uploadprof' of git://github.com/skodak/moodle 2011-04-18 11:02:09 +02:00
Andrew Davis (andyjdavis)
3aafffc043 MDL-26835 gradebook: grader report now marks suspended students 2011-04-18 14:29:13 +08:00
Sam Hemelryk
5d53a674b7 MDL-26958 theme-base Removed border color CSS 2011-04-18 10:54:12 +08:00
Mary Evans
1559583ce3 MDL-26958 Core Themes:adding css patch to base theme so hidden elements are dimmed
This patch also fixes MDL-27160 - the same bug which affects many CORE themes like Binarus and Nonzeo. This patch also a small element of a patch supplied by Thomas Lake in Tracker MDL-26958 (most of which already exists in Base theme).
2011-04-18 10:49:07 +08:00
Andrew Davis (andyjdavis)
4f82032a16 MDL-27153 gradebook - fixed an SQL error in grade export 2011-04-18 02:04:57 +02:00
Eloy Lafuente (stronk7)
20d8d5c799 MDL-27148 whitespace fix 2011-04-18 01:38:41 +02:00
Eloy Lafuente (stronk7)
97fefd2386 Merge branch 'w16_MDL-27148_m21_stringinc' of git://github.com/skodak/moodle 2011-04-18 01:15:56 +02:00
Eloy Lafuente (stronk7)
dd92611ec5 Merge branch 'w16_MDL-27217_m21_tinyset' of git://github.com/skodak/moodle 2011-04-18 01:10:29 +02:00
Eloy Lafuente (stronk7)
47f89dc8a6 Merge branch 'w16_MDL-27220_m21_tagprofile' of git://github.com/skodak/moodle 2011-04-18 01:02:23 +02:00
Petr Skoda
af4378aee9 Merge branch 'master_MDL-26880_SCORM2004_tracking_fix' of git://github.com/danmarsden/moodle 2011-04-17 17:16:03 +02:00
Petr Skoda
13516b7c1f Merge branch 'master_MDL-24734_gradefix' of git://github.com/danmarsden/moodle 2011-04-17 17:09:05 +02:00
Petr Skoda
6b7fb33661 Merge branch 'master_MDL-18392_slash_cleanup' of git://github.com/danmarsden/moodle 2011-04-17 17:02:15 +02:00