Commit graph

14660 commits

Author SHA1 Message Date
Aparup Banerjee
42ac7cf123 Merge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle 2012-08-29 16:57:03 +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
a476581f0d Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle 2012-08-29 12:38:17 +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
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
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
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
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)
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
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)
928dfdee48 Merge branch 'MDL-34250' of github.com:stronk7/moodle 2012-08-28 20:44:09 +02:00
Eloy Lafuente (stronk7)
111938abd9 MDL-34250 navigation: Always look for correct parent context. 2012-08-28 20:37:46 +02:00
Petr Škoda
71c3b0479a MDL-34955 fix use of uninitialised disabledsubplugins setting
Thanks Eloy Lafuente for spotting it!
2012-08-28 18:57:19 +02:00
Petr Škoda
ddcea181af MDL-34955 fix sloppy class typo and add MUC TODO info
Credit goes to Aparup Banerjee, thanks.
2012-08-28 16:17:43 +08:00
Aparup Banerjee
55fa9f1fa0 Merge branch 'w35_MDL-34990_m24_tinymcebuttonsfix' of git://github.com/skodak/moodle 2012-08-28 15:43:19 +08:00
Aparup Banerjee
4655497005 Merge branch 'w35_MDL-34879_m24_tinymcedocs' of git://github.com/skodak/moodle 2012-08-28 15:39:42 +08:00
Aparup Banerjee
1dd73f963c Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle 2012-08-28 15:10:35 +08:00
Aparup Banerjee
edcdd37525 Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle 2012-08-28 15:00:26 +08:00
Andrew Davis
f361678362 MDL-26504 blog: added upgrade code to remove orphan external blog posts 2012-08-28 14:55:33 +08:00
Aparup Banerjee
0c4ee46d77 Merge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle 2012-08-28 13:56:15 +08:00
Aparup Banerjee
9455f48280 Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle 2012-08-28 11:45:11 +08:00
Marina Glancy
a3c94686aa MDL-34290 curl class: add functions to return error code and to download one file 2012-08-28 10:23:36 +08:00
Adrian Greeve
96729f6d2d MDL-34075 - lib - Alteration to the csv import lib to include rfc-4180 compliance 2012-08-28 09:23:16 +08:00
David Monllao
12fc11e78f MDL-34965 core_lib Redirect to the login page when session expires before autologin as guest 2012-08-28 08:58:59 +08:00
Eloy Lafuente (stronk7)
1a5367873d Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle 2012-08-28 02:27:34 +02:00
Eloy Lafuente (stronk7)
2b64e24ebe MDL-35089 conditionals: detected one place missing sectioncache
Thanks to MDL-34936 and unit tests this was discovered like 2 new
places calling to get_fast_modinfo() without the sectioncache
column contents. Potential performance problem, leading to
reseting and recalculation of caches all the time.
2012-08-28 01:38:09 +02:00
Eloy Lafuente (stronk7)
d683fcdf98 Merge branch 'MDL-34993' of git://github.com/timhunt/moodle 2012-08-27 18:35:23 +02:00
Eloy Lafuente (stronk7)
6b2b869049 Merge branch 'MDL-35055' of git://github.com/timhunt/moodle 2012-08-27 16:16:14 +02:00
Eloy Lafuente (stronk7)
aec4783bf6 Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle 2012-08-27 15:58:19 +02:00
David Monllao
65cd3f9c16 MDL-35029 core_session Refresh guest session if autologin as guest is enabled 2012-08-27 17:03:11 +08:00
Aparup Banerjee
a1a5d8968e Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle 2012-08-27 14:20:15 +08:00
Aaron Barnes
1caeb4b450 MDL-32386 completion: Fix incorrect method parameters 2012-08-27 10:57:52 +12:00
Petr Škoda
882fb83519 MDL-35061 add more custom fields for enrol instances
This delays the splitting of plugin specific enrol info from shared enrol table.
2012-08-26 15:55:03 +02:00
Petr Škoda
33c7a2d121 MDL-35060 remove unused session test file 2012-08-25 10:14:38 +02:00
Andrew Robert Nicols
fd0680ff4a MDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call 2012-08-24 15:43:38 +01:00
Tim Hunt
aa5f05110f 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%.
2012-08-24 15:34:20 +01:00
sam marshall
1d1917aeaa MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields 2012-08-24 15:30:13 +01:00
Petr Škoda
b3aefe3cc8 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.
2012-08-24 16:11:00 +02:00
Petr Škoda
0bc9b897f9 MDL-34879 add upgrade.txt notes to editor_tinymce 2012-08-24 16:11:00 +02:00
Petr Škoda
883ecce0e9 MDL-34955 fix missing string 2012-08-24 16:11:00 +02:00
Petr Škoda
0b7858221c MDL-34955 add full TinyMCE subplugin management 2012-08-24 16:11:00 +02:00
Petr Škoda
caaccae5da MDL-34878 add custom TinyMCE toolbar setting 2012-08-24 16:10:59 +02:00
Petr Škoda
116ad39b7a MDL-34877 add tinymce subplugin setting support
Includes migration of spell related settings to spellchecker plugin.
2012-08-24 16:10:59 +02:00
Ankit Agarwal
5fbe2118bc MDL-34549 libraries: Changing strictness of context::instance_by_id() when required 2012-08-24 11:30:35 +08:00