moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48899 commits 37 branches 544 tags 1.3 GiB
Commit graph

48899 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
babbab1449 Merge branch 'MDL-27040' of git://github.com/timhunt/moodle 2011-07-06 19:25:47 +02:00
Eloy Lafuente (stronk7)
cb600c4606 Merge branch 'MDL-28166' of git://github.com/timhunt/moodle 2011-07-06 19:03:59 +02:00
Tim Hunt
6c7da46108 MDL-26165 quiz submit are-you-sure is potentially confusing. 2011-07-06 14:49:38 +01:00
Tim Hunt
8f78cd5abc MDL-28195 confirm_action should allow the button labels to be customised 2011-07-06 14:47:30 +01:00
Tim Hunt
81522abd63 MDL-28166 fix some more instances of my favourite becuase typo. 2011-07-06 14:19:25 +01:00
Tim Hunt
cbb8b55c33 MDL-28166 send quiz event notifications asynchronously. 
This avoids the problem that you cannot send messages in transactions.

It also means that the quiz submission will not be prevented, and the
message will still be sent eventually, if any part of the messaging
system is giving intermittent errors when the student wants to submit
their quiz.
 2011-07-06 14:16:30 +01:00
Rossiani Wijaya
fd9672ac65 MDL-27931 admin bulk user upload: convert city as required field. Credit goes to Charles Fulton for supplying the patch. 2011-07-06 15:13:16 +08:00
Sam Hemelryk
8f49f9ce8e Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle 2011-07-06 13:24:47 +08: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
024ad4bd82 Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle 2011-07-06 12:03:33 +08:00
Sam Hemelryk
1a3c5d2366 Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle 2011-07-06 11:19:27 +08:00
Sam Hemelryk
8323432992 Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle 2011-07-06 11:06:20 +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)
ea9ad8f175 Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle 2011-07-06 03:13:11 +02:00
Eloy Lafuente (stronk7)
7edcd093b6 Merge branch 'MDL-28160' of git://github.com/timhunt/moodle 2011-07-06 03:06:34 +02: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)
34d5507ab8 Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle 2011-07-06 01:52:32 +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)
9a160c7c46 MDL-28196 quiz calls get_in_or_equal (fixing missing $DB) 2011-07-05 22:02:30 +02:00
Eloy Lafuente (stronk7)
476ea4f8ce Merge branch 'MDL-28196' of git://github.com/timhunt/moodle 2011-07-05 19:55:31 +02:00
Dan Poltawski
fe50898ebc MDL-23580 course overview - remove debugging junk 2011-07-05 18:46:08 +01:00
Eloy Lafuente (stronk7)
6ce986e54c Merge branch 'MDL-27821' of git://github.com/timhunt/moodle 2011-07-05 19:41:32 +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
Tim Hunt
b149b78859 MDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places 
Also, another minor error in one method call.
 2011-07-05 14:29:30 +01: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
Kordan
c5b7c9357f addition to previous fix for MDL-27989 in master 2011-07-05 11:32:20 +02:00
Dan Poltawski
f2ad165538 MDL-26611 Roles Language - remove reference to 'legacy role type' 2011-07-05 10:23:00 +01:00
Sam Hemelryk
ee992c6c66 Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle 2011-07-05 16:51:49 +08:00
Kordan
7843d2d609 MDL-27989 fix for master 2011-07-05 10:26:01 +02:00
Rossiani Wijaya
54c37fbd88 MDL-27555 assignment module: remove 'submitted' option from optional setting for offline assignment type. 2011-07-05 15:33:33 +08:00
Aparup Banerjee
3b1b5018f7 MDL-28135 general Updated broken and typo docs links 2011-07-05 14:41:29 +08:00
Aparup Banerjee
19b4d9d831 MDL-28135 general Updated the Copyright notice to point to docs.moodle.org/dev/Releases instead of en/Release 2011-07-05 14:30:24 +08:00
Aparup Banerjee
43d26e6d73 MDL-28135 general Updated doc links related to Release notes to docs.moodle.org/dev/Releases now 2011-07-05 14:29:47 +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
Iñaki Arenaza
971db6a110 MDL-24666 sync_users.php can throw db exception on sites upgraded from 1.x 
From 2.0 on we lowercase all the settings related to LDAP attributes
to cope with differences in LDAP servers when returning attribute
names as array indices (some lowercase them, some leave them as
specified in the query, some normalize them, etc.).

But we only lowercase them when saving the settings page. So on sites
that have been migrated from 1.x, it may happen that we still have
mixed-case attribute names. And this is fatal for the user_attribute
setting, as we might not detect it in the returned array from LDAP and
it will be empty (and the db layer throws and exception).

So we just make sure the attribute name is lowercased (and trimmed,
in case it's got some white space around it).

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
 2011-07-04 21:47:43 +02: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
3f8465ca4b MDL-28117 include repo lib when hacking file_picker renderer 2011-07-04 17:09:28 +02: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
6b92faa47f MDL-27821 backup_exception should not throw away debug info. 2011-07-04 15:35:30 +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
e1c2a211f2 MDL-28147 do not double cache theme css/js 2011-07-04 11:29:23 +02:00
Petr Skoda
b216a820a1 MDL-28161 precreate htmlpurifier dir when resetting caches 
Includes sloppy whitespace fix.
 2011-07-04 09:48:03 +02:00
Sam Hemelryk
b8d3c3f76e MDL-28172 forum: Fixed up overzealous check for portfolio enabled. 2011-07-04 15:04:16 +08:00