mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
49,834 Commits 36 Branches 523 Tags
Commit Graph

49834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Mouneyrac
5b9735b949 MDL-29716 Make token more flexible to support third party client - also fix issue with some code not matching the way the server authenticate/authorize token, missing iprestriction/validuntil for restricted users (there are iprestriction/validiuntil on token and on restricted user). Also add missing check when the user is not listed in the authorised list. 2011-10-25 11:17:18 +08:00
Sam Hemelryk
e6acc5518b MDL-29106 white space clean up 2011-10-25 15:28:52 +13:00
Sam Hemelryk
d040ea8893 Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle 2011-10-25 15:19:45 +13:00
Sam Hemelryk
6327bf8f2b Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle 2011-10-25 14:28:53 +13:00
Sam Hemelryk
44d10ad002 Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle 2011-10-25 14:02:20 +13:00
Sam Hemelryk
9d9d8e17eb Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle 2011-10-25 13:10:43 +13:00
Eloy Lafuente (stronk7)
9bfe68bff8 Merge branch 'MDL-29339_b' of git://github.com/timhunt/moodle 2011-10-25 01:53:51 +02:00
Eloy Lafuente (stronk7)
dc83f5b006 Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle 2011-10-25 01:42:48 +02:00
Sam Hemelryk
6f59dd1a8b Merge branch 'MDL-29906' of git://github.com/timhunt/moodle 2011-10-25 12:25:28 +13:00
Eloy Lafuente (stronk7)
4ecbf079b5 Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle 
Conflicts:
	lib/thirdpartylibs.xml
 2011-10-25 01:21:09 +02:00
Eloy Lafuente (stronk7)
e1595b32dc Merge branch 'w42_MDL-29863_m22_extendsorder' of git://github.com/skodak/moodle 2011-10-25 01:01:10 +02:00
Sam Hemelryk
9c99c3df46 Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle 2011-10-25 11:49:25 +13:00
Sam Hemelryk
2d94084463 Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle 2011-10-25 11:46:51 +13:00
Sam Hemelryk
c486d7f2d8 Merge branch 'MDL-29459' of git://github.com/mouneyrac/moodle 2011-10-25 11:45:58 +13:00
Sam Hemelryk
2336a84333 MDL-29106 webservices: Minor whitespace cleanup 2011-10-25 11:43:53 +13:00
Sam Hemelryk
b8b594843c Merge branch 'MDL-29106' of git://github.com/mouneyrac/moodle 2011-10-25 11:42:40 +13:00
Eloy Lafuente (stronk7)
e4950b6cf0 Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle 2011-10-24 23:14:31 +02:00
Eloy Lafuente (stronk7)
1272091a6c Merge branch 'w42_MDL-29878_m22_typo3' of git://github.com/skodak/moodle 2011-10-24 23:04:54 +02:00
Eloy Lafuente (stronk7)
918ecf1754 Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle 2011-10-24 23:03:11 +02:00
Eloy Lafuente (stronk7)
a4f6cc2fc7 Merge branch 'w42_MDL-29887_m22_swfobject' of git://github.com/skodak/moodle 2011-10-24 18:25:52 +02:00
Eloy Lafuente (stronk7)
b64188cd97 Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle 2011-10-24 18:03:42 +02:00
Eloy Lafuente (stronk7)
e9296e6177 Merge branch 'w42_MDL-29885_m22_csshover' of git://github.com/skodak/moodle 2011-10-24 17:50:27 +02:00
Petr Skoda
22d7cede55 MDL-29887 add forgotten flashvars 
Thanks Eloy!
 2011-10-24 17:43:05 +02:00
Tim Hunt
442a3c0b62 MDL-29906 quiz statistics report: replace use of deprectaed helpbutton. 2011-10-24 16:19:46 +01:00
Dan Poltawski
e52a8ebdd2 MDL-29902: Course contacts display cleanup 
This fixes warnings in course description when searching courses with
users assigned multiple display roles. It cleans up inconsistent behaviour
which I noticed whilst fixing the bug. Now course search and course listing
use the same logic to display users.
 2011-10-24 15:52:35 +01:00
