59368 Commits

Author SHA1 Message Date
Davo Smith
04a38bd311 MDL-38033 dndupload - ignore case when comparing dropped file extensions with those supported by activity modules 2013-02-14 20:19:41 +00:00
Marina Glancy
73a0f3ba76 MDL-33774 Reset filters caches between unit tests 2013-02-14 19:46:19 +11:00
Marina Glancy
173115e14c MDL-33774 filter_activitynames removed hardcoded label module type 2013-02-14 19:46:19 +11:00
Marina Glancy
9ecb50e6e3 MDL-33774 instead of checking that activity is label we check that it has view url 2013-02-14 19:46:19 +11:00
Marina Glancy
3008f86c3f MDL-33774 mod_label stores the content where it is supposed to
removed hardcoded checking for 'label' module type

changed label update script
2013-02-14 19:46:19 +11:00
David Monllao
10dd80c2ac MDL-38029 behat: Cleaning caches before each test 2013-02-14 16:33:33 +08:00
David Monllao
a3b4d42b45 MDL-38009 behat: Reset cachedir and tempdir 2013-02-14 16:28:05 +08:00
David Monllao
1f037b3776 MDL-37982 enrol_ims: No filters applied when inserting into DB 2013-02-14 16:27:22 +08:00
Jean-Michel Vedrine
0e178dc939 MDL-37934 Blackboard_six question import fails in some cases
Import fails if the same image is used several times
in the same field of the same question
2013-02-14 09:26:29 +01:00
Damyon Wiese
1dd6835d8c weekly release 2.5dev 2013-02-14 13:46:04 +08:00
Damyon Wiese
f22bc6d963 Fix permissions 2013-02-14 13:43:58 +08:00
Damyon Wiese
082685e2de Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-02-14 13:37:48 +08:00
AMOS bot
ca3ee769e1 Automatically generated installer lang files 2013-02-14 00:49:54 +00:00
Mark Nielsen
e5ed5e6ab7 MDL-32620: Fixing up white space in comment 2013-02-13 09:21:03 -08:00
Dan Poltawski
583b20abd7 Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle 2013-02-13 15:47:27 +08:00
Damyon Wiese
7688a3191c MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export. 2013-02-13 15:33:10 +08:00
Damyon Wiese
6e59159387 Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle 2013-02-13 15:04:51 +08:00
David Monllao
cd65dc3220 MDL-37750 behat: More time for AJAX-related actions
When we want to assert against data coming
from an AJAX request with 1 second we don't
have enough time to ensure the elements are
loaded
2013-02-13 13:19:56 +08:00
Dan Poltawski
733c17694d MDL-30637 - fix padding on show/collapse arrow 2013-02-13 11:44:26 +08:00
AMOS bot
731bea1b3b Automatically generated installer lang files 2013-02-13 00:45:39 +00:00
Eloy Lafuente (stronk7)
6033723098 Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle 2013-02-12 22:49:05 +01:00
David Mudrák
08caae5b22 MDL-37997 Improve the display of MUC caches used in the footer
Cache stores with no hits and some misses are highlighted in red. Caches
stores with some hits but more misses are highlighted in yellow.
Otherwise (more hits than misses) the stores are highlighted in green.
2013-02-12 22:27:55 +01:00
Eloy Lafuente (stronk7)
fe4a6d3c38 Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle 2013-02-12 10:12:01 +01:00
Eloy Lafuente (stronk7)
7fe9a7863a Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle 2013-02-12 10:07:58 +01:00
Eloy Lafuente (stronk7)
a3cdb2ba7e MDL-37893 Take rid of old comment. 2013-02-12 10:03:29 +01:00
Eloy Lafuente (stronk7)
b57f62c497 Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle 2013-02-12 10:02:23 +01:00
Aparup Banerjee
cff7e83d2d MDL-37687 use $SITE to allow non-logged-in users to browse comment via ajax 2013-02-12 16:19:40 +08:00
Dan Poltawski
6065652f24 Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle 2013-02-12 16:13:48 +08:00
Dan Poltawski
6af8e417c3 Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
Conflicts:
	mod/forum/db/upgrade.php
	mod/forum/version.php
2013-02-12 15:48:33 +08:00
Dan Poltawski
5c70d6505a Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle 2013-02-12 15:44:17 +08:00
Dan Poltawski
2b8741aaa6 Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle 2013-02-12 15:08:53 +08:00
Rajesh Taneja
afd5e85ca8 MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default 2013-02-12 14:57:47 +08:00
Damyon Wiese
147f592742 Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
Conflicts:
	course/tests/behat/add_activities.feature
2013-02-12 14:48:40 +08:00
Damyon Wiese
f49ec42973 Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle 2013-02-12 14:47:50 +08:00
Damyon Wiese
2262c52122 Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle 2013-02-12 14:39:20 +08:00
Damyon Wiese
5926f85960 Merge branch 'wip-mdl-20131' of git://github.com/rajeshtaneja/moodle 2013-02-12 14:15:29 +08:00
David Monllao
333cb91fbf MDL-37750 behat: Removing (now) collapsed elements 2013-02-12 14:06:51 +08:00
Dan Poltawski
26f94655d5 Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle 2013-02-12 13:47:37 +08:00
Dan Poltawski
4dea0a7719 Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle 2013-02-12 13:39:07 +08:00
Tim Hunt
b4be77c570 MDL-37924 quiz settings: change wrong 'fix' => 'adv'. 2013-02-12 13:36:54 +08:00
Damyon Wiese
6904688967 Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle 2013-02-12 13:09:18 +08:00
Damyon Wiese
7339d6c0e9 Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle 2013-02-12 12:12:44 +08:00
Damyon Wiese
dad4fa26e7 Merge branch 'MDL-37828_master' of git://github.com/lazydaisy/moodle 2013-02-12 11:40:40 +08:00
Rajesh Taneja
390ef41e02 MDL-20131 Glossary: Fixed courseid typo 2013-02-12 10:57:10 +08:00
Dan Poltawski
501bdad2b9 Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle 2013-02-12 10:34:07 +08:00
Mark Nelson
8076010d37 MDL-37953 mod_forum: using named parameters to build SQL statement 2013-02-12 10:31:10 +08:00
Damyon Wiese
234fdc206c Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-02-12 10:09:26 +08:00
Marina Glancy
2333bfa7e8 MDL-37976 fixed missing global 2013-02-12 12:59:35 +11:00
Dan Poltawski
008a6514ae Merge branch 'MDL-37952' of git://github.com/stronk7/moodle 2013-02-12 09:45:38 +08:00
Dan Poltawski
08eef1a4bd Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle 2013-02-12 09:43:50 +08:00