moodle.git
9 years agoMerge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 29 Aug 2012 10:14:46 +0000 (12:14 +0200)]
Merge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 29 Aug 2012 10:11:00 +0000 (12:11 +0200)]
Merge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Wed, 29 Aug 2012 08:57:03 +0000 (16:57 +0800)]
Merge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-35119 tool_assignmentupgrade Changing onsubmit form for onclick button
David Monllao [Wed, 29 Aug 2012 07:01:40 +0000 (15:01 +0800)]
MDL-35119 tool_assignmentupgrade Changing onsubmit form for onclick button

9 years agoMDL-34990 fix JS error when moodlenolink button not present in toolbar
Petr Škoda [Wed, 29 Aug 2012 07:57:32 +0000 (09:57 +0200)]
MDL-34990 fix JS error when moodlenolink button not present in toolbar

Thanks Rossiani Wijaya for discovering this issue!

9 years agoMerge branch 'MDL-31959' of git://github.com/rwijaya/moodle
Aparup Banerjee [Wed, 29 Aug 2012 07:33:31 +0000 (15:33 +0800)]
Merge branch 'MDL-31959' of git://github.com/rwijaya/moodle

9 years agoMDL-34310 Removed unused options from gradingform_guide
Marina Glancy [Wed, 29 Aug 2012 05:50:16 +0000 (13:50 +0800)]
MDL-34310 Removed unused options from gradingform_guide

9 years agoMerge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle
Aparup Banerjee [Wed, 29 Aug 2012 05:46:04 +0000 (13:46 +0800)]
Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle

Conflicts:
enrol/manual/locallib.php

9 years agoMerge branch 'MDL-34952_master' of git://github.com/grabs/moodle
Aparup Banerjee [Wed, 29 Aug 2012 05:26:51 +0000 (13:26 +0800)]
Merge branch 'MDL-34952_master' of git://github.com/grabs/moodle

9 years agoMerge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Wed, 29 Aug 2012 04:38:17 +0000 (12:38 +0800)]
Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle

9 years agoMDL-34290 repository_filesystem: do not store files in moodle filepool unless images
Marina Glancy [Tue, 28 Aug 2012 04:03:43 +0000 (12:03 +0800)]
MDL-34290 repository_filesystem: do not store files in moodle filepool unless images

9 years agoMDL-34290 using moodleform cast to int in dropbox repository settings
Dan Poltawski [Tue, 14 Aug 2012 02:49:20 +0000 (10:49 +0800)]
MDL-34290 using moodleform cast to int in dropbox repository settings

9 years agoMDL-34290 Added timeout to googledocs request to download a file
Marina Glancy [Tue, 31 Jul 2012 03:09:35 +0000 (11:09 +0800)]
MDL-34290 Added timeout to googledocs request to download a file

9 years agoMDL-34290, MDL-33416 prepare to deprecate fields files.referencelastsync and referenc...
Marina Glancy [Fri, 10 Aug 2012 04:26:19 +0000 (12:26 +0800)]
MDL-34290, MDL-33416 prepare to deprecate fields files.referencelastsync and referencelifetime

9 years agoMDL-34290 Auto synchronise newly created references when possible
Marina Glancy [Thu, 9 Aug 2012 05:50:42 +0000 (13:50 +0800)]
MDL-34290 Auto synchronise newly created references when possible

9 years agoMDL-34665 Dropbox displays thumbnails and return info about file size and date last...
Marina Glancy [Wed, 1 Aug 2012 07:01:38 +0000 (15:01 +0800)]
MDL-34665 Dropbox displays thumbnails and return info about file size and date last modified

9 years agoMDL-34290 remove class cache_file as not used
Marina Glancy [Tue, 31 Jul 2012 03:08:25 +0000 (11:08 +0800)]
MDL-34290 remove class cache_file as not used

in fact we have moodle filepool that can work perfectly for caching files, no need to create new class and storage

9 years agoMDL-34290 repository_dropbox reference handling
Marina Glancy [Tue, 7 Aug 2012 03:26:19 +0000 (11:26 +0800)]
MDL-34290 repository_dropbox reference handling

- When Dropbox file is inserted by reference, the shared link is created and stored
- Added a function to fix old references (containing access_key/secret) with the proper ones
- Added support for external links in Dropbox (FILE_EXTERNAL), using the shared link API
- Make sure that repository::get_link() receives reference and not source (other repositories than Dropbox have those fields identical)
- Function get_file_by_reference respects request timeouts, downloads only images (for thumbnail generation),
- Function get_file respects request timeout
- do not use cache_file class (content is cached in moodle filepool if needed)
- added parameter for maximum size of files to cache
- added 'Manage' link for Filepicker
- added user name to
- added user name (if different from current) to 'Original' field
- added/corrected phpdocs

