mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity
53,988 Commits 37 Branches 536 Tags
Commit Graph

53988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Poltawski
b3245b758c Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle 
Conflicts:
	admin/index.php
	admin/renderer.php
	version.php
 2012-06-04 19:25:58 +08: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
Dan Poltawski
f27735e470 Merge branch 'MDL-33480' of git://github.com/stronk7/moodle 2012-06-04 16:59:49 +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
5df1b73748 MDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php 
The sesskey needs to be embeded in the local url returned as this is the
only parameter we have control of.
 2012-06-04 11:11:38 +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
Eloy Lafuente (stronk7)
34570f86bc MDL-33480 book print tool: display intro images properly 2012-06-04 01:46:53 +02: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
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
Dan Poltawski
4db061680e on-demand release 2.3dev 2012-06-01 17:03:32 +08:00
Dan Poltawski
fe591d0d24 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-01 17:01:41 +08: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
Eloy Lafuente (stronk7)
dac01a7444 Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle 2012-05-31 16:14:57 +02:00
Dan Poltawski
c9bd018825 Merge branch 'MDL-33434' of git://github.com/stronk7/moodle 2012-05-31 16:59:23 +08:00
Aparup Banerjee
267080d4ea Merge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle 2012-05-31 15:20:53 +08:00
Aparup Banerjee
ffbe29a6bd Merge branch 'MDL-33140' of git://github.com/timhunt/moodle 2012-05-31 14:15:19 +08:00
Frederic Massart
ccc604a24d MDL-33398 Cron: fix wrong variable type in completion criterias 2012-05-31 12:50:38 +08:00
Dan Poltawski
9c6e153888 Merge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle 2012-05-31 10:35:50 +08:00
AMOS bot
e1041a38ca Automatically generated installer lang files 2012-05-31 00:31:19 +00: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
Tim Hunt
602a76d86a MDL-33140 quiz browser security: block copy/paste more 2012-05-30 14:48:39 -06:00
Dan Poltawski
b7acfd645b MDL-29857 google apis: OAuth 2.0 portfolio plugins upgrade 
We are disabling the plugins if not configured. As part of
this upgrade we will emailing admins about this change
if they have a plugin configured.

This is required because OAuth 2 credentials are now required
in the plugin configuration.

NOTE: These strings are temporary and need to be improved.
 2012-05-31 00:19:30 +08:00
Dan Poltawski
ce30ff5df0 MDL-29857 google apis: OAuth 2.0 repository plugins upgrade 
We are disabling the plugins on upgrade and emailing admins
about this if they have a plugin configured.

This is required because OAuth 2 credentials are now required
in the plugin configuration.

NOTE: These strings are temporary and need to be improved.
 2012-05-31 00:19:30 +08: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
e937c5456e MDL-32329 fixed missing phpdoc and improved coding style 
Credit goes to Aparup Banerjee for spotting this during the integration
review.
 2012-05-30 10:35:28 +02:00
David Mudrak
ead8ba3b63 MDL-32329 improved plugin dependencies check on upgrade 
Previously, it was the renderer method that actually called
all_plugins_ok(). I believe that renderer methods should not be
responsible for such an important step in the install/upgrade code flow.
So dependencies are now checked by admin/index.php on upgrade, too.
 2012-05-30 10:35:28 +02:00
David Mudrak
39f15cc712 MDL-32329 check for plugin dependencies during the pre-install checking 
This follows the same path as we have in CLI installers. Plugin
dependencies are checked right after the environment checks and the
install can't continue unless all dependencies are fixed.
 2012-05-30 10:35:28 +02: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
f1753a5b10 MDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies 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
Aparup Banerjee
380d472314 Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle 2012-05-30 14:22:34 +08:00
Dan Poltawski
2605112e0b Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle 2012-05-30 14:14:50 +08:00
Barbara Ramiro
7c3e665289 MDL-33218 Filepicker repository and toolbar aligned for IE 2012-05-30 13:56:34 +08:00
Sam Hemelryk
378eb6f6a2 Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle" 
This reverts commit a09a9be81210a29a0c093ff34dc5685c86b84022, reversing
changes made to 08e0aaa1733489cee61b1c48e166a98ada4477cb.
 2012-05-30 16:34:11 +12:00
Dan Poltawski
d88f1a51fc Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 11:45:32 +08:00
Rossiani Wijaya
6b0e5f4d6d MDL-32766 course view section log: fixed the forth param for restore rule specification to use course_section 2012-05-30 15:41:07 +12:00
Dan Poltawski
7fd264b0d1 Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle 2012-05-30 11:35:56 +08:00
Sam Hemelryk
6fbe06e530 Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 15:26:27 +12:00