Sam Hemelryk [Mon, 20 Feb 2012 04:25:48 +0000 (17:25 +1300)]
Merge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:13:36 +0000 (17:13 +1300)]
Merge branch 'm_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:10:52 +0000 (17:10 +1300)]
Merge branch 'MDL-31532' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 20 Feb 2012 04:04:45 +0000 (17:04 +1300)]
Merge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 03:58:36 +0000 (16:58 +1300)]
Merge branch 'MDL-31432_messaging_popup' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 20 Feb 2012 03:53:21 +0000 (16:53 +1300)]
Merge branch 'm_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle
Gerard (Gerry) Caulfield [Mon, 2 Jan 2012 18:43:39 +0000 (02:43 +0800)]
MDL-30957 Adding a new method "is_complete" to assignment lib for
testing if a submission has actually been submitted and then adding a
call to it before displaying the the assignment submission date header
As recommended I've simplified the functions and split the logic out into appropriate upload classes.
Sam Hemelryk [Mon, 20 Feb 2012 03:03:19 +0000 (16:03 +1300)]
Merge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:57:12 +0000 (15:57 +1300)]
Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:49:41 +0000 (15:49 +1300)]
Merge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:46:46 +0000 (15:46 +1300)]
Merge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:39:11 +0000 (15:39 +1300)]
MDL-31014 Integrated
Sam Hemelryk [Mon, 20 Feb 2012 02:38:32 +0000 (15:38 +1300)]
Merge branch 'MDL-31014-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:17:39 +0000 (15:17 +1300)]
Merge branch 'MDL-31589-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 20 Feb 2012 02:01:19 +0000 (15:01 +1300)]
Merge branch 'MDL-31590-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 20 Feb 2012 00:34:25 +0000 (01:34 +0100)]
MDL-31532 restore: avoid null course->hiddensections problems. Credit goes to Petri Asikainen. Thanks!
Sam Hemelryk [Sun, 19 Feb 2012 23:39:12 +0000 (12:39 +1300)]
Merge branch 'MDL-31556' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 19 Feb 2012 23:03:32 +0000 (12:03 +1300)]
Merge branch 'MDL-31647-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 19 Feb 2012 22:50:56 +0000 (11:50 +1300)]
Merge branch 'MDL-30495' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Sun, 19 Feb 2012 22:37:59 +0000 (11:37 +1300)]
Merge branch 'wip-MDL-30971-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 19 Feb 2012 21:32:08 +0000 (10:32 +1300)]
Merged branch wip-MDL-30521 with conflict resolutions
sam marshall [Wed, 15 Feb 2012 16:01:57 +0000 (16:01 +0000)]
MDL-31647 Glossary: Links to glossary entries from glossary main page should not be popups
sam marshall [Mon, 6 Feb 2012 12:26:40 +0000 (12:26 +0000)]
MDL-31514 Lib: Time format to remove unwanted zeros caused errors on Windows servers
Gerard (Gerry) Caulfield [Tue, 14 Feb 2012 01:13:49 +0000 (09:13 +0800)]
MDL-31388 Fixing typo in enrol_ldap
Dan Marsden [Thu, 26 Jan 2012 07:41:41 +0000 (20:41 +1300)]
SCORM MDL-31381 decrease max width of TOC to prevent SCORM content from being hidden, remove padding from pop-up and improve maxheight calculation
Ankit Agarwal [Fri, 17 Feb 2012 03:16:45 +0000 (08:46 +0530)]
MDL-30965 SCORM Removing unused variable ->head
Marina Glancy [Tue, 14 Feb 2012 06:29:39 +0000 (14:29 +0800)]
MDL-31627: Arialist theme do not resize content when there are no blocks
Dan Marsden [Thu, 16 Feb 2012 08:48:36 +0000 (21:48 +1300)]
MDL-31659 SCORM remove old file and reference to it - it hasn't been used since the rework of SCORM player in MDL-22951
Andrew Davis [Sun, 12 Feb 2012 11:07:54 +0000 (18:07 +0700)]
MDL-31432 message: prevent messaging popups while viewing messages
Dan Marsden [Tue, 31 Jan 2012 20:40:48 +0000 (09:40 +1300)]
SCORM MDL-31397 - add slashes to js string
Eloy Lafuente (stronk7) [Fri, 17 Feb 2012 00:47:10 +0000 (01:47 +0100)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 17 Feb 2012 00:43:19 +0000 (01:43 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
AMOS bot [Fri, 17 Feb 2012 00:31:10 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Thu, 16 Feb 2012 16:59:02 +0000 (17:59 +0100)]
MDL-31251 documentation : fix incorrect docs
Joseph Rezeau [Thu, 16 Feb 2012 08:08:15 +0000 (16:08 +0800)]
MDL-31556 Lesson Module: fixed missing 'lesson closes' event in calendar
Sam Hemelryk [Thu, 16 Feb 2012 02:38:05 +0000 (15:38 +1300)]
Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Thu, 16 Feb 2012 02:37:57 +0000 (15:37 +1300)]
Revert "MDL-30935_in_lti_change_role_from_instructor_to_teacher"
This reverts commit
0758f991b36bdccb429b08a05ccbafe1d7ad977d.
Gerard (Gerry) Caulfield [Fri, 10 Feb 2012 02:18:57 +0000 (10:18 +0800)]
MDL-30935_in_lti_change_role_from_instructor_to_teacher
Eloy Lafuente (stronk7) [Thu, 16 Feb 2012 01:07:48 +0000 (02:07 +0100)]
Merge branch 's17_MDL-30984_comment_docblock_master' of git://github.com/dongsheng/moodle
Dan Marsden [Wed, 15 Feb 2012 23:16:02 +0000 (12:16 +1300)]
MDL-31652 SCORM - hide updatefreq setting and remove it if not required.
Jason Fowler [Wed, 11 Jan 2012 06:02:53 +0000 (14:02 +0800)]
MDL-30991 - RSS - Doc-block clean up
Jerome Mouneyrac [Wed, 15 Feb 2012 03:33:11 +0000 (11:33 +0800)]
MDL-30495 HTML5 apps cannot call Webservices functions if a HTTP resource is retrieved from the Moodle installation
Aparup Banerjee [Wed, 15 Feb 2012 03:32:32 +0000 (11:32 +0800)]
Merge branch 'MDL-31114_dnd_ui_improvements' of https://github.com/davosmith/moodle
Sam Hemelryk [Wed, 15 Feb 2012 03:28:44 +0000 (16:28 +1300)]
MDL-30888 course-search: Fixed typo
Sam Hemelryk [Wed, 15 Feb 2012 03:23:57 +0000 (16:23 +1300)]
Merge branch 'wip-mdl-30388' of git://github.com/rajeshtaneja/moodle
Dongsheng Cai [Wed, 15 Feb 2012 03:21:35 +0000 (11:21 +0800)]
MDL-30984 comment API, check and update DocBlock
Sam Hemelryk [Wed, 15 Feb 2012 02:33:06 +0000 (15:33 +1300)]
MDL-30989 portfolio: Fixed up phpdocs
Sam Hemelryk [Wed, 15 Feb 2012 02:32:16 +0000 (15:32 +1300)]
Merge branch 'MDL-30989' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Wed, 15 Feb 2012 02:19:44 +0000 (03:19 +0100)]
Merge branch 'm_MDL-31552_change_add_to_log_exception_to_add_exception_information' of git://github.com/gerrywastaken/moodle
Eloy Lafuente (stronk7) [Wed, 15 Feb 2012 02:14:58 +0000 (03:14 +0100)]
Merge branch 'MDL-31386-master-1' of git://git.luns.net.uk/moodle
Rajesh Taneja [Tue, 31 Jan 2012 07:25:20 +0000 (15:25 +0800)]
MDL-30388 Blocks: navigation block is visible on block search page
Rajesh Taneja [Tue, 31 Jan 2012 06:11:43 +0000 (14:11 +0800)]
MDL-30388 Blocks: Search view for block instances fixed, with proper page url and pagination
AMOS bot [Wed, 15 Feb 2012 00:31:12 +0000 (00:31 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Tue, 14 Feb 2012 23:44:32 +0000 (12:44 +1300)]
MDL-31112 repository: Fixed phpdocs on new function
Sam Hemelryk [Tue, 14 Feb 2012 23:41:47 +0000 (12:41 +1300)]
Merge branch 'MDL-31112_dndupload_folder_detection' of git://github.com/davosmith/moodle
Sam Hemelryk [Tue, 14 Feb 2012 22:26:49 +0000 (11:26 +1300)]
MDL-30709 mod_assignment: Renamed callback to mod_assignment_get_file_info
Gerard (Gerry) Caulfield [Thu, 9 Feb 2012 05:56:05 +0000 (13:56 +0800)]
MDL-31552 Change add_to_log() so that it's exception handling throws a useful message when there is a problem.
Andrew Robert Nicols [Tue, 14 Feb 2012 15:35:13 +0000 (15:35 +0000)]
MDL-31590 Correct title of error dialogue on filepicker
Thanks to Gilles-Philippe Leblanc for this patch
Eloy Lafuente (stronk7) [Tue, 14 Feb 2012 12:12:07 +0000 (13:12 +0100)]
Merge branch 'MDL-30126' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Tue, 14 Feb 2012 11:11:49 +0000 (12:11 +0100)]
Merge branch 'MDL-31527_xmldb_table_names' of git://github.com/davosmith/moodle
Davo Smith [Tue, 14 Feb 2012 10:12:58 +0000 (10:12 +0000)]
MDL-31114 Filemanager drag and drop upload - displays 'drop here' message when dragging over page / highlights when over element
Davo Smith [Tue, 14 Feb 2012 09:49:49 +0000 (09:49 +0000)]
MDL-31114 Alert when max files reached
Davo Smith [Tue, 7 Feb 2012 07:26:54 +0000 (07:26 +0000)]
MDL-31112 Repository upload - check for completely null files (likely to be folders uploaded by mistake via drag and drop)
Aparup Banerjee [Tue, 14 Feb 2012 07:38:43 +0000 (15:38 +0800)]
Merge branch 'wip-mdl-28101' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 14 Feb 2012 06:47:23 +0000 (14:47 +0800)]
Merge branch 'MDL-31321_dndupload_multiple_elements' of https://github.com/davosmith/moodle
Rajesh Taneja [Tue, 7 Feb 2012 03:40:31 +0000 (11:40 +0800)]
MDL-30521 blog: Updated uniquehash field preceision to 255 in post table
Aparup Banerjee [Tue, 14 Feb 2012 05:30:11 +0000 (13:30 +0800)]
Merge branch 'MDL-31541_multiple_repository_instances' of git://github.com/davosmith/moodle
Sam Hemelryk [Tue, 14 Feb 2012 04:41:55 +0000 (17:41 +1300)]
Merge branch 'MDL-30911' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 14 Feb 2012 04:15:05 +0000 (17:15 +1300)]
MDL-30709 mod_assignment Fixed phpdocs for assignment_get_file_info
Sam Hemelryk [Tue, 14 Feb 2012 04:14:05 +0000 (17:14 +1300)]
Merge branch 'wip-MDL-30709-master' of git://github.com/marinaglancy/moodle
Jerome Mouneyrac [Tue, 14 Feb 2012 04:01:54 +0000 (12:01 +0800)]
MDL-30126 rest client should be updated fo json support
Sam Hemelryk [Tue, 14 Feb 2012 04:00:41 +0000 (17:00 +1300)]
Merge branch 'wip-MDL-30771-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 14 Feb 2012 03:56:25 +0000 (11:56 +0800)]
Merge branch 'MDL-31495-master' of git://github.com/micaherne/moodle
Aparup Banerjee [Tue, 14 Feb 2012 03:36:53 +0000 (11:36 +0800)]
Merge branch 'MDL-29471' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 14 Feb 2012 03:28:37 +0000 (11:28 +0800)]
Merge branch 'm_MDL-30971_adding_tag_api_phpdocs_2' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:54:00 +0000 (15:54 +1300)]
Merge branch 'MDL-30688' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:48:51 +0000 (15:48 +1300)]
Merge branch 'MDL-31604-attempt3' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:32:12 +0000 (15:32 +1300)]
Merge branch 'm_MDL-26807_remove_withselectedusers_strings_and_references' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:29:17 +0000 (15:29 +1300)]
Merge branch 'm_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:21:20 +0000 (15:21 +1300)]
Merge branch 'm_MDL-27654_add_space_to_somefieldrequired_string' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:12:09 +0000 (15:12 +1300)]
Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Tue, 14 Feb 2012 02:07:57 +0000 (15:07 +1300)]
Merge branch 'm_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle
Sam Hemelryk [Tue, 14 Feb 2012 00:57:30 +0000 (13:57 +1300)]
Merge branch 'MDL-28283-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 14 Feb 2012 00:45:04 +0000 (13:45 +1300)]
Merge branch 'MDL-30815-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 14 Feb 2012 00:12:01 +0000 (13:12 +1300)]
Merge branch 'MDL-31315-master-6' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 14 Feb 2012 00:10:40 +0000 (01:10 +0100)]
MDL-30975 Docs - whitespace fixes
Eloy Lafuente (stronk7) [Mon, 13 Feb 2012 23:59:02 +0000 (00:59 +0100)]
MDL-30975 Docs - add phpdocs @param to report_log_print_graph()
Eloy Lafuente (stronk7) [Mon, 13 Feb 2012 23:53:09 +0000 (00:53 +0100)]
Merge branch 'MDL-30975' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 13 Feb 2012 23:36:12 +0000 (00:36 +0100)]
MDL-31251 documentation : whitespace fixes
Eloy Lafuente (stronk7) [Mon, 13 Feb 2012 22:37:34 +0000 (23:37 +0100)]
Merge branch 'MDL-31251' of git://github.com/nebgor/moodle
Sam Hemelryk [Mon, 13 Feb 2012 21:56:27 +0000 (10:56 +1300)]
Merge branch 'MDL-31515-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 13 Feb 2012 21:47:12 +0000 (10:47 +1300)]
Merge branch 'MDL-29080_export_hidden2' of git://github.com/andyjdavis/moodle
Andrew Robert Nicols [Fri, 10 Feb 2012 14:39:44 +0000 (14:39 +0000)]
MDL-31589 Sort order of lesson answers before restoring them
Gerard (Gerry) Caulfield [Mon, 9 Jan 2012 09:27:45 +0000 (17:27 +0800)]
MDL-30992 Updating Tag API DocBlocks
Jerome Mouneyrac [Mon, 13 Feb 2012 08:39:50 +0000 (16:39 +0800)]
MDL-30688 REST simpleserver does not accept the moodlewsrestformat parameter
Ankit Kumar Agarwal [Fri, 6 Jan 2012 05:00:24 +0000 (10:30 +0530)]
MDL-30975 Docs Adding correct pacakge information
Ankit Kumar Agarwal [Thu, 5 Jan 2012 06:54:17 +0000 (12:24 +0530)]
MDL-30975 Docs Documenting report/livelogs
Ankit Kumar Agarwal [Thu, 5 Jan 2012 06:38:05 +0000 (12:08 +0530)]
MDL-30975 Docs Documenting report/logs
Ankit Kumar Agarwal [Thu, 5 Jan 2012 02:25:47 +0000 (07:55 +0530)]
MDL-30975 Docs Documenting Logs API
Sam Hemelryk [Mon, 13 Feb 2012 05:04:18 +0000 (18:04 +1300)]
Merge branch 'm_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle
