360 Commits

Author SHA1 Message Date
Matteo Scaramuccia
3960c00e3c MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
2013-06-06 23:14:42 +02:00
Petr Škoda
f111746140 MDL-39688 do not set Etag when sending http ranges 2013-05-25 09:10:24 +02:00
Marina Glancy
6dd92c0234 MDL-39177 Updating userid when file is overwritten 2013-05-20 14:09:11 +10:00
Marina Glancy
935429af8b MDL-39177 More comments about confusing files.source field 2013-05-17 13:43:45 +10:00
Marina Glancy
32495c06b5 MDL-39177 Perform all checks on draftfile area before saving the files 2013-05-17 13:43:45 +10:00
Marina Glancy
489bd32b29 MDL-39177 Remove code duplication 2013-05-17 13:43:45 +10:00
Marina Glancy
0e7fd52e20 MDL-39177 Update file in filearea only if original is present
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
2013-05-17 13:43:45 +10:00
Marina Glancy
e9e32b1d88 MDL-39177 File reference is not updated when overwriting the file 2013-05-17 13:43:44 +10:00
Petr Škoda
c2140b5d95 MDL-39356 add ca certificate bundles for cURL
This is necessary because PHP in Windows does not have any certificates and some *nix systems have outdated or missing ca bundles too.

The order is:
1/ dataroot/moodleorgca.crt always wins - needs to be added manually by admin
2/ php.ini setting "curl.cainfo" is next
3/ on Windows libdir/cacert.pem is used because it does not have any default cert bundles
4/ system default is the last - the previous value, ok for properly configured *nix systems
2013-04-28 20:58:58 +02:00
Petr Škoda
ecff46cddc MDL-38798 remove unused property which was giving notices in PHP 5.5beta 2013-04-07 11:41:19 +02:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-04-04 15:07:01 +08:00
Yuliya Bozhko
278065528a MDL-35073 badges: Open badges integration
The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges
2013-04-02 15:49:02 +08:00
Marina Glancy
d1f8c1bd62 MDL-38708 Added course overview files (most often images) to courses 2013-04-02 11:08:21 +11:00
Damyon Wiese
41fdbc0d77 MDL-38468 Filelib: Fix ordering of new mimetypes 2013-03-26 15:16:15 +08:00
Matteo Scaramuccia
2aecb84d01 MDL-38468 Files API: fixed the support for MTHML (MIME HTML: web page archive) files 2013-03-23 10:21:51 +01:00
Eloy Lafuente (stronk7)
2a28b5d4ad Merge branch 'MDL-38268-master' of https://github.com/jfilip/moodle 2013-03-13 01:14:03 +01:00
Justin Filip
2e667c7405 MDL-38268 files: Must be explicit about switching cURL request method from HEAD to GET. 2013-03-05 11:30:22 -05:00
Eloy Lafuente (stronk7)
d5834b3712 Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle 2013-03-04 16:25:00 +01:00
sam marshall
85cb4b65b1 MDL-38170 SimplePie: Cannot read https feeds through proxy 2013-03-01 10:36:51 +00:00
sam marshall
bedd74bc22 MDL-38168 Filelib: Curl class does not honour proxybypass option 2013-02-22 14:15:01 +00:00
Dan Poltawski
aa247695e7 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle 2013-02-20 14:27:27 +08:00
Frederic Massart
5961512aa3 MDL-35622 files: Fixed typo in galleryitem extension 2013-02-20 12:23:18 +08:00
Dan Poltawski
d0231ac9a9 Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle
Conflicts:
    version.php
    repository/googledocs/version.php
2013-02-19 13:54:52 +08:00
Fred
91c8cf9963 MDL-37217 files: Stricter type check for curl options 2013-02-19 13:36:23 +08:00
Dan Poltawski
28d72ad973 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-02-18 11:31:07 +08:00
Frederic Massart
58b1904fd1 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>
2013-02-11 10:26:09 +08:00
Howard Miller
540b8834fa MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:20:34 +08:00
Eloy Lafuente (stronk7)
37027f431b Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle 2013-01-21 23:26:35 +01:00
Frederic Massart
caf16a57e5 MDL-29749 files: Improved params PARAM_PATH and PARAM_FILE
The logic change here allows for multiple dots to be part
of a file name or folder name. Most Unit Tests have not
been altered and reflect the exact logic as it was before.
2013-01-17 11:32:59 +08:00
Dan Poltawski
856df69f3d Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle 2013-01-16 11:39:03 +08:00
Frederic Massart
212dac2724 MDL-36708 files: Fixed missing key in array 2013-01-16 11:28:14 +08:00
Eloy Lafuente (stronk7)
ceda80962c Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle 2013-01-15 18:17:12 +01:00
Frederic Massart
7aff468346 MDL-36708 files: Checking the size limit of a draft area does include references 2013-01-15 13:48:05 +08:00
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
sam marshall
aebe9db07f MDL-37395 Add .jar filetype so Moodle doesn't incorrectly call it a zip file 2013-01-08 12:49:23 +00:00
Dan Poltawski
bfb5580f92 Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle 2013-01-08 14:46:14 +08:00
Petr Škoda
0662bd677c MDL-29996 remove deprecated stuff from filter code 2012-12-30 17:02:18 +01:00
Frederic Massart
638d72cd0b MDL-32639 files: Improved File Manager download and zip support 2012-12-12 14:38:11 +08:00
Petr Škoda
1a4596e434 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-09 18:21:38 +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
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +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