77716 Commits

Author SHA1 Message Date
Eric Merrill
e214f22f39 MDL-53795 logging: Add DB index for use when backing up logs 2016-04-12 21:44:15 -04:00
Dan Poltawski
b611ade3ab weekly release 3.1dev 2016-04-07 09:43:39 +01:00
Juan Leyva
92ea1fa068 MDL-53000 mod_assign: Unit tests for get_file_areas 2016-04-07 09:27:15 +01:00
Andrew Nicols
0a94763ae8 weekly release 3.1dev 2016-04-07 14:00:25 +08:00
Andrew Nicols
cbb817c08c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-04-07 14:00:21 +08:00
Andrew Nicols
ba1cdfe0ee Merge branch 'MDL-53577-fix' of https://github.com/andrewnicols/moodle 2016-04-07 12:10:57 +08:00
Andrew Nicols
82eb2cf1be MDL-53577 JS: get_string requires component 2016-04-07 12:10:26 +08:00
Andrew Nicols
b2c40917c3 Merge branch 'MDL-53579-intfix' of https://github.com/merrill-oakland/moodle 2016-04-07 09:40:40 +08:00
Andrew Nicols
38a3f5f996 Merge branch 'wip-mdl-52502-fix' of https://github.com/rajeshtaneja/moodle 2016-04-07 09:38:52 +08:00
Rajesh Taneja
80c3b48409 MDL-52502 behat: Flush buffer to show differences 2016-04-07 09:29:50 +08:00
Eric Merrill
f6b4ec7b78 MDL-53579 search: Improve solr engine field name 2016-04-06 21:26:55 -04:00
Eric Merrill
546c0af511 MDL-53579 search: Fix conflict with eDisMax parser and indexed files 2016-04-06 14:09:35 -04:00
AMOS bot
3029acdedd Automatically generated installer lang files 2016-04-07 00:04:42 +08:00
Dan Poltawski
4fc04cfeaf Merge branch 'wip-mdl-53571' of https://github.com/rajeshtaneja/moodle 2016-04-06 08:42:27 +01:00
Rajesh Taneja
921faad9ad MDL-53571 behat: Use Escaper for escaping
xpathLiteral has been depreacted, use Escaper instead
2016-04-06 15:38:31 +08:00
Andrew Nicols
d147514986 Merge branch 'wip-mdl-53381' of https://github.com/rajeshtaneja/moodle 2016-04-06 11:53:41 +08:00
Rajesh Taneja
ccceab9974 MDL-53381 behat: Pointing to 3.31.1 release tag. 2016-04-06 11:32:50 +08:00
Rajesh Taneja
eb9ca848fa MDL-53381 behat: Replaced chained steps with api.
Behat 3.x doesn't support chained steps and hence
this is first step to get rid of chained steps in core.
2016-04-06 11:32:49 +08:00
Eloy Lafuente (stronk7)
cffc012645 Merge branch 'wip-MDL-43470-master2' of https://github.com/marinaglancy/moodle 2016-04-06 04:35:50 +02:00
Marina Glancy
9b9b9caba3 MDL-43470 mod_feedback: remove mapping form autosave 2016-04-06 10:29:56 +08:00
Marina Glancy
ed724aac99 MDL-43470 mod_feedback: select courses for mapping
- use course autocomplete element to map courses
- add a tab and navigation node
- clean up some html
- cover course mapping with behat tests
2016-04-06 10:13:33 +08:00
Eloy Lafuente (stronk7)
e44b55f5d0 Merge branch 'MDL-53115-master' of git://github.com/andrewnicols/moodle 2016-04-06 03:32:57 +02:00
Andrew Nicols
9e6c63a7e1 MDL-53461 assign: Unit test regex fix 2016-04-06 08:56:07 +08:00
Andrew Nicols
7056234938 Merge branch 'MDL-53461-master' of git://github.com/crazyserver/moodle 2016-04-06 08:47:12 +08:00
Eloy Lafuente (stronk7)
d9c557250c MDL-52502 behat: clean 2 uses of deleted method 2016-04-06 00:16:08 +02:00
Eloy Lafuente (stronk7)
f6825a62ef Merge branch 'wip-mdl-52502' of https://github.com/rajeshtaneja/moodle 2016-04-06 00:12:00 +02:00
Eloy Lafuente (stronk7)
76d02bb8ac Merge branch 'MDL-53671-master' of git://github.com/dpalou/moodle 2016-04-05 23:57:21 +02:00
Eloy Lafuente (stronk7)
68f009dfb3 Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle 2016-04-05 22:02:02 +02:00
Eloy Lafuente (stronk7)
1183dfa0f7 Merge branch 'MDL-53647' of git://github.com/timhunt/moodle 2016-04-05 21:59:23 +02:00
Dan Poltawski
cf0f0fc7f4 Merge branch 'MDL-53612-master' of git://github.com/merrill-oakland/moodle 2016-04-05 16:25:05 +01:00
Dan Poltawski
245192accc Merge branch 'MDL-50050-master' of git://github.com/lameze/moodle 2016-04-05 16:23:24 +01:00
Dan Poltawski
9bb87baf18 MDL-53449 mod_feedback: reponses page clean up and behat 2016-04-05 14:46:20 +01:00
Dan Poltawski
f164cab739 Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle 2016-04-05 14:27:25 +01:00
Dan Poltawski
529ea77b13 MDL-53175 upgrade.txt: fix trailing whitespace 2016-04-05 12:23:50 +01:00
Dan Poltawski
393329069d Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle 2016-04-05 10:47:19 +01:00
Dan Poltawski
88e8e6006f Merge branch 'MDL-53633-master' of git://github.com/andrewnicols/moodle 2016-04-05 09:40:41 +01:00
Dan Poltawski
c56e8bc6ff Merge branch 'MDL-53577_master' of https://github.com/jinhofer/moodle 2016-04-05 09:38:00 +01:00
Pau Ferrer Ocaña
988065c045 MDL-53461 assign: Fix intro images to be shown in the mobile app 2016-04-05 09:33:15 +02:00
Dan Poltawski
c019cc57f4 Merge branch 'MDL-53595' of git://github.com/stronk7/moodle 2016-04-05 08:28:48 +01:00
Andrew Nicols
efaf5c0570 MDL-53056 JS: Whitespace fix 2016-04-05 14:58:57 +08:00
Andrew Nicols
2697ece323 Merge branch 'MDL-53056-master' of git://github.com/damyon/moodle 2016-04-05 14:57:26 +08:00
Andrew Nicols
44a72e9bd0 Merge branch 'MDL-53462-master' of git://github.com/jleyva/moodle 2016-04-05 12:54:58 +08:00
Andrew Nicols
0ddddf264b Merge branch 'MDL-53500-master' of git://github.com/cameron1729/moodle 2016-04-05 12:22:42 +08:00
Rajesh Taneja
e891c8381e MDL-52502 behat: Ensure php web and cli version is same 2016-04-05 11:46:44 +08:00
Rajesh Taneja
af2dc48b41 MDL-52502 phpunit: Add php, db and os deatils 2016-04-05 11:46:43 +08:00
Andrew Nicols
0c21d79627 Merge branch 'MDL-53579-master' of git://github.com/merrill-oakland/moodle 2016-04-05 11:20:45 +08:00
Andrew Nicols
7dbc7a60fc MDL-53588 mod_feedback: Behat scenario verb change 2016-04-05 10:22:01 +08:00
Andrew Nicols
1d51dedb77 Merge branch 'wip-MDL-53588-master' of https://github.com/marinaglancy/moodle 2016-04-05 09:36:16 +08:00
Ben Tindell
a2fb838e82 MDL-53577 repository: Added maxbytes error message
Changing the error message that is displayed to users when they
upload a file that is greater than the maximum upload size. Does not
include all upload cases; focuses on those most used by students.
2016-04-04 15:33:40 -05:00
Eric Merrill
cdb9e8db73 MDL-53612 search: Add book chapter search area 2016-04-04 15:14:22 -04:00