Sam Hemelryk
0c0d501144
Merge commit 'FETCH_HEAd'
2011-11-30 11:49:40 +13:00
Sam Hemelryk
3ddbd75acc
Merged branch 'MDL-30505' of git://github.com/lazydaisy/moodle.git with conflict resolution
2011-11-30 11:05:46 +13:00
Petr Skoda
4041478751
MDL-30007 standardise workshop subplugin version files
2011-11-29 22:29:14 +01:00
Petr Skoda
fd20817aa9
MDL-30007 standardise text editor version files
2011-11-29 22:21:34 +01:00
Petr Skoda
11106669a1
MDL-30007 standardise quiz report version files
2011-11-29 22:19:05 +01:00
Petr Skoda
37c48acb45
MDL-30007 standardise assignment plugin version files
2011-11-29 22:15:28 +01:00
Petr Skoda
b5c04aa153
MDL-30007 standardise webservice version files
2011-11-29 22:12:15 +01:00
Petr Skoda
0790df351f
MDL-30007 standardise repository version files
2011-11-29 22:06:27 +01:00
Petr Skoda
466bc44fb5
MDL-30007 standardise portfolio version files
2011-11-29 21:54:11 +01:00
Petr Skoda
633d5a07af
MDL-30007 standardise module version files
2011-11-29 21:38:14 +01:00
Petr Skoda
5563272125
MDL-30007 standardise messaging plugin version files
2011-11-29 21:23:18 +01:00
Petr Skoda
25a333877c
MDL-30007 standardise gradebook plugins version files
2011-11-29 21:20:13 +01:00
Petr Skoda
9c89c04af5
MDL-30007 standardise filter version files
2011-11-29 21:15:42 +01:00
Petr Skoda
9dbf768ede
MDL-30007 standardise enrol plugins version info
2011-11-29 21:09:42 +01:00
Petr Skoda
7f6e07a3eb
MDL-30007 standardise admin tool version info
2011-11-29 21:02:13 +01:00
Petr Skoda
d68b3dbe72
MDL-30007 standard version file for all blocks
2011-11-29 20:57:30 +01:00
Petr Skoda
be974aa7f9
MDL-30007 add/fix version files for all auth plugins
2011-11-29 20:41:21 +01:00
Eloy Lafuente (stronk7)
a5b5881d46
on-demand release 2.2beta+
2011-11-29 20:09:37 +01:00
Eloy Lafuente (stronk7)
5ac8e50b89
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-11-29 20:07:36 +01:00
Eloy Lafuente (stronk7)
5b14551371
MDL-30466 Backup: delete empty method
2011-11-29 19:47:25 +01:00
Eloy Lafuente (stronk7)
457e9ab606
Merge branch 'wip-mdl-30466' of git://github.com/rajeshtaneja/moodle
2011-11-29 19:45:39 +01:00
Eloy Lafuente (stronk7)
2321e0d661
Merge branch 'MDL-30444' of git://github.com/kiklop74/moodle
2011-11-29 16:39:22 +01:00
Mary Evans
231d40d543
MDL-30505 Fix for nested mixed ordered/unordered lists
2011-11-29 15:21:09 +00:00
Eloy Lafuente (stronk7)
8192d3cf43
Merge branch 'MDL-30435' of git://github.com/kiklop74/moodle
2011-11-29 15:54:28 +01:00
Chris Scribner
cc6a4b0ecd
MDL-30400 lti: Fixing warning in OAuthBodyPost
...
This would have only shown up if the tool provider didn't set the
content-type header, which I don't think is valid to begin with.
(amended by integrator to follow coding style rules)
2011-11-29 15:42:43 +01:00
Aparup Banerjee
ab83fa53fd
MDL-28646 webservices : version bump
2011-11-29 18:35:25 +08:00
Aparup Banerjee
1b39425dae
Merge branch 'wip-MDL-28646' of git://github.com/mouneyrac/moodle
2011-11-29 16:38:02 +08:00
Sam Hemelryk
fb056a811e
Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle
2011-11-29 16:56:29 +13:00
Sam Hemelryk
f091da528e
MDL-26240 theme_anomaly: Fixed small regression with dock
2011-11-29 16:54:00 +13:00
Sam Hemelryk
9ac82391a2
Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle
2011-11-29 16:52:50 +13:00
Sam Hemelryk
223b3ce3a0
MDL-30273 whitespace cleanup
2011-11-29 16:47:21 +13:00
Sam Hemelryk
925ae95824
Merge branch 'wip-MDL-30273-master' of git://github.com/abgreeve/moodle
2011-11-29 16:46:47 +13:00
Sam Hemelryk
e343ff6a5d
Merge branch 'MDL-30471' of git://github.com/lazydaisy/moodle
2011-11-29 16:28:24 +13:00
Aparup Banerjee
67411c8399
Merge branch 'MDL-30368' of git://github.com/rwijaya/moodle
2011-11-29 11:27:53 +08:00
Jerome Mouneyrac
07cc3d11e2
MDL-28646 add missing authentication web service checks. Merge download/upload script checks in the same lib functions. Make the download scrit return json error message. Add missing webservice lang. Minor unit test doc improvement.
2011-11-29 11:18:36 +08:00
Eloy Lafuente (stronk7)
82fb6d1a08
Merge branch 'wip-MDL-30378-m22' of git://github.com/samhemelryk/moodle
2011-11-29 03:18:02 +01:00
Sam Hemelryk
e68fa2500a
Merge branch 'MDL-30347' of git://github.com/stronk7/moodle
2011-11-29 15:16:27 +13:00
Eloy Lafuente (stronk7)
055a278ad9
MDL-30347 lti: disabling outated/incorrect unit tests
2011-11-29 03:05:19 +01:00
Sam Hemelryk
bada16d35c
Merged branch 'wip-MDL-30361-master-rtlpatches' of git://github.com/nadavkav/moodle.git with changes
2011-11-29 13:51:25 +13:00
AMOS bot
8cfa492c45
Automatically generated installer lang files
2011-11-29 00:30:40 +00:00
Sam Hemelryk
56c062a45f
MDL-30378 navigation: Front page activities are now added to the navigation on every page
2011-11-29 11:13:50 +13:00
Eloy Lafuente (stronk7)
3654f38623
Merge branch 'w48_MDL-30487_m22_filtertest' of git://github.com/skodak/moodle
2011-11-28 20:18:43 +01:00
Petr Skoda
e7b90ca0fa
MDL-30487 remove obsolete test
...
Since MDL-30303 media filter accepts any ? parameters.
2011-11-28 20:11:59 +01:00
Tim Hunt
3385a144b8
MDL-30485 XML import from 1.9 does not handle files in subfolders.
2011-11-28 17:26:17 +00:00
Andrew Robert Nicols
68ec4a273c
MDL-30302 Adjust options for calendar day settings
2011-11-28 17:02:31 +00:00
Tim Hunt
7d087744cb
MDL-30322 qtypes calc* and mulitanswer -> optional_param_array.
2011-11-28 16:57:00 +00:00
Rossiani Wijaya
dbf4433d75
MDL-30202 forum module: fixed code regression for displaying rss feed icon (link)
2011-11-28 17:49:14 +08:00
Aparup Banerjee
66b97716c5
Merge branch 'wip-MDL-30214-master' of github.com:marinaglancy/moodle
2011-11-28 17:02:26 +08:00
Dongsheng Cai
ec0d6ea2a9
MDL-28646 Web service: core_course_get_contents()
...
1. Implement core_course_get_contents web service
2. Implement callbacks in folder, resource, page and url modules
3. Implement download script for web service
2011-11-28 16:22:38 +08:00
Aparup Banerjee
3625e9049f
Merge branch 'MDL-30379' of git://github.com/rwijaya/moodle
2011-11-28 15:21:34 +08:00
