Commit graph

51970 commits

Author SHA1 Message Date
Aparup Banerjee
21a7f3d27a Merge branch 'MDL-31321_dndupload_multiple_elements' of https://github.com/davosmith/moodle 2012-02-14 14:47:23 +08:00
Rajesh Taneja
669bdcabc9 MDL-30521 blog: Updated uniquehash field preceision to 255 in post table 2012-02-14 14:18:55 +08:00
Aparup Banerjee
9e31e848da Merge branch 'MDL-31541_multiple_repository_instances' of git://github.com/davosmith/moodle 2012-02-14 13:30:11 +08:00
Sam Hemelryk
b7bf2c3a19 Merge branch 'MDL-30911' of git://github.com/rwijaya/moodle 2012-02-14 17:41:55 +13:00
Sam Hemelryk
49414a7746 MDL-30709 mod_assignment Fixed phpdocs for assignment_get_file_info 2012-02-14 17:15:17 +13:00
Sam Hemelryk
d88f6dafdc Merge branch 'wip-MDL-30709-master' of git://github.com/marinaglancy/moodle 2012-02-14 17:14:05 +13:00
Fábio Souto
9e63c0ff71 Updated bugfix according to Jerome suggestions
password check is done at lib.php instead of externallib.php

Conflicts:

	user/lib.php
