mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
54,039 Commits 36 Branches 519 Tags
Commit Graph

13486 Commits

Author SHA1 Message Date
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
469f4078c5 Merge branch 'MDL-33019-master-2' of git://git.luns.net.uk/moodle 2012-06-05 15:32:45 +08:00
Dan Poltawski
2812b87bab Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle 2012-06-05 15:23:28 +08:00
Marina Glancy
efa28f30f2 MDL-33391 Files API, Repository : mimetype should be determined from file extension when possible 2012-06-05 13:29:07 +08:00
Dan Poltawski
29304b6c7d Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle 2012-06-05 12:34:29 +08:00
Dan Poltawski
490ef89365 Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle 2012-06-05 12:09:44 +08:00
Dan Poltawski
7e5789c12c Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle 2012-06-05 10:10:21 +08:00
Marina Glancy
2ea47082f0 MDL-33479 removed legacy constructor causing strict notice in php5 2012-06-05 09:27:32 +08:00
Marina Glancy
2dfa16ef8a MDL-33409 Newly copied files should take on the userid of the current user, and dates reset 
- changed function repository::copy_to_area so it accepts more file attributes, pass changed attributes to it
- changed file_info::copy_to_storage and file_info_stored::copy_to_storage to accept more file attributes
- simplified file size check for moodle files in repository/repository_ajax.php
- removed unused code in repository/repository_ajax.php
 2012-06-05 09:26:26 +08:00
Ankit Agarwal
586e797689 MDL-33401 blocks: Allow managers to have block:edit capability by default 2012-06-05 08:50:43 +08:00
Eloy Lafuente (stronk7)
aa12ec984c MDL-32985 cron: prevent notices on "new" sites. 2012-06-05 02:14:13 +02:00
Eloy Lafuente (stronk7)
4baa746eae Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle 2012-06-05 02:02:12 +02:00
Eloy Lafuente (stronk7)
d291dfd0aa Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle 2012-06-05 00:42:59 +02:00
Eloy Lafuente (stronk7)
080f585f39 Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle 2012-06-04 21:47:14 +02:00
Eloy Lafuente (stronk7)
0b702fca0b Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle 2012-06-04 19:55:21 +02:00
Eloy Lafuente (stronk7)
a301675101 Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle 2012-06-04 11:33:47 +02:00
Dan Poltawski
1cf840074b Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle 2012-06-04 17:13:35 +08:00
Petr Skoda
03f0cd1039 MDL-33007 fix incorrect min_fix_utf8() tests 
Credit goest to Eloy Lafuente.
 2012-06-04 10:45:44 +02:00
Dan Poltawski
1cbaf803d0 MDL-29173 - fix whitespace error 2012-06-04 16:32:25 +08:00
Dan Poltawski
6f337ea935 Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle 2012-06-04 15:55:54 +08:00
Dan Poltawski
7b61ac39d2 MDL-33507 - oauth2lib: switch 'code' to oauth2code 
To avoid param collisions in future.
 2012-06-04 11:25:19 +08:00
Dan Poltawski
db7602af7c MDL-33501 - oauth2lib: improve redirect url handling 
Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.
 2012-06-04 10:57:39 +08:00
Petr Skoda
bd672f7830 MDL-33436 include phpunit printer file from our lib.php 
The problem is that the phpunit.xml does not support relative links.
 2012-06-02 21:48:26 +02:00
sam marshall
38d06fea66 MDL-32107 Activity completion: should use get_enrolled_sql instead of reinventing wheel 2012-06-01 12:25:59 +01:00
Petr Skoda
0aff15c2c9 MDL-33007 add workaround for broken iconv //IGNORE 
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
 2012-06-01 12:23:09 +02:00
