47270 Commits

Author SHA1 Message Date
Petr Skoda
6bc62c4486 Merge branch 'wip-MDL-23532-master' of git://github.com/samhemelryk/moodle 2011-04-25 17:50:01 +02: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
Petr Skoda
e87ca54256 Merge branch 'MDL-27198-master' of git://github.com/sammarshallou/moodle 2011-04-17 16:37:54 +02:00
Petr Skoda
c001225250 Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2 2011-04-17 16:30:41 +02:00
Petr Skoda
c6423ea2de Merge branch 'wip-MDL-26013-master' of git://github.com/samhemelryk/moodle 2011-04-17 16:21:51 +02:00
Petr Skoda
bdc782470b Merge branch 'wip-MDL-27145-master' of git://github.com/samhemelryk/moodle 2011-04-17 16:11:49 +02:00
Petr Skoda
3867494381 MDL-27123 fix coding style and add missing parameters in phpdocs 2011-04-17 16:06:19 +02:00
Petr Skoda
2b8747799e MDL-27217 use correct editor name in editor settings page
Credit goes to Franck Bellemain.
2011-04-17 11:18:49 +02:00
Petr Skoda
da84c1491f MDL-27220 add missing tag lib include 2011-04-17 11:08:24 +02:00
Dan Marsden
4f4a8acf3b SCORM MDL-24734 - fix display of grade information on view.php page - also fixes some XHTML in the same function. 2011-04-16 19:34:04 +12:00
Aaron Wells
4b72f9eb78 MDL-26167 lib/form: Altering Javascript so that "disabledIf" will disable the "Choose" button for a filepicker 2011-04-15 09:59:46 +12:00
sam marshall
611684a8ec MDL-27198 Accessibility: For labels, completion/editing icons must appear after content 2011-04-14 17:31:14 +01:00
Petr Skoda
cf717dc26b MDL-27148 use new get_in_or_equal() param prefix instead of start 2011-04-14 15:15:01 +02:00
Petr Skoda
c49bec382c MDL-27148 fix unit tests to accept arbitrary named params format from get_in_or_equal 2011-04-14 15:12:33 +02:00