Eloy Lafuente (stronk7)
f3b6463506 Merge branch 'w42_MDL-29886_m22_md5js' of git://github.com/skodak/moodle 2011-10-24 16:51:53 +02:00
Andrew Robert Nicols
3b3b8c6b0b MDL-29898: Fix documentation for CLI DB only installer 2011-10-24 12:31:16 +01:00
Tim Hunt
deef04a44e MDL-29339 Manually cast objects to string before calling dmllib. 2011-10-24 11:08:10 +01:00
Aparup Banerjee
0e03740fc8 Merge branch 'MDL-29542' of git://github.com/rwijaya/moodle 2011-10-24 17:05:17 +08:00
Aparup Banerjee
64fcc674f9 Merge branch 'MDL-29828' of git://github.com/timhunt/moodle 2011-10-24 16:39:17 +08:00
Aparup Banerjee
ef0aa7ba5c MDL-29527 RSS : improved language string. 2011-10-24 15:50:58 +08:00
Aparup Banerjee
9809413bba Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle 2011-10-24 15:37:14 +08:00
Aparup Banerjee
5117a3d789 Merge branch 'MDL-29619-master' of git://github.com/ankitagarwal/moodle 2011-10-24 14:21:39 +08:00
Aparup Banerjee
b077de82f9 Merge branch 'MDL-29646-master' of git://github.com/ankitagarwal/moodle 2011-10-24 13:26:28 +08:00
Aparup Banerjee
c11ccbfd8b Merge branch 'MDL-29818-master' of git://git.luns.net.uk/moodle 2011-10-24 11:36:07 +08:00
Jerome Mouneyrac
5d1017e11d MDL-29106 new web service naming convention 2011-10-24 11:06:00 +08:00
Petr Skoda
3df93d6d88 MDL-29444 use iframe embedding in IE 
iframe is back in HTML 5, we can safely use it in IE for all text documents because object embedding has multiple problems
 2011-10-23 21:14:04 +02:00
Petr Skoda
379434e440 MDL-29688 add support for status sync in enrol meta plugin 2011-10-23 20:52:10 +02:00
Petr Skoda
804796138a MDL-29688 properly reactivate ext db enrolment 2011-10-23 20:51:39 +02:00
Petr Skoda
358fb4dc06 MDL-29688 fix user enrolment modification event 
Fixed invalid event name and usage.
 2011-10-23 20:30:33 +02:00
Petr Skoda
2020594f13 MDL-29863 fix order of context and context_helper class definitions 
The switched order may create problems in older PHP versions or opt caches. In any case it is more logical to define the classes in this order. Sorry for the trouble.
 2011-10-23 12:50:56 +02:00
Petr Skoda
13ae464c0f MDL-29887 remove outdated swfobject 
Contrib code can use YUI flash embedding, manual embedding or better switch to JS/HTML 5.
 2011-10-23 12:05:44 +02:00
Petr Skoda
ae8b7d530f MDL-29886 remove unused md5 js lib 2011-10-23 11:46:50 +02:00
Petr Skoda
60812c3c8b MDL-29885 remove unused csshover 2011-10-23 11:41:36 +02:00
Petr Skoda
8b0f478842 MDL-29884 remove unused base32 lib 2011-10-23 11:35:46 +02:00
Petr Skoda
2dae747629 MDL-29882 finally removing overlib 2011-10-23 10:51:51 +02:00
Petr Skoda
c34724de75 MDL-29881 remove old apd profiling 
Profiling is now handled via xhprof extension and new profiling UI.
 2011-10-23 10:45:35 +02:00
Petr Skoda
5113e342d7 MDL-29880 bump up geoip version 
The RC was the same as the final 1.0.0 version.
 2011-10-23 10:14:36 +02:00
Petr Skoda
29329a2519 MDL-29878 reapply our typo3 fixes 2011-10-22 21:10:20 +02:00
Petr Skoda
2c5b848872 MDL-29878 import latest Typo3 4.5.0 2011-10-22 21:07:24 +02:00