2012-02-14 12:04:15 +08:00
Jerome Mouneyrac
db7c80d9e3 MDL-30126 rest client should be updated fo json support 2012-02-14 12:01:54 +08:00
Sam Hemelryk
1fa82cc153 Merge branch 'wip-MDL-30771-master' of git://github.com/marinaglancy/moodle 2012-02-14 17:00:41 +13:00
Aparup Banerjee
2114555ced Merge branch 'MDL-31495-master' of git://github.com/micaherne/moodle 2012-02-14 11:56:25 +08:00
Aparup Banerjee
cfb35d826c Merge branch 'MDL-29471' of git://github.com/mouneyrac/moodle 2012-02-14 11:36:53 +08:00
Aparup Banerjee
a49d83ba4e Merge branch 'm_MDL-30971_adding_tag_api_phpdocs_2' of git://github.com/gerrywastaken/moodle 2012-02-14 11:28:37 +08:00
Sam Hemelryk
ba611bc025 Merge branch 'MDL-30688' of git://github.com/mouneyrac/moodle 2012-02-14 15:54:00 +13:00
Sam Hemelryk
ec22386a40 Merge branch 'MDL-31604-attempt3' of git://github.com/mouneyrac/moodle 2012-02-14 15:48:51 +13:00
Sam Hemelryk
37ee40dc16 Merge branch 'm_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle 2012-02-14 15:32:12 +13:00
Sam Hemelryk
928c3d54e6 Merge branch 'm_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle 2012-02-14 15:29:17 +13:00
Sam Hemelryk
2c4f43e1e7 Merge branch 'm_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle 2012-02-14 15:21:20 +13:00
Sam Hemelryk
9fd088b792 Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle 2012-02-14 15:12:09 +13:00
Sam Hemelryk
24768e4658 Merge branch 'm_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle 2012-02-14 15:07:57 +13:00
Mary Evans
dacbb36011 MDL-31345_master theme_afterburner: adds horizontal scroll bar to pagelayout-report 2012-02-14 01:41:29 +00:00
Sam Hemelryk
f2e8a66d86 Merge branch 'MDL-28283-master' of git://github.com/ankitagarwal/moodle 2012-02-14 13:57:30 +13:00
Sam Hemelryk
0b07d7d4b8 Merge branch 'MDL-30815-master' of git://github.com/ankitagarwal/moodle 2012-02-14 13:45:04 +13:00
Sam Hemelryk
a7986c15ce Merge branch 'MDL-31315-master-6' of git://git.luns.net.uk/moodle 2012-02-14 13:12:01 +13:00
Eloy Lafuente (stronk7)
70a4e462ab MDL-30975 Docs - whitespace fixes 2012-02-14 01:10:40 +01:00
Eloy Lafuente (stronk7)
277c811f08 MDL-30975 Docs - add phpdocs @param to report_log_print_graph() 2012-02-14 00:59:02 +01:00
Eloy Lafuente (stronk7)
35d8759a05 Merge branch 'MDL-30975' of git://github.com/ankitagarwal/moodle 2012-02-14 00:53:09 +01:00
Eloy Lafuente (stronk7)
29b6a3e8c3 MDL-31251 documentation : whitespace fixes 2012-02-14 00:36:12 +01:00
Eloy Lafuente (stronk7)
88e959afe5 Merge branch 'MDL-31251' of git://github.com/nebgor/moodle 2012-02-13 23:37:34 +01:00
Sam Hemelryk
caec8e44c0 Merge branch 'MDL-31515-master-1' of git://git.luns.net.uk/moodle 2012-02-14 10:56:27 +13:00
Sam Hemelryk
66f5d0ea13 Merge branch 'MDL-29080_export_hidden2' of git://github.com/andyjdavis/moodle 2012-02-14 10:47:12 +13:00
Andrew Robert Nicols
b9e7d8925e MDL-31589 Sort order of lesson answers before restoring them 2012-02-13 10:12:08 +00:00
Gerard (Gerry) Caulfield
bcdcee903c MDL-30992 Updating Tag API DocBlocks 2012-02-13 16:42:59 +08:00
Jerome Mouneyrac
069fe36008 MDL-30688 REST simpleserver does not accept the moodlewsrestformat parameter 2012-02-13 16:39:50 +08:00
Ankit Kumar Agarwal
04252d3a13 MDL-30975 Docs Adding correct pacakge information 2012-02-13 11:06:47 +05:30
Ankit Kumar Agarwal
a5fa03eebc MDL-30975 Docs Documenting report/livelogs 2012-02-13 11:06:44 +05:30
Ankit Kumar Agarwal
f82de750bf MDL-30975 Docs Documenting report/logs 2012-02-13 11:06:43 +05:30
Ankit Kumar Agarwal
fcf64900e6 MDL-30975 Docs Documenting Logs API 2012-02-13 11:06:42 +05:30
Sam Hemelryk
2ac8cf7a20 Merge branch 'm_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle 2012-02-13 18:04:18 +13:00
Sam Hemelryk
76ef8d80f6 Merge branch 'm_MDL-30723_fixing_several_english_typos' of git://github.com/gerrywastaken/moodle 2012-02-13 18:00:35 +13:00
Sam Hemelryk
bcce1ec140 Merge branch 'master_MDL-31085' of git://github.com/danmarsden/moodle 2012-02-13 17:52:48 +13:00
Sam Hemelryk
c282f2aebd Merge branch 'MDL-31502-master-2' of git://git.luns.net.uk/moodle 2012-02-13 17:48:12 +13:00
Sam Hemelryk
ac87f25829 Merge branch 'wip-MDL-25185-master' of git://github.com/abgreeve/moodle 2012-02-13 17:34:50 +13:00
Sam Hemelryk
f9fea1dbc4 Merge branch 'wip-MDL-31396-master' of git://github.com/abgreeve/moodle 2012-02-13 17:15:56 +13:00
Sam Hemelryk
114824a6b9 Merge branch 'wip-MDL-31463-master' of git://github.com/abgreeve/moodle 2012-02-13 17:02:45 +13:00
Anita Viglinoe
a1b9872209 MDL-28283-master Completion Future dates can now be set as completion criteria 2012-02-13 09:05:10 +05:30
Rossiani Wijaya
e481859f6b MDL-30911: mod_lesson: fix sub-heading level to be lower than lesson title. This issue is an improvement of accessibility compliance 2012-02-13 11:26:27 +08:00
Ankit Agarwal
546a3f8130 MDL-30815 Choice Labels are now explicitly tied with input elements 2012-02-13 08:26:45 +05:30
Eloy Lafuente
6b7f1717e9 MDL-31604 Fix capabilities displayed without spaces causing text going out of the screen 2012-02-13 10:43:30 +08:00
Sam Hemelryk
f53b63481f Merge branch 'wip-mdl-31576' of git://github.com/rajeshtaneja/moodle 2012-02-13 15:29:43 +13:00
Sam Hemelryk
6cf1f978b2 Merge branch 'wip-mdl-31529' of git://github.com/rajeshtaneja/moodle 2012-02-13 15:28:26 +13:00