Commit graph

76078 commits

Author SHA1 Message Date
Dan Poltawski
c8407f0109 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-19 09:21:04 +00:00
Eloy Lafuente (stronk7)
65b70071ca Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle 2015-11-19 09:45:30 +01:00
Dan Poltawski
ef65a6a9c5 Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle 2015-11-19 07:06:16 +00:00
David Monllao
c181efe978 MDL-42571 editpdf: Fix search comments
They are also hidden instead of destroyed.
2015-11-19 14:59:03 +08:00
Dan Poltawski
de1519002e Merge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle 2015-11-19 06:47:30 +00:00
Dan Poltawski
78b2c65c0a Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle 2015-11-19 06:33:54 +00:00
David Monllao
402f4a1f53 MDL-42571 editpdf: Fix comments search and multiple views drawing 2015-11-19 12:29:20 +08:00
Marina Glancy
3be59be349 MDL-52203 qtype_multianswer: avoid fatal error during upgrade 2015-11-19 11:06:48 +08:00
AMOS bot
44c4d1406d Automatically generated installer lang files 2015-11-19 00:04:45 +08:00
Marina Glancy
228f66ad7f MDL-52194 flowplayer: do not check request
$_REQUEST variable may contain cookies in some php configurations. See also MDL-48085
2015-11-18 15:35:55 +08:00
David Monllao
0519a1dabb MDL-52162 question: Removing unnecessary dependency
APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.

Credit to Marina Glancy.
2015-11-18 13:16:39 +08:00
Dan Poltawski
14c855d8cd Merge branch 'MDL-52140' of git://github.com/stronk7/moodle 2015-11-17 16:27:42 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
David Monllao
08cc1ad828 Merge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle 2015-11-17 10:20:59 +08:00
Russell Smith
bb2c0b4526 MDL-50700 gradereport_overview: Call $PAGE->set_course
To ensure correct blocks are displayed.
2015-11-17 10:01:57 +08:00
David Monllao
f2b28f8130 Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle 2015-11-17 08:54:50 +08:00
Dan Poltawski
a461fcf9db Merge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle 2015-11-16 16:21:17 +00:00
AMOS bot
b1f7f87c25 Automatically generated installer lang files 2015-11-17 00:05:09 +08:00
Dan Poltawski
8d5935d53b Merge branch 'MDL-52139' of git://github.com/stronk7/moodle 2015-11-16 09:28:37 +00:00
David Monllao
6bcff8abf5 Merge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle 2015-11-16 15:25:42 +08:00
David Monllao
f9cccec39f Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle 2015-11-16 14:54:19 +08:00
David Monllao
53f8e45279 Merge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle 2015-11-16 14:25:48 +08:00
David Monllao
fb680f7959 Merge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle 2015-11-16 14:19:18 +08:00
David Monllao
09083ab0a8 Merge branch 'MDL-42571' of git://github.com/blaky/moodle
Conflicts:
	mod/assign/feedback/editpdf/version.php
2015-11-16 13:39:59 +08:00
Eloy Lafuente (stronk7)
d83775b89b MDL-52139 backup: Bump release to 3.1 2015-11-16 00:39:17 +01:00
Eloy Lafuente (stronk7)
26653c8b5c weekly back-to-dev release 3.1dev 2015-11-15 23:23:46 +01:00
Eloy Lafuente (stronk7)
b2e859bcbc Change travis.yml back to master 2015-11-15 18:44:56 +01:00
Eloy Lafuente (stronk7)
6114fab93b Moodle release 3.0 2015-11-15 18:44:55 +01:00
Eloy Lafuente (stronk7)
8fad9719c6 Change travis.yml to MOODLE_30_STABLE 2015-11-15 18:44:55 +01:00
Eloy Lafuente (stronk7)
9cb902fa34 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-15 18:44:47 +01:00
Dan Poltawski
7b0abbb34d Merge branch 'MDL-52126' of git://github.com/stronk7/moodle 2015-11-15 16:05:33 +00:00
AMOS bot
dc3e6512e4 Automatically generated installer lang files 2015-11-16 00:04:22 +08:00
Eloy Lafuente (stronk7)
9dbbdcb40a MDL-52126 forum: Verify forum mailout contents
New unit test able to verify mail contents
configured by provider do match all expectations defined.
2015-11-15 13:29:31 +01:00
Eloy Lafuente (stronk7)
593aaa5366 MDL-52126 forum: Correct over-escaping of html-based emails 2015-11-15 13:16:42 +01:00
Andrew Nicols
f98345b976 MDL-52126 forum: Correct over-escaping of text-based emails 2015-11-14 22:35:09 +01:00
AMOS bot
5d7bdbd947 Automatically generated installer lang files 2015-11-15 00:04:05 +08:00
Johannes Burk
64b9afa6a5 MDL-41643 datafield_checkbox: Add line breaks behind checkbox options.
Add line a break behind each checkbox option in advanced search.
2015-11-14 13:48:20 +01:00
Frederic Massart
3b10fa25bc MDL-50564 atto: Require atto_menu in atto_plugin 2015-11-13 14:38:33 -06:00
AMOS bot
43f05bf097 Automatically generated installer lang files 2015-11-14 00:06:20 +08:00
Syam Mohan
77690b69f5 MDL-52021 enrollib: Removed repeated capability
'moodle/role:assign' replicated in the permission checking
2015-11-13 07:23:40 -06:00
David Monllao
20949f47fe Moodle release 3.0rc4 2015-11-13 15:28:19 +08:00
David Monllao
f26ab8306f Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-13 15:28:16 +08:00
Dan Poltawski
9680529069 MDL-50687 phpunit: error early if required locale not installed 2015-11-13 07:00:09 +00:00
David Monllao
415c79abcc MDL-52071 webservices: Bump version to update services 2015-11-13 07:49:39 +08:00
David Monllao
a0b972ac3c Merge branch 'MDL-52071-master' of git://github.com/jleyva/moodle 2015-11-13 07:47:58 +08:00
Dan Poltawski
e763d96122 MDL-51819 theme: style fix for nested dropdowns 2015-11-12 21:54:50 +00:00
Bence Laky
da91de7821 MDL-42571 assignfeedback_editpdf: Fixed second PDF view 2015-11-12 14:16:17 +00:00
Juan Leyva
b8fbbc44d0 MDL-52071 ws: Add core_enrol_get_course_enrolment_methods to service 2015-11-12 13:21:58 +01:00
Dan Poltawski
00d70d79a4 MDL-47065 notes: prevent empty spaces added as note
(And updated behat test for this test case)
2015-11-12 09:56:56 +00:00
Jun Pataleta
2a4c236704 MDL-47065 behat: improve verificaton of lack of note 2015-11-12 09:56:56 +00:00