53018 Commits

Author SHA1 Message Date
Dan Poltawski
35a1c03448 Merge branch 'MDL-27508-workshop-groups' of git://github.com/mudrd8mz/moodle 2012-05-01 11:16:20 +08:00
Dan Poltawski
3869858d3e Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle 2012-05-01 10:59:06 +08:00
Dan Poltawski
73d595faf3 Merge branch 'MDL-32181' of https://github.com/ppichet/moodle 2012-05-01 10:30:43 +08:00
Dan Poltawski
a4c9412b15 Merge branch 'w18_MDL-19071_m23_unicode' of git://github.com/skodak/moodle 2012-05-01 10:19:17 +08:00
Dan Poltawski
94b9d44f28 Merge branch 'w18_MDL-32586_m23_glibciconv' of git://github.com/skodak/moodle 2012-05-01 10:00:01 +08:00
Sam Hemelryk
7c30505be8 Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle 2012-05-01 13:43:07 +12:00
Sam Hemelryk
75c9c54be4 Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle 2012-05-01 13:41:37 +12:00
Sam Hemelryk
3a4b0d0bc0 Merge branch 'w18_MDL-32607_m23_upgrade2' of git://github.com/skodak/moodle 2012-05-01 13:34:08 +12:00
Sam Hemelryk
46847c220c Merge branch 'w18_MDL-32612_m23_debug' of git://github.com/skodak/moodle 2012-05-01 13:29:39 +12:00
Sam Hemelryk
4bbefa1c19 Merge branch 'w18_MDL-32640_m23_forumstrict' of git://github.com/skodak/moodle 2012-05-01 13:26:53 +12:00
Sam Hemelryk
ea7cc40eda Merge branch 'MDL-28955_master' of git://github.com/lazydaisy/moodle 2012-05-01 13:17:33 +12:00
Sam Hemelryk
16fd605208 MDL-32012 Fixed white space 2012-05-01 12:38:37 +12:00
Sam Hemelryk
2dcc93644f Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle 2012-05-01 12:37:59 +12:00
AMOS bot
f4b668393f Automatically generated installer lang files 2012-05-01 00:31:38 +00:00
Petr Skoda
4d254790c4 MDL-32628 add revision for user avatar images
This should finally resolve all avatar caching issues and should also help with performance.
2012-04-30 23:36:47 +02:00
Sam Hemelryk
1ad903ea8b Merge branch 'MDL-29264_zindex' of git://github.com/andyjdavis/moodle 2012-05-01 08:23:52 +12:00
Petr Skoda
e61f888d36 MDL-26028 fix invalid separator constant and support root dirs in aliases
Credit goes to Loic Jeannin, thanks.
2012-04-30 18:08:37 +02:00
Petr Skoda
f7d26a0545 MDL-26028 implement Nginx X-Sendfile directory aliases setting 2012-04-30 15:52:42 +02:00
Tim Hunt
59d14f31bd Improve the wording of overdue messages. Thanks Phil. 2012-04-30 13:46:02 +01:00
Rossiani Wijaya
3c0ea9b284 MDL-18335 calendar event: fixed role capability checking to create new event 2012-04-30 17:41:54 +08:00
Ruslan Kabalin
c9e34994cb MDL-32009 messaging: Fix using message processor term inconsistency. 2012-04-30 10:34:39 +01:00
Ruslan Kabalin
3f9d9e2856 MDL-32009 messaging: Add message processor uninstall functionality 2012-04-30 10:34:39 +01:00
Ruslan Kabalin
bede23f7bc MDL-32009 messaging: Add is_enabled method to plugintype_message 2012-04-30 10:34:37 +01:00
Ruslan Kabalin
bc795b98e9 MDL-32009 messaging: Refator get_settings_url plugintype method
No need to duplicate checks since we have them in one place.
2012-04-30 10:34:37 +01:00
Dan Poltawski
06dcb573c4 Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle 2012-04-30 17:00:23 +08:00
Jerome Mouneyrac
4615817d1c MDL-30986 external API, check and update DocBlock
Conflicts:

	group/externallib.php
