Commit graph

56253 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
e1d0830f4f Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-08-31 11:26:49 +02:00
Eloy Lafuente (stronk7)
1c3b1f7aee MDL-35147 lesson qformat import: Dirty hack to support array questiontext structures. 2012-08-31 03:02:53 +02:00
Tim Hunt
fc51c2bce2 MDL-27818 question bank: multilang category names don't work. 2012-08-30 22:42:15 +01:00
Tim Hunt
34bc5e2f3a MDL-35133 accesslib: context_module::get_context_name should format_string
Otherwise activites with multilang names are displayed badly.
2012-08-30 22:38:24 +01:00
Eloy Lafuente (stronk7)
218010a671 Merge branch 'MDL-35147' of git://github.com/timhunt/moodle 2012-08-30 18:43:02 +02:00
Eloy Lafuente (stronk7)
345892cfb7 Merge branch 'MDL-31244' of git://github.com/timhunt/moodle 2012-08-30 18:27:03 +02:00
Tim Hunt
e231a3ffa2 MDL-27799 question bank: remove last traces of qtype constants.
Using consants to refer to plugin names is crazy. The whole point of
plugins is that you can install more, hence the list of constants will
never be complete.
2012-08-30 13:15:52 +01:00
Tim Hunt
bba5e71628 MDL-35147 lesson: fix regression from MDL-25492.
I really wish someone would fix lesson to use the question bank.
2012-08-30 13:09:10 +01:00
Aparup Banerjee
e51861e0ea Merge branch 'wip-MDL-32108-master' of git://github.com/abgreeve/moodle 2012-08-30 11:37:47 +08:00
Aparup Banerjee
2e8bf83d1b Merge branch 'MDL-35010' of git://github.com/stronk7/moodle 2012-08-30 10:38:15 +08:00
Paul Nicholls
f32cdf71a6 MDL-35134: course/format/weeks: remove trailing comma in object definition
IE doesn't like trailing commas in object (or array) definitions, and will cease processing JavaScript when it hits one.
2012-08-30 11:31:35 +12:00
Tim Hunt
2079c732f9 MDL-29662 quiz overrides: update dates during course reset.
Also, fix duplicate SQL clause in similar code in lib,
and fix error when saving overrides.
2012-08-29 18:41:37 +01:00
Tim Hunt
89269fc2c8 MDL-33306 qtype multichoice: fix display of right answer.
Also, fix  higlighing of last edited question in the qeustion bank, when
it co-incides with a grey row.
2012-08-29 17:47:48 +01:00
David Mudrák
b615c46821 MDL-34725 Make the signatures of process_legacy_element() method consistent
The patch fixes the missing parameter type declaration in all subclasses
of the moodle1_workshopform_handler class.
2012-08-29 15:35:37 +02:00
Eloy Lafuente (stronk7)
c63efc9a6b Merge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle 2012-08-29 12:14:46 +02:00
Eloy Lafuente (stronk7)
69689b4c3e Merge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle 2012-08-29 12:11:00 +02:00
Aparup Banerjee
42ac7cf123 Merge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle 2012-08-29 16:57:03 +08:00
Andrew Robert Nicols
b677b83d57 MDL-31973 Remove inadvertantly committed function call from testing 2012-08-29 09:22:11 +01:00
David Monllao
386a24d794 MDL-35119 tool_assignmentupgrade Changing onsubmit form for onclick button 2012-08-29 16:18:45 +08:00
Petr Škoda
5854be2587 MDL-34990 fix JS error when moodlenolink button not present in toolbar
Thanks Rossiani Wijaya for discovering this issue!
2012-08-29 16:13:30 +08:00
Aparup Banerjee
730d005383 Merge branch 'MDL-31959' of git://github.com/rwijaya/moodle 2012-08-29 15:33:31 +08:00
Marina Glancy
0878934f58 MDL-34310 Removed unused options from gradingform_guide 2012-08-29 14:22:01 +08:00
Aparup Banerjee
8be5407bc1 Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle
Conflicts:
	enrol/manual/locallib.php