9 years agoMDL-34290 oauthlib_helper support for POST request
Marina Glancy [Tue, 7 Aug 2012 03:10:24 +0000 (11:10 +0800)]
MDL-34290 oauthlib_helper support for POST request

9 years agoMDL-34290 Allow to have several requests to the same instance of oauth_helper
Marina Glancy [Tue, 7 Aug 2012 03:35:51 +0000 (11:35 +0800)]
MDL-34290 Allow to have several requests to the same instance of oauth_helper

9 years agoMDL-34290 repository_equella: do not download files when not needed
Marina Glancy [Tue, 31 Jul 2012 02:57:54 +0000 (10:57 +0800)]
MDL-34290 repository_equella: do not download files when not needed

repository_equella::get_file_by_reference respects request timeouts, downloads only images (for thumbnail generation),
does not use cache_file class (content is cached in moodle filepool if needed);
also repository_equella has counter of unsuccessfull connect attempts and do not perform any more if 3 failed
(within one request)

9 years agoMDL-34290 repository_boxnet, boxlib use request timeouts
Marina Glancy [Tue, 31 Jul 2012 02:54:48 +0000 (10:54 +0800)]
MDL-34290 repository_boxnet, boxlib use request timeouts

boxlib receives additional argument as request timeout
repository_boxnet::get_file_by_reference respects request timeouts and downloads file into moodle only if it is image
also some improvements to repository_boxnet source display functions;
also do not cache result of request in retrieving of listing, user is unable to see the new files he added to box.

9 years agoMDL-34290 repository API: add repository function to import referenced file
Marina Glancy [Tue, 31 Jul 2012 02:50:05 +0000 (10:50 +0800)]
MDL-34290 repository API: add repository function to import referenced file

it must be independed from sync_external_file because sync often does not actually download contents, it is used just to retrieve
the size of the file. Besides the timeouts for get_file and sync requests are very different.

Also add option to send_stored_file() to ignore reference and send cached contents

9 years agoMDL-34290 repository_filesystem add original info function and reduce ref lifetime
Marina Glancy [Tue, 31 Jul 2012 02:40:31 +0000 (10:40 +0800)]
MDL-34290 repository_filesystem add original info function and reduce ref lifetime

9 years agoMDL-34290 repository API: add timeout to get_file and throw exception
Marina Glancy [Tue, 31 Jul 2012 02:31:36 +0000 (10:31 +0800)]
MDL-34290 repository API: add timeout to get_file and throw exception

- get_file should have a request timeout and throw an exception with the details (i.e. timeout reached) if download can
not be completed
- corrected phpdocs

9 years agoMDL-34290 repository API: do not confuse source and reference
Marina Glancy [Tue, 31 Jul 2012 02:17:07 +0000 (10:17 +0800)]
MDL-34290 repository API: do not confuse source and reference

make sure that repository function get_file_source_info receives as argument the source of the file,
and get_file receives a reference;
reference is a value of DB field files_reference.reference and result of get_file_reference(source).
Fix dropbox as the only repository that have different values in those fields;
also added information about user in dropbox reference and original

9 years agoMDL-34290 repository API: allow get_file_by_reference return only filesize
Marina Glancy [Tue, 31 Jul 2012 01:55:33 +0000 (09:55 +0800)]
MDL-34290 repository API: allow get_file_by_reference return only filesize

we want to allow repositories to perform quick synchronisation, without downloading the file. In this case they return
only filesize, without the contenthash

9 years agoMDL-34290 class oauth_helper, added API to pass options to curl (such as timeout)
Marina Glancy [Tue, 31 Jul 2012 01:11:11 +0000 (09:11 +0800)]
MDL-34290 class oauth_helper, added API to pass options to curl (such as timeout)

9 years agoMDL-34290 update all references after the source is changed
Marina Glancy [Tue, 31 Jul 2012 01:02:13 +0000 (09:02 +0800)]
MDL-34290 update all references after the source is changed

- When several records in {files} have the same record in {files_reference} and the synchronisation is performed, we need to update
all records in {files} so all files know if source is changed and that sync was performed;
- also when local moodle file content is changed we immediately update all files referencing to it (therefore sync of references
to the local files is unnecessary);

