Commit graph

52898 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
23778a4dfa Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-03-09 11:56:22 +01:00
AMOS bot
80a0272a1d Automatically generated installer lang files 2012-03-09 11:54:12 +01:00
Eloy Lafuente (stronk7)
3a016edc0b weekly release 2.3dev 2012-03-09 11:13:09 +01:00
Eloy Lafuente (stronk7)
c5d5d911a0 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-03-09 11:03:53 +01:00
Rossiani Wijaya
d3254cebfc MDL-30867 Lesson module: fix lesson essay question formtting to be consistent with user selection 2012-03-09 17:32:18 +08:00
Eloy Lafuente (stronk7)
e45cad3e5e Merge branch 'wip-MDL-31248-master-v3' of git://github.com/abgreeve/moodle 2012-03-09 09:44:30 +01:00
Eloy Lafuente (stronk7)
a0808e8eda Revert "MDL-31248 - lib - Alteration to the rc4encrypt function to allow for old password use."
This reverts commit 6aa13eb36b.
2012-03-09 09:37:06 +01:00
Ankit Agarwal
5c333af0c0 MDL-2712 tags: removing the anchor links when there are no results 2012-03-09 15:02:10 +08:00
Ankit Agarwal
9247265b81 MDL-28998 libraries: Adding validation to customisable profile fields during signup 2012-03-09 14:48:36 +08:00
Adrian Greeve
40fe364713 MDL-31248 - lib - Retaining the old password key and creating a new cookie prefix. 2012-03-09 13:38:51 +08:00
Eloy Lafuente (stronk7)
d395ad7042 Revert "[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block."
This reverts commit ebadb9b9a6.
2012-03-09 01:58:09 +01:00
Eloy Lafuente (stronk7)
61b0512c44 Revert "MDL-31708 wiki groups: whitespace fix"
This reverts commit 6273fb8377.
2012-03-09 01:58:01 +01:00
Iñaki Arenaza
ca769fa7f8 MDL-31540 Try to remove duplicates before storing LDAP search contexts
If the user specifies the same LDAP search context more than once,
when we sync users we retrieve the same set of users twice. When we
try to insert the "duplicated" user in the temp table again, the db
barfs and the db layer aborts the whole transaction.

So we try to detect and remove duplicates. This is a bit tricky (LDAP
is such a complex and wonderful protocol) as the contexts are
distinguished names and the matching/comparison rules are complex. But
assuming that we only use the attribute types used in 99.999% of the
distinguished names used for contexts out there (that is: dc, ou, cn,
o, l and c), and also assuming that the user is not using different
encodings/escapings for the same context, we can lower case the
contexts to compare them (and remove duplicates).

This is safe according to RFC-4517 (section 4.2.15. distinguishedNameMatch)
and RFC-4519 (where the EQUAILITY property is defined for the
different user application attribute types).