2012-08-29 13:46:04 +08:00
Aparup Banerjee
8df0008856 Merge branch 'MDL-34952_master' of git://github.com/grabs/moodle 2012-08-29 13:26:51 +08:00
Aparup Banerjee
a476581f0d Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle 2012-08-29 12:38:17 +08:00
Marina Glancy
63d8ccef81 MDL-34290 repository_filesystem: do not store files in moodle filepool unless images 2012-08-29 11:56:19 +08:00
Dan Poltawski
7e3f70bed7 MDL-34290 using moodleform cast to int in dropbox repository settings 2012-08-29 11:56:18 +08:00
Marina Glancy
7bb7bd2e79 MDL-34290 Added timeout to googledocs request to download a file 2012-08-29 11:56:18 +08:00
Marina Glancy
42aa6e15bb MDL-34290, MDL-33416 prepare to deprecate fields files.referencelastsync and referencelifetime 2012-08-29 11:56:18 +08:00
Marina Glancy
437f5dc4cf MDL-34290 Auto synchronise newly created references when possible 2012-08-29 11:56:17 +08:00
Marina Glancy
f4fe646b71 MDL-34665 Dropbox displays thumbnails and return info about file size and date last modified 2012-08-29 11:56:17 +08:00
Marina Glancy
db02d84a40 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
2012-08-29 11:56:17 +08:00
Marina Glancy
75dd40b265 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
2012-08-29 11:56:16 +08:00
Marina Glancy
6ec6842933 MDL-34290 oauthlib_helper support for POST request 2012-08-29 11:56:16 +08:00
Marina Glancy
7e1e775fa4 MDL-34290 Allow to have several requests to the same instance of oauth_helper 2012-08-29 11:56:16 +08:00
Marina Glancy
fa746096cf 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)
2012-08-29 11:56:15 +08:00
Marina Glancy
f24b0f69ee 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.
2012-08-29 11:56:15 +08:00
Marina Glancy
bc6f241ca2 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
2012-08-29 11:56:15 +08:00
Marina Glancy
96221c605a MDL-34290 repository_filesystem add original info function and reduce ref lifetime 2012-08-29 11:56:15 +08:00
Marina Glancy
72a5655566 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
2012-08-29 11:56:14 +08:00
Marina Glancy
59cb759850 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
2012-08-29 11:56:14 +08:00
Marina Glancy
2d222a3243 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
2012-08-29 11:56:07 +08:00
Marina Glancy
8d8a6009e8 MDL-34290 class oauth_helper, added API to pass options to curl (such as timeout) 2012-08-29 11:56:06 +08:00
Marina Glancy
14b7e50001 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);
2012-08-29 11:56:00 +08:00
Eloy Lafuente (stronk7)
77a7da60db MDL-31973 Groups: Bump version after changing versions in prev merge with conflicts. 2012-08-29 00:48:10 +02:00
Eloy Lafuente (stronk7)
238f7761af Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle
Conflicts:
	lib/db/upgrade.php
2012-08-29 00:42:43 +02:00
Eloy Lafuente (stronk7)
71ff7c2c04 Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle 2012-08-28 23:23:26 +02:00
David Mudrák
7092ea5da5 MDL-35109 Fix available_update_checker::cron_has_fresh_fetch()
For the purpose of cron based fetching, recently fetched data are valid
for 24 hours.
2012-08-28 22:59:33 +02:00
David Mudrák
720f7c12e8 MDL-35109 Improve unittests for cron based fetching of available updates
The expected behaviour is as follows:

* If the recently fetched data is older than 48 hours, it is considered
  as outdated and the new fetch is executed
* else, if the recently fetched data is younger than 24 hours, it is
  considered as fresh enough and no fetch is executed
* else, if the current time is after 01:00 AM plus a certain offset
  (which is randomly generated for each site), the fetch is
  executed.
2012-08-28 22:59:26 +02:00
Eloy Lafuente (stronk7)
af1e3f2828 Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle
Conflicts:
	enrol/self/editenrolment.php
2012-08-28 21:05:26 +02:00