Commit graph

65969 commits

Author SHA1 Message Date
Damyon Wiese
46b9d1bec6 Merge branch 'master-mdl42998' of https://github.com/tlock/moodle 2013-11-26 10:49:32 +08:00
David Monllao
e2d7379682 MDL-42842 behat: Adding a new formatter
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
2013-11-26 10:48:58 +08:00
David Monllao
7514c2f282 MDL-42842 testing: Generalization of the site info 2013-11-26 10:48:29 +08:00
Dan Poltawski
01db5af468 Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle 2013-11-26 10:42:04 +08:00
David Monllao
d949882691 MDL-43050 behat: Fixing moodlehq/behat-extension version 2013-11-26 10:36:08 +08:00
Dan Poltawski
4bf3517bc7 Merge branch 'wip-mdl-41635' of git://github.com/rajeshtaneja/moodle 2013-11-26 10:24:59 +08:00
Damyon Wiese
18962add08 Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle 2013-11-26 09:29:44 +08:00
Sam Hemelryk
f9cb086dfc Merge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle 2013-11-26 08:42:25 +13:00
Sam Hemelryk
657b29e7bc Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle 2013-11-26 08:36:36 +13:00
Simon Coggins
b92709db40 MDL-43045 report: Fix missing role name in security overview report 2013-11-26 08:14:10 +13:00
Simon Coggins
529b85b06f MDL-43049 accesslib: Fix typo in memory optimization code 2013-11-26 08:01:28 +13:00
Tomasz Muras
399889c11a MDL-42563 Correct version of GPL license to GPL 2+ for AlgParser.pm 2013-11-25 11:53:18 +01:00
Dan Poltawski
25da2fe065 Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle 2013-11-25 15:43:44 +08:00
rwijaya
a13b9929a2 MDL-42858 Course Management: Update phpunit test for core_course_management_helper_test 2013-11-25 15:39:22 +08:00
Damyon Wiese
a184b3d712 Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle 2013-11-25 14:52:26 +08:00
Damyon Wiese
fdeb639eb8 Merge branch 'MDL-41257-Calendar-Day-and-Upcoming-Events-View-not-processed-through-text-filters' of git://github.com/michael-milette/moodle 2013-11-25 14:04:05 +08:00
Dan Poltawski
b7e6b82155 Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle 2013-11-25 13:40:54 +08:00
Marina Glancy
b884e46d5d MDL-43028 navigation: correct capability check 2013-11-25 13:27:01 +08:00
Damyon Wiese
aacd01f28e Merge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle 2013-11-25 13:16:04 +08:00
Damyon Wiese
dc4c0310ee Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle 2013-11-25 13:11:24 +08:00
Tim Lock
16c25753a8 MDL-43020: Fix lesson scale warnings when deleting user attempts 2013-11-25 15:08:19 +10:30
Dan Poltawski
e7f52df8f6 Merge branch '43016-27' of git://github.com/samhemelryk/moodle 2013-11-25 12:21:20 +08:00
Rajesh Taneja
823c593fc5 MDL-43028 Navigation: Setting proper page properties on admin pages 2013-11-25 12:12:38 +08:00
Marina Glancy
8a3a584da5 MDL-43006 behat: adding javascript tag because of behat bug
behat without JS does not submit the empty textarea field causing notice in the form processing
2013-11-25 14:59:28 +11:00
Dan Poltawski
83a97ce6c7 Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle 2013-11-25 11:17:47 +08:00
Dan Poltawski
43e72c1f6a Merge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle 2013-11-25 11:06:39 +08:00
Dan Poltawski
f5bc16cbd1 Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-25 10:48:33 +08:00
James Pratt
a9e2f21125 MDL-42957 quiz statistics : Hardcoded sql LIMIT clause 2013-11-25 10:43:18 +08:00
Dan Poltawski
a136e16c8e Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle 2013-11-25 10:37:33 +08:00
Rajesh Taneja
95cf93b9f4 MDL-42904 self_enrol: Set customint1 if it's null 2013-11-25 10:01:00 +08:00
Tim Lock
74dd3bd6c7 MDL-43020: Fix calculation of lesson scale value warning 2013-11-25 09:31:56 +10:30
Petr Škoda
e696fe6aa5 MDL-37016 fix sloppy mysql nulls in event.uuid 2013-11-24 15:10:58 +08:00
Mark Nelson
12bb281e5e MDL-43037 mod_quiz: retrieve all name fields for the user override pages 2013-11-23 16:17:54 -08:00
Tomasz Muras
fa9879782e MDL-42563 Add thirdpartylibs.xml for AlgParser.pm. 2013-11-22 23:58:06 +01:00
Tim Hunt
5dbfbc82cf MDL-43000 shortanswer qtype: handle patterns with many *s
Teachers were typing patterns like
********************************<em>****************************</em>
which translates into a pattern like .*.*.*.*, which is very inefficient
to try to match, althought it is equivalent ot a single .*. At a certain
point preg was just giving up.

Since people actually do this, we should simplify the regex by treating
runs of * like a single *.
2013-11-22 11:32:09 +00:00
Marina Glancy
6f5db6a6a8 MDL-42508 folder: add module generator 2013-11-22 18:56:48 +11:00
rwijaya
1b136466bf MDL-42851 frontpage: fix rtl in clean theme for course listings 2013-11-22 15:47:22 +08:00
Marina Glancy
490dca1a6f MDL-42508 imspcp: add module generator 2013-11-22 15:25:38 +11:00
Marina Glancy
15cca13822 MDL-42508 scorm: add module generator 2013-11-22 15:25:37 +11:00
Marina Glancy
724b00b2b6 MDL-43024 course: fixed bug for accessing section options 2013-11-22 12:41:35 +11:00
Tim Lock
da7e5daf1e MDL-43020: Fix calculation of lesson scale value using gradeitem grademax 2013-11-22 07:17:38 +10:30
Sam Hemelryk
9474b47781 MDL-43016 block_navigation: fixed category link display 2013-11-22 08:55:39 +13:00
Eloy Lafuente (stronk7)
f7434db109 weekly on-sync release 2.7dev 2013-11-21 19:33:52 +01:00
Eloy Lafuente (stronk7)
9d1a546fa0 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-21 19:33:47 +01:00
Jerome Mouneyrac
ad417fdfe7 MDL-42876 Screen reader does not trigger the keyboard move 2013-11-21 17:42:18 +08:00
rwijaya
3e57883c5c MDL-42858 Course Management: fix regression for subcategories visibility 2013-11-21 15:32:50 +08:00
David Monllao
85ad19ec78 MDL-42733 behat: Removing the restriction of an started output to handle the PHP errors 2013-11-21 14:34:56 +08:00
Ankit Agarwal
1af9063e47 MDL-43005 blogs: Fix issues with blog tags 2013-11-21 13:37:20 +08:00
Marina Glancy
60261b8c59 MDL-42925 course: Changed help string for course format selection 2013-11-21 13:29:31 +11:00
Frederic Massart
ba72e295c2 MDL-42985 curl: Correctly apply rule proxybypass 2013-11-21 09:56:54 +08:00