This shouldn't break any configuration that wasn't broken before :)

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2012-03-08 21:57:59 +01:00
Charles Fulton
eb5947bcca MDL-26243 calendar: display correct number of repeated events 2012-03-08 06:47:07 -08:00
Andrew Robert Nicols
ce13ea6ceb MDL-31923 Correctly respect hiddenfields and capabilities 2012-03-08 10:05:14 +00:00
Andrew Davis
62a966ada0 MDL-31841 grade: prevented the feedback column on the user report from being centered 2012-03-08 15:19:17 +07:00
Dan Marsden
eb3a62d293 MDL-31942 Choice - remove deprec func 2012-03-08 20:37:17 +13:00
Eloy Lafuente (stronk7)
2583b7d22f Merge branch 'wip-MDL-31248-master-v2' of git://github.com/abgreeve/moodle 2012-03-08 02:27:55 +01:00
AMOS bot
d30b5d8f16 Automatically generated installer lang files 2012-03-08 00:31:35 +00:00
Adrian Greeve
6aa13eb36b MDL-31248 - lib - Alteration to the rc4encrypt function to allow for old password use. 2012-03-08 08:09:39 +08:00
Eloy Lafuente (stronk7)
427ad4d3c3 Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle 2012-03-08 00:48:04 +01:00
Eloy Lafuente (stronk7)
e233175df1 Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle 2012-03-07 21:41:36 +01:00
Andrew Robert Nicols
ccb8d546e3 MDL-31918 Use cached module info for activity completion report 2012-03-07 15:25:38 +00:00
Eloy Lafuente (stronk7)
f1662409a0 Merge branch 'MDL-31712_master' of git://github.com/kordan/moodle 2012-03-07 15:39:01 +01:00
Davo Smith
87bef8f6d5 MDL-31935 Fixed restore backup link in course search 2012-03-07 13:38:29 +00:00
Petr Skoda
a681b6c0a9 MDL-31689 fix moodle_database:execute() description 2012-03-07 12:36:40 +01:00
Eloy Lafuente (stronk7)
daf714ef12 MDL-31832 CLI upgrade will return 0 exit status if no upgrade is needed
Discussed with David, both points were valid but finally
we agreed about to consider the "no upgrade needed" exit
a normal/succesful one, mainly because it keeps previous
behavior the same (exit non-zero only for real errors).
2012-03-07 10:58:56 +01:00
David Mudrak
91c038f932 MDL-31832 CLI upgrade checks if the upgrade is actually needed 2012-03-07 10:58:07 +01:00
Eloy Lafuente (stronk7)
a1ef8c6d3c MDL-28364 whitespace fixes 2012-03-07 04:00:39 +01:00
Eloy Lafuente (stronk7)
12c5685a50 Merge branch 'MDL-28364' of git://github.com/jonof/moodle 2012-03-07 03:55:53 +01:00
Eloy Lafuente (stronk7)
47ee3c5569 MDL-30976 whitespace fixes 2012-03-07 02:19:59 +01:00
Eloy Lafuente (stronk7)
4651c2d214 Merge branch 'MDL-30996-master' of git://github.com/ankitagarwal/moodle 2012-03-07 02:10:40 +01:00
Eloy Lafuente (stronk7)
0b56e99431 MDL-23787 data: Init 2 arrays (global scope) that may conflict with other global scope code 2012-03-07 01:47:31 +01:00
AMOS bot
f0fc15edd3 Automatically generated installer lang files 2012-03-07 00:31:41 +00:00
Eloy Lafuente (stronk7)
8650e13f9b Merge branch 'wip-MDL-23787-master' of git://github.com/marinaglancy/moodle 2012-03-07 01:22:54 +01:00
Eloy Lafuente (stronk7)
bb77ead0a4 Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle 2012-03-07 00:18:27 +01:00
Sam Hemelryk
c607258ae4 Merge branch 'MDL-28387-master' of git://github.com/ankitagarwal/moodle 2012-03-07 11:46:42 +13:00
Eloy Lafuente (stronk7)
7a4eb4ad3a Merge branch 'MDL-31876-question_has_capability_on-memory-bloat' of git://github.com/dhg-atarplpl/moodle 2012-03-06 21:30:25 +01:00
Eloy Lafuente (stronk7)
f1fbdbea33 Merge branch 'MDL-31829' of git://github.com/timhunt/moodle 2012-03-06 21:18:04 +01:00
Eloy Lafuente (stronk7)
55957253d2 Merge branch 'w10_MDL-31079_m23_minifydebug' of git://github.com/skodak/moodle 2012-03-06 21:10:02 +01:00
Dan Marsden
85a2d566e2 MDL-31888 SCORM prevent scrollbars on yui div 2012-03-07 09:01:45 +13:00
Ruslan Kabalin
8ef93c7029 MDL-31919 Fix assignment overview output to respect gradebook grading.
Currenly, if assigment has been graded in gradebook only, in the assigment
overview it is listed as not graded.
2012-03-06 16:55:29 +00:00
Charles Fulton
537c237b18 MDL-27304 wiki: link to user's course profile 2012-03-06 08:33:12 -08:00
Ruslan Kabalin
7761e7b39a MDL-31917 Improve assigment submission usability
Say 'View' if assignment has been graded via gradebook and changing
grades via submissions interface is not possible.
2012-03-06 15:43:07 +00:00
Eloy Lafuente (stronk7)
21013a39fd MDL-31301 textlib: fix deprecated initial version 2012-03-06 16:18:58 +01:00
Eloy Lafuente (stronk7)
2ed7cc2730 Merge branch 'w10_MDL-31301_m23_textlibcleanup' of git://github.com/skodak/moodle 2012-03-06 16:06:53 +01:00
Eloy Lafuente (stronk7)
050bce5f0c Merge branch 'w10_MDL-31361_m23_dbunenrol' of git://github.com/skodak/moodle 2012-03-06 15:38:29 +01:00
Eloy Lafuente (stronk7)
c5e3e165b1 Merge branch 'w10_MDL-30636_m23_tinymce' of git://github.com/skodak/moodle 2012-03-06 13:35:40 +01:00
Eloy Lafuente (stronk7)
ea5740a821 Merge branch 'w10_MDL-31785_m23_htmlpurifier' of git://github.com/skodak/moodle 2012-03-06 13:01:39 +01:00
Petr Skoda
7385cc000e MDL-27982 add unsigned removal for mysql 2012-03-06 12:04:48 +01:00