9 years agoMDL-31973 Groups: Bump version after changing versions in prev merge with conflicts.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 22:48:10 +0000 (00:48 +0200)]
MDL-31973 Groups: Bump version after changing versions in prev merge with conflicts.

9 years agoMerge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 22:42:43 +0000 (00:42 +0200)]
Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle

Conflicts:
lib/db/upgrade.php

9 years agoMerge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 21:23:26 +0000 (23:23 +0200)]
Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 19:05:26 +0000 (21:05 +0200)]
Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle

Conflicts:
enrol/self/editenrolment.php

9 years agoMerge branch 'w35_MDL-23875_m24_selfcohort' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:51:37 +0000 (20:51 +0200)]
Merge branch 'w35_MDL-23875_m24_selfcohort' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-34250' of github.com:stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:44:09 +0000 (20:44 +0200)]
Merge branch 'MDL-34250' of github.com:stronk7/moodle

9 years agoMDL-34250 navigation: Always look for correct parent context.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:37:46 +0000 (20:37 +0200)]
MDL-34250 navigation: Always look for correct parent context.

9 years agoMDL-25492 bb6 import: bump version after big changes.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:16:54 +0000 (20:16 +0200)]
MDL-25492 bb6 import: bump version after big changes.

9 years agoMerge branch 'MDL-25492' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:02:02 +0000 (20:02 +0200)]
Merge branch 'MDL-25492' of git://github.com/jmvedrine/moodle

9 years agoMDL-34955 fix use of uninitialised disabledsubplugins setting
Petr Škoda [Tue, 28 Aug 2012 16:40:58 +0000 (18:40 +0200)]
MDL-34955 fix use of uninitialised disabledsubplugins setting

Thanks Eloy Lafuente for spotting it!

9 years agoMDL-35064 improve enrol test comments
Petr Škoda [Tue, 28 Aug 2012 13:28:17 +0000 (15:28 +0200)]
MDL-35064 improve enrol test comments

Thanks Aparup Banerjee for the feedback.

9 years agoMDL-35064 improve enrol plugin uninstall confirmation
Petr Škoda [Tue, 28 Aug 2012 13:26:23 +0000 (15:26 +0200)]
MDL-35064 improve enrol plugin uninstall confirmation

Credit goes to Helen Foster, thanks!

9 years agoMerge branch 'MDL-34192' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 12:44:06 +0000 (14:44 +0200)]
Merge branch 'MDL-34192' of git://github.com/stronk7/moodle

9 years agoMDL-34192 mod_assign: prevent ambiguous column use for Oracle.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 12:16:15 +0000 (14:16 +0200)]
MDL-34192 mod_assign: prevent ambiguous column use for Oracle.

Credit goes to Raymond Antonio from NetSpot.

9 years agoMerge branch 'MDL-31837' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 28 Aug 2012 09:03:55 +0000 (17:03 +0800)]
Merge branch 'MDL-31837' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32464' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 28 Aug 2012 08:53:41 +0000 (16:53 +0800)]
Merge branch 'MDL-32464' of git://github.com/timhunt/moodle

9 years agoMDL-34955 fix sloppy class typo and add MUC TODO info
Petr Škoda [Tue, 28 Aug 2012 08:14:47 +0000 (10:14 +0200)]
MDL-34955 fix sloppy class typo and add MUC TODO info

Credit goes to Aparup Banerjee, thanks.

9 years agoMerge branch 'w35_MDL-34990_m24_tinymcebuttonsfix' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 07:43:19 +0000 (15:43 +0800)]
Merge branch 'w35_MDL-34990_m24_tinymcebuttonsfix' of git://github.com/skodak/moodle

9 years agoMerge branch 'w35_MDL-34879_m24_tinymcedocs' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 07:39:42 +0000 (15:39 +0800)]
Merge branch 'w35_MDL-34879_m24_tinymcedocs' of git://github.com/skodak/moodle

9 years agoMerge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 07:10:35 +0000 (15:10 +0800)]
Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle

9 years agoMerge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 07:00:26 +0000 (15:00 +0800)]
Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle

9 years agoMDL-23875 improve cohort only help
Petr Škoda [Tue, 28 Aug 2012 06:32:23 +0000 (08:32 +0200)]
MDL-23875 improve cohort only help

Credit goes to Helen Foster.

9 years agoMerge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 05:56:15 +0000 (13:56 +0800)]
Merge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle

9 years agoMDL-34549 added IGNORE_MISSING to context call for bc
Aparup Banerjee [Tue, 28 Aug 2012 04:29:17 +0000 (12:29 +0800)]
MDL-34549 added IGNORE_MISSING to context call for bc

