mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-24 07:41:40 +02:00
Code Issues Projects Releases Wiki Activity
77,796 Commits 37 Branches 540 Tags
957e0c7567b95e448fc9cc65d2b51a50f379963a
Commit Graph

425 Commits

Author SHA1 Message Date
Petr Škoda
4db9d48253 MDL-28094 add function that detects if subdirs used and fix subdirs option in form editor 2013-09-07 11:30:18 +02:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib 
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
 2013-08-26 13:59:19 +12:00
Damyon Wiese
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib" 
This reverts commit af62237d0e.
This reverts commit 87a4194fdc.
This reverts commit b2c66eb60c.

Conflicts:

	version.php
 2013-08-22 13:31:25 +08:00
Sam Hemelryk
af62237d0e MDL-40931 useragent: separated user agent functionality into a lib 
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
 2013-08-16 09:02:01 +12:00
Petr Škoda
eb459f7192 MDL-40642 set more restrictive umask and use proper permission for new dirs and files 2013-07-19 09:18:44 +02:00
Petr Škoda
b0d1d941c9 MDL-40220 use new core_component::get_component_directory() 2013-07-16 22:42:37 +02:00
Matteo Scaramuccia
78030f9db1 MDL-39832 Files: Fixed ETag format according with RFC2616. 
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
 2013-07-07 09:02:17 +02:00
Matteo Scaramuccia
264631cdc8 MDL-39832 Files: Revert MDL-39688 commit, f111746140 
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-07-07 09:02:15 +02:00
Eloy Lafuente (stronk7)
2e746b72be MDL-39733 xhprof: implement import of runs 2013-07-02 00:28:47 +02:00
Sam Chaffee
41340f0461 MDL-40258: Fixed invalid json string error in file-picker 2013-06-21 11:16:44 -04:00
Petr Škoda
220eef0e4c MDL-33955 make downalod_file_content() use curl class and cleanup 
The options in constructor were renamed to setttings in order to prevent confusion.
This removes ignored CURLOPT_BINARYTRANSFER, add newline header cleaning,
reworks proxy settings and some other minor issues.
 2013-06-14 08:03:49 +02:00
Petr Škoda
9936c2a54c MDL-33955 fix sloppy whitespace in curl class 2013-06-14 08:03:49 +02:00
Dan Poltawski
a151eb403e Revert "MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1" 
This reverts commit 3960c00e3c.
 2013-06-13 13:56:11 +08:00
Dan Poltawski
db74804ff1 Revert "MDL-39832 Files: Fixed ETag format according with RFC2616." 
This reverts commit 9ab37ae3e0.
 2013-06-13 13:56:09 +08:00
Matteo Scaramuccia
9ab37ae3e0 MDL-39832 Files: Fixed ETag format according with RFC2616. 
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
 2013-06-06 23:14:44 +02:00
Matteo Scaramuccia
3960c00e3c MDL-39832 Files: Revert MDL-39688 commit, f111746140 
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