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
Petr Skoda
906c957b63
MDL-27148 use static counter instead of incrementing parameter name
2011-04-14 14:50:35 +02:00
John Beedell
7351b54e86
MDL-27123 adds a new admin_setting_configmultiselect_modules class
...
and uses it on the module security page. This saves one DB query per
page for users who can see the admin tree in the settings nav.
2011-04-14 12:25:41 +01:00
Petr Skoda
623966a396
MDL-17344 fix case and unicode related profile field issues in user upload
...
This fixes issue with uppercase and non-ascii profile fields and closes the iterator properly when field not found. Please note that profile fields with upper case letters must be specified exactly in CSV file headers. includes improved docs and parameter typo fix (credit for the parameter typo discovery goes to Aparup Banerjee)
2011-04-14 13:19:52 +02:00
Nadav Kavalerchik
b41fc49c26
CSS MDL-26013 Fixed several display bugs when using right to left languages
2011-04-14 15:56:10 +08:00
Matteo Scaramuccia
74ef6bd82d
PULL-498 - Fixed potential issues about UTF-8 and multilang filter by adopting pure ASCII chars, the SCO primary key
2011-04-14 10:28:36 +12:00
Matteo Scaramuccia
0ec0224b9a
MDL-26880 - Fixed missing of activity id
...
Moved errorCode as global, to allow GetLastError() to work
Applied MDL-17891 mechanism against AJAX failures, "true if true, false otherwise"
Limited what added to log when in debug, to be compliant with mdl_log.action as VARCHAR(40)
2011-04-14 10:28:31 +12:00
Dan Marsden
4f6e39db5e
Merge remote branch 'moodle/master' into master_MDL-18392_slash_cleanup
2011-04-14 09:15:48 +12:00
Petr Skoda
91787c37e1
weekly release 2.1dev
2011-04-13 22:09:33 +02:00
Petr Skoda
2c55034844
Merge branch 'MDL-24355_emergency_21' of git://github.com/stronk7/moodle
2011-04-13 16:48:38 +02:00
Eloy Lafuente (stronk7)
1c2cfff051
MDL-24355 tags - fix correlation sql to be cross-db
2011-04-13 16:31:09 +02:00
Petr Skoda
fe0ccf0c79
Merge branch 'MDL-27053-dev-code-warning' of git://github.com/mudrd8mz/moodle
2011-04-13 15:23:33 +02:00
Petr Skoda
9015609696
Revert "MDL-25840 fixed image files link not rendered correctly when attached as file (instead of inline)."
...
The reason is failed testing. This reverts commit c9b0e31ff29adef113a4adc746bc9169cdddd259.
2011-04-13 15:06:39 +02:00
David Mudrak
a95682b2b3
MDL-27053 Code maturity info added to admin notifications page
...
The patch introduces a new string to be displayed at admin notifications
page. The maturity level message for upgrade/install reworded as
requested in the tracker.
The patch also adds a new core call to purge all caches at the beginning
of the upgrade. This must be done before the upgrade starts so that the
strings are re-fetched from the updated source and not from the on-disk
cache.
2011-04-13 15:03:25 +02:00
David Mudrak
1c5ab635b6
MDL-27053 Revert "MDL-26985 make sure admins do not upgrade to 2.1dev accidentally"
...
This reverts commit 9778dae374b10a825b8e500e36958b92a6b4e9ad.
2011-04-13 14:08:32 +02:00
Dan Marsden
3825bed0e8
SCORM MDL-18392 - remove old call to stripslashes
2011-04-13 20:05:30 +12:00
Matteo Scaramuccia
454f5aeef6
SCORM MDL-18392 MDL-26282 - Fixed calls to add/strip slashes
2011-04-13 20:05:19 +12:00
Petr Skoda
2293a504eb
MDL-25718 fix incorrect 'no grade' test and improve coding style
2011-04-12 10:06:13 +02:00
Petr Skoda
d2e360a95b
Merge branch 'MDL-25718_recover_grades_master' of git://github.com/andyjdavis/moodle
2011-04-12 09:50:20 +02:00
Sam Hemelryk
fec617dee5
form-dateselector MDL-27145 Fixed up error resulting from incorrectly required 'optional' argument on create event
2011-04-12 14:14:34 +08:00
Eloy Lafuente (stronk7)
9ff913b716
Merge branch 'MDL-26778-master' of git://github.com/sammarshallou/moodle
2011-04-11 17:48:29 +02:00
Eloy Lafuente (stronk7)
72e97b5880
Merge branch 'w15_MDL-26577_m21_groupscleanup' of git://github.com/skodak/moodle
2011-04-11 15:55:33 +02:00