9 years agoMerge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 28 Aug 2012 03:45:11 +0000 (11:45 +0800)]
Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 03:35:24 +0000 (11:35 +0800)]
Merge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle

9 years agoMDL-34290 curl class: add functions to return error code and to download one file
Marina Glancy [Tue, 31 Jul 2012 00:51:27 +0000 (08:51 +0800)]
MDL-34290 curl class: add functions to return error code and to download one file

9 years agoMDL-34075 - lib - Alteration to the csv import lib to include rfc-4180 compliance
Adrian Greeve [Mon, 13 Aug 2012 06:54:27 +0000 (14:54 +0800)]
MDL-34075 - lib - Alteration to the csv import lib to include rfc-4180 compliance

9 years agoMerge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 00:27:34 +0000 (02:27 +0200)]
Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 18:12:18 +0000 (20:12 +0200)]
Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-34306' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 18:06:19 +0000 (20:06 +0200)]
Merge branch 'MDL-34306' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 18:03:01 +0000 (20:03 +0200)]
Merge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-34430' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:50:29 +0000 (18:50 +0200)]
Merge branch 'MDL-34430' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34993' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:35:23 +0000 (18:35 +0200)]
Merge branch 'MDL-34993' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:17:55 +0000 (18:17 +0200)]
Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:07:24 +0000 (18:07 +0200)]
Merge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-35026' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 15:53:59 +0000 (17:53 +0200)]
Merge branch 'MDL-35026' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-35003' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 15:50:55 +0000 (17:50 +0200)]
Merge branch 'MDL-35003' of git://github.com/timhunt/moodle

9 years agoMDL-35070 fix incorrect enrol join
Petr Škoda [Mon, 27 Aug 2012 15:20:47 +0000 (17:20 +0200)]
MDL-35070 fix incorrect enrol join

9 years agoMDL-35072 fix bogus left enrol join
Petr Škoda [Mon, 27 Aug 2012 15:19:07 +0000 (17:19 +0200)]
MDL-35072 fix bogus left enrol join

Credit goes to Eloy, thanks.

9 years agoMerge branch 'MDL-35023' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:32:30 +0000 (16:32 +0200)]
Merge branch 'MDL-35023' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-35038' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:24:17 +0000 (16:24 +0200)]
Merge branch 'MDL-35038' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-35048' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:20:19 +0000 (16:20 +0200)]
Merge branch 'MDL-35048' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-35055' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:16:14 +0000 (16:16 +0200)]
Merge branch 'MDL-35055' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 13:58:19 +0000 (15:58 +0200)]
Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 27 Aug 2012 09:26:14 +0000 (17:26 +0800)]
Merge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle
Aparup Banerjee [Mon, 27 Aug 2012 09:07:46 +0000 (17:07 +0800)]
Merge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle

9 years agoMerge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle
Aparup Banerjee [Mon, 27 Aug 2012 08:56:03 +0000 (16:56 +0800)]
Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle

9 years agoMerge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Mon, 27 Aug 2012 06:20:15 +0000 (14:20 +0800)]
Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle

9 years agoMerge branch 'MDL-34996_master' of git://github.com/grabs/moodle
Aparup Banerjee [Mon, 27 Aug 2012 05:46:40 +0000 (13:46 +0800)]
Merge branch 'MDL-34996_master' of git://github.com/grabs/moodle

9 years agoMDL-34429 fixed whitespace.
Aparup Banerjee [Mon, 27 Aug 2012 04:07:15 +0000 (12:07 +0800)]
MDL-34429 fixed whitespace.

9 years agoMerge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Mon, 27 Aug 2012 04:04:45 +0000 (12:04 +0800)]
Merge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle
Aparup Banerjee [Mon, 27 Aug 2012 03:30:44 +0000 (11:30 +0800)]
Merge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle

9 years agoMDL-32386 completion: Fix incorrect method parameters
Aaron Barnes [Fri, 20 Jul 2012 01:40:42 +0000 (13:40 +1200)]
MDL-32386 completion: Fix incorrect method parameters

9 years agoMDL-35048 theme_formal_white: removed p {margin:0} from style/formal_white.css which...
Mary Evans [Sun, 26 Aug 2012 19:02:15 +0000 (20:02 +0100)]
MDL-35048 theme_formal_white: removed p {margin:0} from style/formal_white.css which was causing a regression in some areas of theme

9 years agoMDL-35072 coding style cleanup in enrol_manual
Petr Škoda [Sun, 26 Aug 2012 14:37:49 +0000 (16:37 +0200)]
MDL-35072 coding style cleanup in enrol_manual

