Commit graph

47594 commits

Author SHA1 Message Date
Petr Skoda
46df3c6059 Merge branch 'MDL-25981' 2011-01-31 22:44:17 +01:00
Petr Skoda
4714815123 MDL-25981 fix inverted instanceof in require_login 2011-01-31 22:35:17 +01:00
Petr Skoda
d6f4508c36 MDL-25981 add missing global DB when fetching course modinfo 2011-01-31 22:23:34 +01:00
Petr Skoda
d4fb0e26e2 MDL-25981 make sure cm is defined 2011-01-31 22:19:36 +01:00
Eloy Lafuente (stronk7)
eb183178c8 Merge branch 'w05_MDL-26034_20_myprofile' of git://github.com/skodak/moodle 2011-01-31 20:10:27 +01:00
Petr Skoda
b6f3e4f8f0 Merge branch 'MDL-26098' of git://github.com/timhunt/moodle 2011-01-31 19:25:41 +01:00
Eloy Lafuente (stronk7)
9de8515b2e MDL-26201 scorm & js - CSS changes => version bump 2011-01-31 19:23:31 +01:00
Eloy Lafuente (stronk7)
8e1ad9c60f Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle 2011-01-31 19:14:55 +01:00
Tim Hunt
5258903e7f MDL-20636 More work on the ddwtos and gapselect qtypes.
Now there are no longer fatal errors that break other qtypes, but these two qtypes still not work completely. More to come.
2011-01-31 18:07:38 +00:00
Eloy Lafuente (stronk7)
9f58e26db6 Merge branch 'w05_MDL-26046_20_noemailever' of git://github.com/skodak/moodle 2011-01-31 18:02:02 +01:00
Eloy Lafuente (stronk7)
e030faee3e Take out debugging & merge branch 'w05_MDL-26198_20_completion' of git://github.com/skodak/moodle 2011-01-31 17:43:22 +01:00
Eloy Lafuente (stronk7)
45289c3e79 Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle 2011-01-31 17:17:48 +01:00
Eloy Lafuente (stronk7)
b6a0ec4238 Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle 2011-01-31 16:17:13 +01:00
Eloy Lafuente (stronk7)
d98c661428 Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle 2011-01-31 16:02:51 +01:00
Eloy Lafuente (stronk7)
133a9b738e Merge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle 2011-01-31 16:01:02 +01:00
Eloy Lafuente (stronk7)
e89a57dc10 Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle 2011-01-31 15:34:40 +01:00
Eloy Lafuente (stronk7)
9700d6835d Merge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle 2011-01-31 15:17:33 +01:00
Eloy Lafuente (stronk7)
7164db694c Merge branch 'w05_MDL-26189_20_imse' of git://github.com/skodak/moodle 2011-01-31 14:57:22 +01:00
Petr Skoda
57d51199b7 Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle 2011-01-31 14:26:03 +01:00
Petr Skoda
8afc38bd39 Merge branch 'MDL-25708' of git://github.com/stronk7/moodle 2011-01-31 14:21:53 +01:00
stabijoh
6290dddd35 MDL-25939-2 Updated fix for Splah theme blog labels 2011-01-31 07:23:49 -05:00
Petr Skoda
6fde0dac70 MDL-26189 protect imsenterprise enrol file 2011-01-31 13:22:55 +01:00
Eloy Lafuente (stronk7)
43bbf28849 Merge branch 'w05_MDL-26182_20_nginx' of git://github.com/skodak/moodle 2011-01-31 12:33:16 +01:00
Sam Hemelryk
2b1f6ced64 Merge branch 'MDL-26178' of git://github.com/timhunt/moodle 2011-01-31 17:47:30 +08:00
Dan Marsden
334d8b94f5 SCORM MDL-25850 - check for viewscores cap before adding score to toc 2011-01-31 17:38:01 +08:00
Sam Hemelryk
1f5a33439e Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle 2011-01-31 17:16:56 +08:00
Sam Hemelryk
dfc05681f2 Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle 2011-01-31 17:06:53 +08:00
Petr Skoda
cb3c4b448e Merge branch 'MDL-25942' of git://github.com/stronk7/moodle 2011-01-31 09:38:51 +01:00
Petr Skoda
bee34e2b6d Merge branch 'MDL-26177' of git://github.com/timhunt/moodle 2011-01-31 09:36:15 +01:00
Sam Hemelryk
d44d6448db Merge branch 'w05_MDL-26069_20_filecheck' of git://github.com/skodak/moodle 2011-01-31 16:28:28 +08:00
Petr Skoda
a84299fee5 Merge branch 'm20_MDL-25895_repository_ajax' of git://github.com/dongsheng/moodle 2011-01-31 09:06:31 +01:00
Petr Skoda
63786031f2 Merge branch 'MDL-25573_m20' of git://github.com/rwijaya/moodle 2011-01-31 09:04:29 +01:00
Petr Skoda
1c6a1e12aa Merge branch 'MDL-25291_20_admintreeflag' of git://github.com/samhemelryk/moodle 2011-01-31 08:56:25 +01:00
Rossiani Wijaya
469aa3ba50 create youtube playlist filter. Fixed regex, removed addslash_js, use variable param instead of url because the variable contains the value of the url parameter. 2011-01-31 15:03:58 +08:00
Sam Hemelryk
cf59f747d0 Merge branch 'MDL-25913' 2011-01-31 14:58:08 +08:00
Sam Hemelryk
3fd8c6055e MDL-25931 Fixed up whitespace during integration. 2011-01-31 14:57:48 +08:00
Sam Hemelryk
0c6ab77c58 Merge branch 'MDL-25914' 2011-01-31 14:41:04 +08:00
Sam Hemelryk
af5222b1bd MDL-25914 Fixed whitespace in binarius theme core.css 2011-01-31 14:40:54 +08:00
Sam Hemelryk
1c4b778376 Merge branch 'MDL-25892' of git://github.com/epsd/moodle 2011-01-31 14:16:46 +08:00
Sam Hemelryk
16ce82a4d3 Merge branch 'MDL-25834' 2011-01-31 14:10:12 +08:00
Sam Hemelryk
8874905e77 MDL-25834 Fixed white space issues during integration 2011-01-31 14:09:57 +08:00
Sam Hemelryk
3721781dfe Merge branch 'MDL-26168' of git://github.com/timhunt/moodle 2011-01-31 13:50:21 +08:00
Sam Hemelryk
60177f84a8 Merge branch 'MDL-25786' of git://github.com/epsd/moodle 2011-01-31 13:31:40 +08:00
Sam Hemelryk
13b9fe035c Merge branch 'MDL-25723' of git://github.com/epsd/moodle 2011-01-31 13:17:26 +08:00
Sam Hemelryk
8dadee2499 Merge branch 'MDL-21250-capitalized_strings' of git://github.com/mudrd8mz/moodle 2011-01-31 13:05:09 +08:00
Sam Hemelryk
299a3e7081 Merge branch 'MDL-26158' 2011-01-31 12:09:53 +08:00
Sam Hemelryk
2c1aa96042 MDL-26158 fixed xhtml problem 2011-01-31 12:09:43 +08:00
Dan Marsden
30bce58eb9 SCORM MDL-26201 setting to allow admin to force users to enable JS in their browser before allowing them to view/use SCORM objects. 2011-01-31 16:53:10 +13:00
Sam Hemelryk
3e6d0ac628 Merge branch 'w05_MDL-25743_20_selfenrol' of git://github.com/skodak/moodle 2011-01-31 11:52:40 +08:00
AMOS bot
4723b4b33e Automatic installer lang files (20110130) 2011-01-30 21:57:11 +01:00