mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
77,752 Commits 36 Branches 519 Tags
Commit Graph

77752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
87c221a7a9 Merge branch 'MDL-53703-master' of git://github.com/dpalou/moodle 2016-04-12 10:06:30 +08:00
Dan Poltawski
1dd254bbf1 Merge branch 'MDL-53417-master' of git://github.com/cameron1729/moodle 2016-04-11 16:36:50 +01:00
Dan Poltawski
4a39dd3071 Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle 2016-04-11 16:34:26 +01:00
Dan Poltawski
d5327021e0 Merge branch 'MDL-53440-master' of git://github.com/cameron1729/moodle 2016-04-11 15:28:37 +01:00
Dan Poltawski
c62fa3c0b9 Merge branch 'MDL-53613-master' of git://github.com/merrill-oakland/moodle 2016-04-11 15:14:59 +01:00
Dan Poltawski
6ff935c206 Merge branch 'MDL-53674-master-eventmsg' of git://github.com/mudrd8mz/moodle 2016-04-11 14:29:14 +01:00
Dan Poltawski
35b3f50ee2 Merge branch 'MDL-53728' of git://github.com/timhunt/moodle 2016-04-11 14:02:29 +01:00
Dan Poltawski
5ce14ec291 Merge branch 'MDL-52338' of https://github.com/dg711/moodle 2016-04-11 13:53:18 +01:00
Dani Palou
7ef81de827 MDL-53703 wiki: Add tests for mod_wiki_get_subwiki_files 2016-04-11 11:13:02 +02:00
Dani Palou
62e20cfed6 MDL-53703 wiki: New WS mod_wiki_get_subwiki_files 2016-04-11 11:13:01 +02:00
Dan Poltawski
a8b33e8e10 MDL-52954 mod_assign: fix trailing whitespace 2016-04-11 10:07:17 +01:00
Dan Poltawski
728da02780 MDL-52954 editpdf: fix phpdoc 2016-04-11 09:55:38 +01:00
Dan Poltawski
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
Dani Palou
31bfb00809 MDL-53709 wiki: Return content size if includecontent=0 2016-04-11 09:00:53 +02:00
David Monllao
9bfb76c40d Merge branch 'MDL-52942-master' of git://github.com/andrewnicols/moodle 2016-04-11 14:24:27 +08:00
David Monllao
468ef66775 Merge branch 'MDL-52385-master' of git://github.com/andrewnicols/moodle 2016-04-11 13:54:23 +08:00
Marina Glancy
4218ad9371 MDL-53363 tags: helper to search for tagged items; search course modules 2016-04-11 13:22:47 +08:00
Andrew Nicols
c0e3c8ae0d MDL-52942 forum: Allow posting to multiple groups in eachuser forums 2016-04-11 12:23:47 +08:00
Devang Gaur
f58c96f6b0 MDL-52338 blocks: message link should not appear when set false 2016-04-11 08:28:31 +05:30
David Monllao
2a84fae088 MDL-53709 mod_wiki: Update includecontent description 2016-04-11 10:13:39 +08:00
David Monllao
67fc5bcb75 Merge branch 'MDL-53709-master' of git://github.com/dpalou/moodle 2016-04-11 10:12:02 +08:00
David Mudrák
db1d5b104b MDL-53674 event monitor: Do not send HTML as plain text formatted emails 
There were two problems here.

* The $msgdata->fullmessage was always formatted as HTML even if the
  $msgdata->fullmessageformat was set to the original template's format.
* The plain text part of the emailed message contained HTML code.

The patch makes sure that the original template is always formatted into
HTML and then converted to plain text before setting the text/plain
multipart of the sent email.
 2016-04-08 15:14:23 +02:00
Eric Merrill
455f4346e5 MDL-53613 search: Add collaborative wiki pages to global search 2016-04-07 14:56:00 -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
Dani Palou
b1be9b2010 MDL-53709 wiki: Return content size if includecontent=0 2016-04-07 08:43:31 +02: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
Daniel Neis Araujo
dfb9daeae2 MDL-52385 tasks: Queue ad-hoc tasks in future 2016-04-07 11:49:52 +08:00
Abhijit A.M
1b276bfc9d MDL-53440 course: Better interface for approving multiple courses 
Added another target 'pending' in course/edit.php for redirection
This will help administrator/managers approve multiple courses
one after another
 2016-04-07 10:38:42 +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
Tim Hunt
f06eacd99d MDL-53728 question import/export: improve form structure 2016-04-06 15:35:29 +01: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