Commit graph

12141 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
26635fd7f9 Merge branch 'MDL-28169' of git://github.com/nebgor/moodle 2011-07-07 10:21:32 +02:00
Rossiani Wijaya
c65f0b6fb5 MDL-27755 course search: Add course id and shortname to search fields 2011-07-07 15:02:11 +08:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7)
babbab1449 Merge branch 'MDL-27040' of git://github.com/timhunt/moodle 2011-07-06 19:25:47 +02:00
Tim Hunt
8f78cd5abc MDL-28195 confirm_action should allow the button labels to be customised 2011-07-06 14:47:30 +01:00
Sam Hemelryk
50c1cb0394 Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle 2011-07-06 13:17:54 +08:00
Sam Hemelryk
5b966cbb3b Merge branch 'MDL-28135' of git://github.com/nebgor/moodle 2011-07-06 10:53:48 +08:00
Eloy Lafuente (stronk7)
87cc19de07 Merge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle 2011-07-06 02:54:12 +02:00
Eloy Lafuente (stronk7)
b2dfa10d5a Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle 2011-07-06 02:05:20 +02:00
Eloy Lafuente (stronk7)
ed436add99 Merge branch 'MDL-28179' of git://github.com/timhunt/moodle 2011-07-06 01:45:15 +02:00
Eloy Lafuente (stronk7)
60ee61147d Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle 2011-07-06 01:29:27 +02:00
Eloy Lafuente (stronk7)
dd927fcefb Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle 2011-07-05 17:58:55 +02:00
Eloy Lafuente (stronk7)
555ac02985 Merge branch 'MDL-26618' of git://github.com/timhunt/moodle 2011-07-05 17:46:46 +02:00
Ruslan Kabalin
9f05a1a640 MDL-28186 messaging: Fix "Enable messagning setting" infuence on the menus
"Enable messaging system" (Site administration > Advanced features) is
supposed to control messaging between site users only, thus it should not
remove user messging preferences menu item. However, it may remove instant
messging preferences from providers list for the user.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-07-05 15:35:52 +01:00
Eloy Lafuente (stronk7)
89526681cb MDL-28185 upgrade - fix oracle problem upgrading blocks 2011-07-05 15:37:16 +02:00
Andrew Robert Nicols
b7eceef75f MDL-28193 Add $external arg to get_driver_instance
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2011-07-05 12:22:41 +01:00
Aparup Banerjee
3b1b5018f7 MDL-28135 general Updated broken and typo docs links 2011-07-05 14:41:29 +08:00
Aparup Banerjee
728ebac7f2 MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/" 2011-07-05 14:27:31 +08:00
Tim Hunt
99fa9745c4 MDL-28179 make failed event hander error message much more useful. 2011-07-04 18:55:45 +01:00
Tim Hunt
abc2575493 MDL-27040 get_users_by_capability generates u.id IN () when no uesrs have accessallgroups 2011-07-04 18:50:21 +01:00
Petr Skoda
5607036a55 MDL-28167 fix missing new
And sloppy whitespace.
2011-07-04 16:42:55 +02:00
Tim Hunt
fd3932fe54 MDL-26618 Moving sticky blocks on other pages does not work in Oracle.
This was due to some missing $DB->sql_empty() in a query affecting the
block_positions table.
2011-07-04 15:36:16 +01:00
Tim Hunt
c141b05f7d MDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 sections at an choice.
Also fix one bad <br/> in another lang string.
2011-07-04 15:35:03 +01:00
Petr Skoda
b216a820a1 MDL-28161 precreate htmlpurifier dir when resetting caches
Includes sloppy whitespace fix.
2011-07-04 09:48:03 +02:00
Dan Poltawski
8b0614d9ea MDL-27855 navigation - only display participants link with permissions 2011-07-03 10:52:32 +01:00
Eloy Lafuente (stronk7)
ddaa914789 MDL-27829 block creation - ensure correct pagetypepattern in mod/ pages 2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
d72129829f Merge branch 'MDL-28133' of git://github.com/timhunt/moodle 2011-07-01 01:10:06 +02:00
Eloy Lafuente (stronk7)
f9d2eb4f20 Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle 2011-07-01 00:54:35 +02:00
Jamie Pratt
1e257a3a54 NOBUG if we are going to reuse the functions used within the evalmath code then
the calling api should not be weird with reversed parameters etc.
2011-06-30 17:50:05 +01:00
Jamie Pratt
9085134ed7 MDL-27659 "have evalmath accept numbers expressed with scientific
notation"
2011-06-30 17:49:49 +01:00
Jamie Pratt
4733133533 NOBUG fixed some coding style deviations in unit test code. Mostly
white space changes and added scope declarations to unit test
functions.
2011-06-30 17:49:31 +01:00
jamiepratt
e2beee5880 NOBUG move pattern for func and var names into a static var and make a function to test a string to see if it is a valid func or var name. 2011-06-30 17:49:01 +01:00
Eloy Lafuente (stronk7)
db0fe3b295 Merge branch 'MDL-28061' of git://github.com/rwijaya/moodle 2011-06-30 16:22:20 +02:00
Rossiani Wijaya
0c8d3939bc MDL-28061 mediaplugins filter: add aac audio node to filetypes.mm, fixed string mistype within the admin setting page (acc -> aac) and add mediaplugin_html5audio css class to align the player/link like the rest. 2011-06-30 19:29:07 +08:00
Jamie Pratt
5b5206e1cb MDL-28099 Fixed regression as outlined in tracker. 2011-06-30 14:34:10 +07:00
Eloy Lafuente (stronk7)
4ea6ce7e39 Merge branch 'MDL-28044' of git://github.com/nebgor/moodle 2011-06-30 01:59:49 +02:00
Eloy Lafuente (stronk7)
0bde123fa8 Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle 2011-06-30 01:13:34 +02:00
Eloy Lafuente (stronk7)
a092e9bc42 Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle 2011-06-30 00:55:20 +02:00
Eloy Lafuente (stronk7)
586fecb80b Merge branch 'MDL-27149' of git://github.com/timhunt/moodle 2011-06-30 00:20:43 +02:00
Eloy Lafuente (stronk7)
be13d37a02 Merge branch 'MDL-28074' of git://github.com/timhunt/moodle 2011-06-29 23:09:13 +02:00
Tim Hunt
56a4ae4673 MDL-28074 question preview should set context/course/cm properly.
1. We need this so that, for example, when previewing a question from
the quiz editing page, the preview uses the filter settings, theme and
language set for that quiz and course.
2011-06-29 21:25:56 +01:00
Eloy Lafuente (stronk7)
f4eeee5bd5 Merge branch 'pagelib_single' of git://github.com/marxjohnson/moodle 2011-06-29 21:00:06 +02:00
Eloy Lafuente (stronk7)
76feb947b6 Merge branch 'MDL-28028' of git://github.com/timhunt/moodle 2011-06-29 20:58:27 +02:00
Eloy Lafuente (stronk7)
1333c05ebe Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle
Conflicts:
	lib/db/services.php
	version.php
2011-06-29 20:00:49 +02:00
Eloy Lafuente (stronk7)
3a4c390c53 Merge branch 's11_MDL-27976_get_users_by_courseid_master' of github.com:dongsheng/moodle 2011-06-29 19:50:39 +02:00
Eloy Lafuente (stronk7)
0822174adc Merge branch 'MDL-27812_front_page_blocks' of git://github.com/andyjdavis/moodle 2011-06-29 15:29:14 +02:00
Jamie Pratt
b1eca34453 MDL-28099 fixes issue with filepicker and element names with index not passing
value for draftitemid.
2011-06-29 18:39:15 +07:00
Sam Hemelryk
f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Dongsheng Cai
014792901d MDL-27976 webservice moodle_user_get_users_by_courseid webservice 2011-06-29 15:41:31 +08:00
Sam Hemelryk
797cedc7cf MDL-25249 Tidied up calendar variable passing and removed session abuse 2011-06-29 14:50:38 +08:00