Commit graph

64638 commits

Author SHA1 Message Date
Adrian Greeve
40a473d5e7 MDL-42234 - Repositories: Fix undefined variable notice when no repositories are enabled. 2013-10-15 10:40:23 +08:00
Marina Glancy
41a403cd14 Merge branch '41959-26' of git://github.com/samhemelryk/moodle 2013-10-15 13:19:30 +11:00
Marina Glancy
38a5cc79f8 Merge branch 'MDL-42230' of git://github.com/timhunt/moodle 2013-10-15 13:19:20 +11:00
Dan Poltawski
bd81762784 Merge branch '42247-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-15 09:32:27 +08:00
Marina Glancy
30fb399455 Merge branch '42258-26' of git://github.com/samhemelryk/moodle 2013-10-15 12:10:34 +11:00
Eloy Lafuente (stronk7)
9bb34fb781 Merge branch 'MDL-42226_master' of https://github.com/markn86/moodle 2013-10-15 02:09:11 +02:00
Eloy Lafuente (stronk7)
3745472f63 Merge branch 'MDL-42241-master' of git://github.com/ankitagarwal/moodle 2013-10-15 01:58:51 +02:00
Damyon Wiese
6350e5df45 Merge branch '42256-26' of git://github.com/samhemelryk/moodle 2013-10-14 16:55:39 +08:00
Damyon Wiese
35d7ba167a Merge branch 'MDL-42198_master' of git://github.com/dmonllao/moodle 2013-10-14 16:14:38 +08:00
Dan Poltawski
c79239b294 Merge branch 'MDL-42151_master' of git://github.com/dmonllao/moodle 2013-10-14 16:11:50 +08:00
Dan Poltawski
7159340f7f Merge branch 'MDL-41131_c' of git://github.com/rwijaya/moodle 2013-10-14 15:46:22 +08:00
Damyon Wiese
7aeb2cc335 Merge branch '42249-26' of git://github.com/samhemelryk/moodle 2013-10-14 15:12:17 +08:00
Damyon Wiese
3abdd3273b Merge branch '42255-26' of git://github.com/samhemelryk/moodle 2013-10-14 15:07:29 +08:00
Damyon Wiese
769b434ad9 Merge branch 'MDL-42225_master' of https://github.com/markn86/moodle 2013-10-14 15:04:46 +08:00
Damyon Wiese
71c2e40993 Merge branch 'MDL-42187_master' of git://github.com/kordan/moodle 2013-10-14 14:50:53 +08:00
Dan Poltawski
7a1ce7769c Merge branch 'w42_MDL-42082_m26_authdbpass' of https://github.com/skodak/moodle 2013-10-14 14:36:14 +08:00
FilipBenco
be885f1291 MDL-42209 backup: fixed wrong icon being displayed when restoring course 2013-10-14 14:32:18 +08:00
Damyon Wiese
185364d366 MDL-34586 assignment - fix whitespace 2013-10-14 14:30:08 +08:00
Damyon Wiese
48947db114 Merge branch 'MDL-34586-master' of https://github.com/mackensen/moodle 2013-10-14 14:29:52 +08:00
Dan Poltawski
7bed57ae1f Merge branch 'MDL-42232' of git://github.com/timhunt/moodle 2013-10-14 14:24:02 +08:00
Damyon Wiese
031a28ce7f Merge branch 'MDL-34612-master' of https://github.com/mackensen/moodle 2013-10-14 14:12:57 +08:00
Damyon Wiese
e6338c2c65 Merge branch 'MDL-41170-master' of git://github.com/ankitagarwal/moodle 2013-10-14 14:02:34 +08:00
Ankit Agarwal
6c679d1532 MDL-41170 events: User_updated event should be triggered on password updates 2013-10-14 13:26:47 +08:00
Damyon Wiese
36f60b226d Merge branch '42253-26' of git://github.com/samhemelryk/moodle 2013-10-14 13:02:55 +08:00
David Monllao
8f50ec7db6 MDL-42198 tool_generator: Changing test plan default values
To achieve more stability on test results we
switch to less users and more loops.
2013-10-14 12:46:02 +08:00
David Monllao
9a79e456c2 MDL-42151 behat: Adding the version to the testplan 2013-10-14 12:43:52 +08:00
rwijaya
f159ad7302 MDL-41131 assign module: remove setting for submission comments and edipdf plugins' setting. 2013-10-14 12:43:26 +08:00
Rajesh Taneja
e63515ba93 MDL-31405 Assignment: Fixed date in reset to be called for every assignment 2013-10-14 12:34:55 +08:00
Dan Poltawski
b011a17b26 Merge branch 'MDL-41672-text-mail-links' of git://github.com/mudrd8mz/moodle 2013-10-14 12:11:23 +08:00
Dan Poltawski
b1bdb61e90 Merge branch 'MDL-42167-workshop-update-record' of git://github.com/mudrd8mz/moodle 2013-10-14 12:07:54 +08:00
Mark Nelson
61f039ce4b MDL-42225 badges: retrieve all the name fields when viewing the recipient list 2013-10-14 12:01:20 +08:00
Mark Nelson
5241526d20 MDL-42226 badges: retrieve all the name fields when viewing an issued badge 2013-10-14 11:59:41 +08:00
Marina Glancy
4ff520d800 MDL-42288 behat: Allowing to change choice response
Automate MDLQA-46 - A teacher can choose whether to allow students to change their choice response
2013-10-14 10:46:24 +11:00
Eloy Lafuente (stronk7)
7d766e4ca1 Merge branch 'wip-mdl-41843' of git://github.com/rajeshtaneja/moodle 2013-10-14 00:13:26 +02:00
Eloy Lafuente (stronk7)
b1636b4a8b Merge branch 'MDL-37181_master' of https://github.com/markn86/moodle 2013-10-13 23:32:30 +02:00
Eloy Lafuente (stronk7)
04e49ead57 Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle 2013-10-13 23:19:18 +02:00
Eloy Lafuente (stronk7)
f71011e825 Merge branch 'w42_MDL-42292_m26_blockversion' of https://github.com/skodak/moodle 2013-10-13 23:09:53 +02:00
Eloy Lafuente (stronk7)
6ad40de465 Merge branch 'w42_MDL-41935_m26_timediff' of https://github.com/skodak/moodle 2013-10-13 18:30:49 +02:00
Petr Škoda
2a67e105b6 MDL-41935 attempt to work around random time comparison test failures 2013-10-12 15:53:25 +02:00
Petr Škoda
b48b055643 MDL-42110 do not show auth_db password in plaintext 2013-10-12 14:28:49 +02:00
Petr Škoda
f007e89961 MDL-42224 clean up message and email redirection testing 2013-10-12 13:59:07 +02:00
Petr Škoda
c169e58048 MDL-42243 fix filter settings regression and support standard settings.php 2013-10-12 13:38:34 +02:00
Petr Škoda
c66b839a14 MDL-42292 fix blockversion reading after migration to config table 2013-10-12 13:30:49 +02:00
AMOS bot
1ce76f3b1b Automatically generated installer lang files 2013-10-12 00:43:45 +00:00
Andrew Nicols
ee4ece6822 MDL-29441 Chat: Use a valid name for chat popup actions 2013-10-12 00:53:48 +08:00
Tim Hunt
5562ab20ea MDL-42232 Multiple choice question choice alignment issue
The problem was with the alignment of:
* tables inside the choices.
* Lists inside the choices.
* The specific feedback, when it spanned mulitple lines.

The problem was introduced by MDL-39420.
2013-10-11 14:32:42 +01:00
Tim Hunt
d3603928a9 MDL-42230 fix inconsistent quiz lang string.
This matches a change made to another string in MDL-32188.
2013-10-11 14:32:24 +01:00
Eloy Lafuente (stronk7)
f8eff10319 weekly release 2.6dev 2013-10-11 13:20:42 +02:00
Eloy Lafuente (stronk7)
88b6721ba1 NOBUG: Fixed file access permissions 2013-10-11 13:20:42 +02:00
Damyon Wiese
e4fc57eca5 Merge branch 'MDL-41792_intmaster' of https://github.com/markn86/moodle 2013-10-11 16:33:17 +08:00