moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65363 commits 37 branches 540 tags 1.3 GiB
Commit graph

65363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
9b37cd72a2 weekly release 2.7dev 2013-11-29 12:52:39 +08:00
Dan Poltawski
4f42752d70 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-29 12:52:35 +08:00
Eloy Lafuente (stronk7)
4942801c39 Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	question/classes/statistics/questions/calculator.php
	question/classes/statistics/responses/analyser.php
 2013-11-28 12:44:04 +01:00
James Pratt
7d6b28d87a MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests 2013-11-28 17:57:02 +07:00
James Pratt
487e7e6602 MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause 
Fixing some typos and adding some tests.
 2013-11-28 17:13:26 +07:00
AMOS bot
4be2c1b812 Automatically generated installer lang files 2013-11-28 09:12:39 +00:00
Dan Poltawski
ab47c758d1 MDL-42942 behat: increment version 2013-11-27 11:33:11 +08:00
Dan Poltawski
eeb6b7847b Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle 2013-11-27 11:32:23 +08:00
AMOS bot
4729051593 Automatically generated installer lang files 2013-11-27 00:48:23 +00:00
Sam Hemelryk
8d5a9d6ec1 Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle 2013-11-27 12:36:02 +13:00
Eloy Lafuente (stronk7)
51e9d69af2 Merge branch 'master_MDL-43045' of git://github.com/totara/moodle 2013-11-26 21:27:35 +01:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Dan Poltawski
bb29677965 Merge branch 'MDL-43000' of git://github.com/timhunt/moodle 2013-11-26 15:05:42 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
Dan Poltawski
fb9c770d8d Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-26 14:48:21 +08:00
Dan Poltawski
6ac888c5f2 Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle 2013-11-26 13:24:02 +08:00
Dan Poltawski
c9ed9e5662 Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle 2013-11-26 12:09:45 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme 
Keeps compatibility with standard theme.
 2013-11-26 11:41:13 +08:00
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
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
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
Dan Poltawski
e7f52df8f6 Merge branch '43016-27' of git://github.com/samhemelryk/moodle 2013-11-25 12:21:20 +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
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
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