Commit Graph

332 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 26431c6f94 Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-03-04 16:26:07 +01:00
sam marshall 850d33e658 MDL-38170 SimplePie: Cannot read https feeds through proxy 2013-03-01 10:33:24 +00:00
sam marshall aee5f1f4d8 MDL-38168 Filelib: Curl class does not honour proxybypass option 2013-02-22 14:20:04 +00:00
Dan Poltawski 349a6fde37 Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-20 14:27:52 +08:00
Frederic Massart 16296b4a84 MDL-35622 files: Fixed typo in galleryitem extension 2013-02-20 12:23:56 +08:00
Dan Poltawski a2f6f882c4 Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Conflicts:
	lib/db/upgrade.php
	version.php
2013-02-18 11:33:00 +08:00
Frederic Massart bac188fa71 MDL-35622 files: Add support for SMART Notebook MIME types
- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945

Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Fixed by: Paul Holden <pholden@greenhead.ac.uk>

Conflicts:

	lib/db/upgrade.php
	version.php
2013-02-11 10:29:50 +08:00
Howard Miller 3bcf80e9f2 MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:23:23 +08:00
Eloy Lafuente (stronk7) 0218dd4ccb Merge branch 'MDL-37395-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE 2013-01-15 18:17:24 +01:00
sam marshall c3775f93ab MDL-37395 Add .jar filetype so Moodle doesn't incorrectly call it a zip file 2013-01-08 12:50:17 +00:00
Frederic Massart 217d7979b9 MDL-36708 files: Checking the size limit of a draft area does include references 2013-01-07 17:29:04 +08:00
Petr Škoda f48902e139 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-09 18:22:16 +01:00
Frederic Massart f19d57e514 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:58:33 +08:00
Dan Poltawski a56dc90320 Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2012-11-08 18:10:26 +08:00
Marina Glancy b5cf83f080 MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options
- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object
2012-11-02 10:56:19 +08:00
Frederic Massart 68acd1157e MDL-33766 files: Improved validation of areamaxbytes 2012-11-01 16:47:06 +08:00
Frederic Massart 21e3ea77a3 MDL-33766 files: Support for userquota/size limit in draft areas 2012-11-01 16:46:42 +08:00
Eloy Lafuente (stronk7) dbaf9d448d Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle 2012-10-10 00:35:11 +02:00
Eloy Lafuente (stronk7) b9570857db Merge branch 'MDL-35141-master' of git://github.com/sammarshallou/moodle 2012-10-09 00:46:49 +02:00
Sam Hemelryk 436dbeecda MDL-22955 theme: Added ability to use SVG format for icons 2012-10-08 09:16:14 +13:00
Rex Lorenzo ff37d63c1b MDL-35376 - Shortcut/alias not working for Private file repo 2012-09-11 14:23:12 -07:00
sam marshall ed0f5a9507 MDL-35141 Filelib: No icon for epub filetype 2012-08-30 12:13:56 +01: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 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 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 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
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
Eloy Lafuente (stronk7) 76b97631b0 Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-08-15 00:41:04 +02:00
Dan Poltawski 850d2db82a MDL-25012 - blogs: introduce a specific 'enabled' config setting
Rather than overloading the $CFG->bloglevel setting which had a
confusing UI in the appearance subsystem.

In order to achieve this we modify take the defaults from the existing
bloglevel setting and set that for $CFG->enableblogs. Note that in order
to prevent a bad default settings from being set we also set
$CFG->bloglevel to a valid 'enabled' setting.
2012-08-06 11:25:22 +08:00
Petr Škoda faf40ca3e3 MDL-34585 fix broken blog file access control 2012-08-02 09:58:16 +02:00
Adrian Greeve b0c6dc1cac MDL-34465 - lib - Replacing get_context_instance with context_XXXX::instance (group 8) 2012-07-27 10:10:46 +08:00
David Balch 96aeb5be35 MDL-34143 Add file type information for .mdb .accdb (MS Access databases) 2012-07-06 09:44:25 +08:00
Eloy Lafuente (stronk7) 2fba8f5a92 Merge branch 'wip-MDL-34063-master' of git://github.com/marinaglancy/moodle 2012-07-05 18:34:27 +02:00
Sam Hemelryk c425663c4c Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2 2012-07-04 09:32:45 +12:00
David Balch c7aed1e11b MDL-34063 XHTML files should use the HTML icon, not the markup icon 2012-07-02 14:25:56 +08:00
Marina Glancy 3b6629c088 MDL-33948 file_save_draft_area_files() validates if references are allowed and allows unlimited file size 2012-07-02 14:11:55 +08:00
Martin Dougiamas 386a862f95 MDL-34004 - reinstate the custom HTML icon as separate from other markup icons, because it usually means a "page" to most people that displays in the browser. These icons are temporary (but workable) until Barbara can put in some nice ones that work as a set. The 16px one is from Moodle 2.2 and the others are copies of "unknown". 2012-06-25 23:05:44 +08:00
Barbara Ramiro 5a322c8cfc MDL-33381 Icon label removed for all file types to make it generic 2012-06-21 18:19:33 +08:00
Marina Glancy 83d2700ec9 MDL-33832 Fixed filling of files.source field
- also supress the error on unserialise (because people already may have broken files.source field)
- also display details about unparseable JSON error
- make source field look the same across repositories
2012-06-20 16:09:37 +08:00
Jonathan Harker def4a8f5b7 MDL-27125 better manage file handles when downloading multiple files.
Based on Dongsheng Cai's branch: s11_MDL-27125_curl_file_handler_master
2012-06-20 16:46:29 +12:00
Dongsheng Cai d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00
Dan Poltawski 4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Dan Poltawski 414ce30812 Revert MDL-33513
This reverts commit b2cf2b807f.
This reverts commit 24b96f0170.
This reverts commit 39c60294a6.
This reverts commit 8a288971e2.
2012-06-14 13:57:45 +08:00
Dan Poltawski cd925ac79b Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle 2012-06-14 11:12:21 +08:00
Marina Glancy 0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
2012-06-13 12:11:06 +08:00
Marina Glancy ff32444a7c MDL-33590 Correctly determine that file is an archive to enable unzip in filemanager 2012-06-13 08:57:10 +08:00
Dongsheng Cai 8a288971e2 MDL-33513: Make files->source field consistent 2012-06-10 17:47:00 +10:00
Sam Hemelryk 238858e362 MDL-26277: Fixed whitespace post integration 2012-06-06 09:15:18 +12:00
Sam Hemelryk 7df271d9b3 Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle 2012-06-06 08:51:11 +12:00
Dan Poltawski 9856d05c26 Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle 2012-05-29 15:00:21 +08:00