Petr Skoda
3681e78429 MDL-33007 add buggy iconv workaround to configonlylib, add tests and fix minor issues 2012-06-01 12:23:09 +02:00
Sam Hemelryk
84ec16a861 Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle 2012-06-01 13:42:01 +12:00
Eloy Lafuente (stronk7)
5669b28d59 Merge branch 'MDL-33326' of git://github.com/stronk7/moodle 2012-06-01 00:58:08 +02:00
Dan Poltawski
c9bd018825 Merge branch 'MDL-33434' of git://github.com/stronk7/moodle 2012-05-31 16:59:23 +08:00
Frederic Massart
ccc604a24d MDL-33398 Cron: fix wrong variable type in completion criterias 2012-05-31 12:50:38 +08:00
Jerome Mouneyrac
93ce0e8296 MDL-32581 support additional format field with all text field in extrnal lib function + new possible ws params to decide how format is returned (which are stored in a singleton) 2012-05-31 12:31:27 +08:00
Eloy Lafuente (stronk7)
a3fa993212 MDL-33434 mssql: Improve handling of returned ids on insert. 
This commit moves from the batch SCOPE_IDENTITY() way to return
the inserted ids to the OUTPUT alternative (supported and
recommended since 2005). Also the handling of possible return
values is improved, with all the alternatives leading to expected results.
 2012-05-31 01:01:14 +02:00
Eloy Lafuente (stronk7)
cbdcdd4734 MDL-33434 dml: define expected results when unique constraint is violated on insert. 2012-05-31 01:00:07 +02:00
Dan Poltawski
4560fd1b66 MDL-29857 - google apis: Convert to OAuth 2.0 
Updated the various plugins to use OAuth 2.0 for authentication
against google apis. Google are phasing out AuthSub and pushing OAuth as
the replacement.

This changes repository_googledocs, repository_picasa,
portfolio_googledocs and portfolio_picasa

The token for requests is now stored in session rather than a user
prefence and it persists less but doesn't bother the user more than
necessary.

The google docs portfolio plugin is converted to use resumable upload
API as this appears to be what Google have replaced this with.

Unfortunately unlike authsub OAuth will require some setup by admins,
this is linked as a docs page.
 2012-05-31 00:00:25 +08:00
Dan Poltawski
469fb5d672 MDL-29857 - lib: Add an OAuth 2.0 client 
A generic OAuth 2.0 for the web application flow, tested against
microsoft and google apis.

Added a callback endpoint for requests so that clients can use a single
endpoint (without GET params). I put this in /admin/ as I expect some
sites will have .htaccess denying access to /lib/.
 2012-05-31 00:00:23 +08:00
Aparup Banerjee
1adb060a87 Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle 2012-05-30 16:48:23 +08:00
David Mudrak
3a2300f552 MDL-32329 new plugininfo_base::is_core_dependency_satisfied() method 
The method's logic was previously implemented in all_plugins_ok() but we
will need to call it separately. Also make the code cleaner.
 2012-05-30 10:35:28 +02:00
David Mudrak
927cb51166 MDL-32329 plugin manager returns plugins with unsatisfied dependencies 2012-05-30 10:35:28 +02:00
Aparup Banerjee
e4b5455738 Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle 2012-05-30 15:18:59 +08:00
Dan Poltawski
7fd264b0d1 Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle 2012-05-30 11:35:56 +08:00
Frederic Massart
322945e9ca MDL-33184 Filepicker: rephrased drag and drop sentence 2012-05-30 10:05:10 +08:00
Aaron Barnes
28e0c239ec MDL-33398 completion: Fix coding error (should be arrays not objects) 2012-05-30 13:27:51 +12:00
Eloy Lafuente (stronk7)
294d976e28 MDL-33326 filestorage tests: Coding style fixes 2012-05-30 02:26:57 +02:00
Dan Poltawski
996f8b6442 MDL-33326 filestorage tests: Add more coverage 2012-05-30 02:26:46 +02:00
Dan Poltawski
7c89a18fca MDL-33326 filestorage tests: Actually verify results 
Rather than the placeholder tests which were added before to trigger
DB incompatibilities
 2012-05-30 02:26:36 +02:00
Andrew Davis
eb9f06f9c1 MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php 2012-05-29 16:38:42 +07:00
Aparup Banerjee
95a8956884 Merge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle 2012-05-29 16:31:26 +08:00
Dan Poltawski
0ed8a933d6 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-29 15:08:46 +08:00
Dan Poltawski
9856d05c26 Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle 2012-05-29 15:00:21 +08:00
Dan Poltawski
fa31bfc181 Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle 2012-05-29 14:58:31 +08:00