David Mudrak
cb3ef22065
MDL-29256 Fixed incorrect calculation of contentformat
...
Legacy Resource modules of the type Web page force the HTML format for
their content. The format stored in the reference field is valid only
for legacy resources of the type Plain text page. See page_20_migrate()
function.
2012-02-21 11:19:57 +01:00
Eloy Lafuente (stronk7)
0dde394db5
weekly release 2.3dev
2012-02-17 01:47:10 +01:00
Eloy Lafuente (stronk7)
d764c275f2
Merge branch 'install_master' of git://github.com/amosbot/moodle
2012-02-17 01:43:19 +01:00
AMOS bot
a97d4da684
Automatically generated installer lang files
2012-02-17 00:31:10 +00:00
Eloy Lafuente (stronk7)
3360b13bac
MDL-31251 documentation : fix incorrect docs
2012-02-16 17:59:02 +01:00
Sam Hemelryk
889860576a
Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle
2012-02-16 15:38:05 +13:00
Sam Hemelryk
1609f3cf7c
Revert "MDL-30935_in_lti_change_role_from_instructor_to_teacher"
...
This reverts commit 0758f991b36bdccb429b08a05ccbafe1d7ad977d.
2012-02-16 15:37:57 +13:00
Gerard (Gerry) Caulfield
72ed614c74
MDL-30935_in_lti_change_role_from_instructor_to_teacher
2012-02-16 10:23:22 +08:00
Eloy Lafuente (stronk7)
ec93cd94e8
Merge branch 's17_MDL-30984_comment_docblock_master' of git://github.com/dongsheng/moodle
2012-02-16 02:07:48 +01:00
Aparup Banerjee
9906cf41ab
Merge branch 'MDL-31114_dnd_ui_improvements' of https://github.com/davosmith/moodle
2012-02-15 11:32:32 +08:00
Sam Hemelryk
be09c3f392
MDL-30888 course-search: Fixed typo
2012-02-15 16:28:44 +13:00
Sam Hemelryk
051806b2ee
Merge branch 'wip-mdl-30388' of git://github.com/rajeshtaneja/moodle
2012-02-15 16:23:57 +13:00
Dongsheng Cai
35453657a2
MDL-30984 comment API, check and update DocBlock
2012-02-15 11:21:35 +08:00
Sam Hemelryk
18cdcdbf89
MDL-30989 portfolio: Fixed up phpdocs
2012-02-15 15:33:06 +13:00
Sam Hemelryk
9e7ff1476c
Merge branch 'MDL-30989' of git://github.com/rwijaya/moodle
2012-02-15 15:32:16 +13:00
Eloy Lafuente (stronk7)
1991f37f55
Merge branch 'm_MDL-31552_change_add_to_log_exception_to_add_exception_information' of git://github.com/gerrywastaken/moodle
2012-02-15 03:19:44 +01:00
Eloy Lafuente (stronk7)
746aa0ba16
Merge branch 'MDL-31386-master-1' of git://git.luns.net.uk/moodle
2012-02-15 03:14:58 +01:00
Rajesh Taneja
f53f582dc6
MDL-30388 Blocks: navigation block is visible on block search page
2012-02-15 10:14:50 +08:00
Rajesh Taneja
cf5b731c9c
MDL-30388 Blocks: Search view for block instances fixed, with proper page url and pagination
2012-02-15 10:14:49 +08:00
AMOS bot
8150fd9fa5
Automatically generated installer lang files
2012-02-15 00:31:12 +00:00
Sam Hemelryk
1ddb08084b
MDL-31112 repository: Fixed phpdocs on new function
2012-02-15 12:44:32 +13:00
Sam Hemelryk
f820701286
Merge branch 'MDL-31112_dndupload_folder_detection' of git://github.com/davosmith/moodle
2012-02-15 12:41:47 +13:00
Sam Hemelryk
e4082c4bad
MDL-30709 mod_assignment: Renamed callback to mod_assignment_get_file_info
2012-02-15 11:26:49 +13:00
Gerard (Gerry) Caulfield
709dfc0687
MDL-31552 Change add_to_log() so that it's exception handling throws a useful message when there is a problem.
2012-02-15 00:11:24 +08:00
Eloy Lafuente (stronk7)
8ea8291f93
Merge branch 'MDL-30126' of git://github.com/mouneyrac/moodle
2012-02-14 13:12:07 +01:00
Eloy Lafuente (stronk7)
3210eeef50
Merge branch 'MDL-31527_xmldb_table_names' of git://github.com/davosmith/moodle
2012-02-14 12:11:49 +01:00
Davo Smith
7d44996c2a
MDL-31114 Filemanager drag and drop upload - displays 'drop here' message when dragging over page / highlights when over element
2012-02-14 10:12:58 +00:00
Davo Smith
36dc50336e
MDL-31114 Alert when max files reached
2012-02-14 09:49:49 +00:00
Davo Smith
87ed3a5c39
MDL-31112 Repository upload - check for completely null files (likely to be folders uploaded by mistake via drag and drop)
2012-02-14 08:25:04 +00:00
Aparup Banerjee
aad69d8b1a
Merge branch 'wip-mdl-28101' of git://github.com/rajeshtaneja/moodle
2012-02-14 15:38:43 +08:00
Aparup Banerjee
21a7f3d27a
Merge branch 'MDL-31321_dndupload_multiple_elements' of https://github.com/davosmith/moodle
2012-02-14 14:47:23 +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
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
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