9 years agoMDL-35052 show all enrolled users in enrol UI included those enrolled via disabled...
Petr Škoda [Sat, 25 Aug 2012 11:29:28 +0000 (13:29 +0200)]
MDL-35052 show all enrolled users in enrol UI included those enrolled via disabled plugins

9 years agoMDL-35070 coding style cleanup in enrol_self
Petr Škoda [Sun, 26 Aug 2012 13:50:40 +0000 (15:50 +0200)]
MDL-35070 coding style cleanup in enrol_self

9 years agoMDL-23875 add option to limit self-enrol to cohort members only
Petr Škoda [Sun, 26 Aug 2012 13:22:40 +0000 (15:22 +0200)]
MDL-23875 add option to limit self-enrol to cohort members only

9 years agoMDL-35061 add more custom fields for enrol instances
Petr Škoda [Sat, 25 Aug 2012 09:45:20 +0000 (11:45 +0200)]
MDL-35061 add more custom fields for enrol instances

This delays the splitting of plugin specific enrol info from shared enrol table.

9 years agoMDL-35064 add option to keep enrolments when uninstalling plugin
Petr Škoda [Sun, 26 Aug 2012 10:17:11 +0000 (12:17 +0200)]
MDL-35064 add option to keep enrolments when uninstalling plugin

9 years agoMDL-34306 gift question format: allow import of general feedback
Tim Hunt [Thu, 12 Jul 2012 18:11:06 +0000 (19:11 +0100)]
MDL-34306 gift question format: allow import of general feedback

This change introduces #### as a separator for general feedback. You need
to add ####General feedback goes here as the last thing inside the {...}.
For example

// question: 123  name: Shortanswer
::Shortanswer::Which is the best animal?{
    =Frog#Good!
    =%50%Cat#What is it with Moodlers and cats?
    =%0%*#Completely wrong
    ####Here is some general feedback!
}

Note that this change is not entirely backwards compatible. It will break
any existing GIFT file where the character sequence #### us used between the
{} as part of the question. This seems highly unlikely.

9 years agoMDL-35060 remove unused session test file
Petr Škoda [Sat, 25 Aug 2012 08:14:38 +0000 (10:14 +0200)]
MDL-35060 remove unused session test file

9 years agoMDL-34996 - Improve help text for Feedback dependancies
Andreas Grabs [Fri, 24 Aug 2012 21:08:55 +0000 (23:08 +0200)]
MDL-34996 - Improve help text for Feedback dependancies

9 years agoMDL-34952 - change get_info() to public access
Andreas Grabs [Fri, 24 Aug 2012 19:53:45 +0000 (21:53 +0200)]
MDL-34952 - change get_info() to public access

9 years agoMDL-32464 qformat multianswer: fix missing include.
Tim Hunt [Fri, 24 Aug 2012 13:19:27 +0000 (14:19 +0100)]
MDL-32464 qformat multianswer: fix missing include.

Also, add a sample file that can be used for testing, and add a unit
test to verify this is working.

9 years agoMDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call
Andrew Robert Nicols [Thu, 16 Aug 2012 19:58:12 +0000 (20:58 +0100)]
MDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call

9 years agoMDL-35055 question import: slight error with the Match grades option.
Tim Hunt [Fri, 24 Aug 2012 14:34:20 +0000 (15:34 +0100)]
MDL-35055 question import: slight error with the Match grades option.

Even in the 'Error if grade not listed case', it was applying a small
tolerance. In the case of a fuzzy match, it was returning the inexact
grade from the import file, rather than the precise grade that Moodle
was expecting.

That causes problems when the editing form is displayed, because the
value from the database does not match any of the available options, so
the grade is changed to 0%.

9 years agoMDL-31973 Groups: groups_members table should have 'component', 'itemid' fields
sam marshall [Tue, 20 Mar 2012 17:41:33 +0000 (17:41 +0000)]
MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields

9 years agoMDL-34990 improve custom toolbar setting parsing
Petr Škoda [Tue, 21 Aug 2012 08:07:03 +0000 (10:07 +0200)]
MDL-34990 improve custom toolbar setting parsing

It is probably better to parse the setting every time because somebody may put unsupported values directly into config.php, performance should not be an issue because we do not have editors on every page.

9 years agoMDL-34879 add upgrade.txt notes to editor_tinymce
Petr Škoda [Sat, 18 Aug 2012 20:48:52 +0000 (22:48 +0200)]
MDL-34879 add upgrade.txt notes to editor_tinymce