2012-04-30 15:11:56 +08:00
Petr Skoda
46cb5d9ace MDL-32589 remove bogus webproxy whitelisting
Thanks Dan Poltawski!
2012-04-30 08:35:16 +02:00
Dan Poltawski
bc24339e00 Merge branch 'MDL-32357' of git://github.com/timhunt/moodle 2012-04-30 14:29:40 +08:00
Dan Poltawski
b53cb1294a Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle 2012-04-30 12:54:22 +08:00
Dan Poltawski
fdf26a0ec0 MDL-3030 mod_quiz: fix training whitespace 2012-04-30 11:05:29 +08:00
Dan Poltawski
c1bb7a6f39 Merge branch 'MDL-3030' of git://github.com/timhunt/moodle 2012-04-30 11:05:19 +08:00
Rajesh Taneja
4a9c429b0c MDL-32234 Library: usergetdate return different values when timezone is set
usergetdate should return consistent values for different timezone. There are
two return path
1. If timezone is servertime, it returns getdate
2. If timezone other then servertime, it use gmstrftime, which returns string and
   values with leading zero.
In second case, leading zero's are removed and values are type casted. One major fix
is with yday, getdate returns 0 through 365, whereas %j returns 001 through 366. This
has been fixed as well.
2012-04-30 10:59:01 +08:00
Andrew Davis
a740a0ad98 MDL-26257 grade: fixed the grader report edit mode ajax and fixed a spot in the grader report that should be using get_students_per_page() 2012-04-30 08:56:27 +07:00
Andrew Davis
8233747e0e MDL-26275 grade: made the grader report retrieve the existing grades from the DB rather than sending them to the client which then returns them to the server 2012-04-30 08:56:26 +07:00
Andrew Davis
d3b698a46e MDL-26275 grade: added a safety check to avoid hitting PHP's max_input_var by reducing the number of students per page if necessary 2012-04-30 08:56:26 +07:00
Dan Poltawski
e669ee3a96 Merge branch 'w18_MDL-32627_m23_userajax' of git://github.com/skodak/moodle 2012-04-30 09:50:04 +08:00
Dan Poltawski
008655ca04 Merge branch 'MDL-32613' of git://github.com/timhunt/moodle 2012-04-30 09:30:24 +08:00
Sam Hemelryk
21f7b01d19 Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle 2012-04-30 13:26:38 +12:00
Sam Hemelryk
ac3f3571a5 Merge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle 2012-04-30 13:21:54 +12:00
Sam Hemelryk
cc2ae468d2 Merge branch 'MDL-28735-master' of git://github.com/ankitagarwal/moodle 2012-04-30 13:19:56 +12:00
Dan Poltawski
81ea734992 Merge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle 2012-04-30 09:16:24 +08:00
Sam Hemelryk
6caa86747f Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle 2012-04-30 12:50:38 +12:00
Sam Hemelryk
446326ab67 Merge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle 2012-04-30 12:46:48 +12:00
Sam Hemelryk
3d173c1d38 Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle 2012-04-30 12:33:05 +12:00
Sam Hemelryk
fd8335c90e Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle 2012-04-30 12:26:07 +12:00
Sam Hemelryk
bc0be2fb80 Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle 2012-04-30 12:16:35 +12:00
Sam Hemelryk
49ddf4195c MDL-31510 grader report: Fixed whitespace 2012-04-30 12:13:00 +12:00
Sam Hemelryk
e074f9763b Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle 2012-04-30 12:11:23 +12:00
Sam Hemelryk
b5aa51419a Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle 2012-04-30 12:03:01 +12:00
Sam Hemelryk
c547c7c784 Merge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle 2012-04-30 11:57:40 +12:00