Commit graph

18112 commits

Author SHA1 Message Date
Marina Glancy
47f4909a08 MDL-53443 mod_feedback: fix SQL statment to work on all DB 2016-04-13 12:00:14 +08:00
David Monllao
101303034f Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:51:35 +08:00
David Monllao
27bfb0ee9b Merge branch 'wip-MDL-45064-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:38:12 +08:00
Marina Glancy
df003a85f0 MDL-53443 mod_feedback: templates code clean up and behat tests 2016-04-13 09:21:33 +08:00
Marina Glancy
2348c13732 MDL-45064 mod_lti: use callback get_shortcuts()
deprecate callback for ltisource plugins get_types(), instead introduce
get_shortcuts()
2016-04-13 08:30:05 +08:00
Marina Glancy
9ca0420e93 MDL-45064 course: mod callback get_shortcuts()
also deprecate callback get_types()
2016-04-13 08:30:04 +08:00
John Okely
01e8bfd745 MDL-45064 lti: LTI types in activity chooser 2016-04-13 08:30:04 +08:00
Marina Glancy
92c90b96ce MDL-25742 mod_wiki: show wiki pages tagged with a tag 2016-04-13 07:57:58 +08:00
Damyon Wiese
2408f8fe2b MDL-52954 assign: Fix CSS lint issues 2016-04-12 08:19:31 +01:00
spvickers
82f5226576 MDL-49754 mod_lti: Fixes to JSON format
@id elements in JSON corrected to match the IMS spec.  Version number of
the service updated.
2016-04-12 15:08:28 +08:00
David Monllao
b79b53d452 Merge branch 'MDL-53770-master' of git://github.com/marinaglancy/moodle 2016-04-12 10:54:03 +08:00
David Monllao
87c221a7a9 Merge branch 'MDL-53703-master' of git://github.com/dpalou/moodle 2016-04-12 10:06:30 +08:00
Henning Bostelmann
64ccb37d49 MDL-53780 mod_assign: Remove teachers from submission group members 2016-04-11 19:45:26 +01: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
c62fa3c0b9 Merge branch 'MDL-53613-master' of git://github.com/merrill-oakland/moodle 2016-04-11 15:14:59 +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
Andrew Nicols
c0e3c8ae0d MDL-52942 forum: Allow posting to multiple groups in eachuser forums 2016-04-11 12:23:47 +08:00
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
Marina Glancy
1e34257ec2 MDL-16855 tags: allow to filter tags on management page 2016-04-11 10:04:17 +08:00
Marina Glancy
a0dbba8308 MDL-53770 mod_lti: allow to uninstall ltisource plugins 2016-04-11 09:03:49 +08:00
liorgi
73dcd8282a MDL-53702 mod_forum: Remove unused variables 2016-04-10 08:51:57 +03:00
Eric Merrill
455f4346e5 MDL-53613 search: Add collaborative wiki pages to global search 2016-04-07 14:56:00 -04:00
liorgi
7664fe2efb MDL-53702 mod_forum: Remove unused variables 2016-04-07 17:34:18 +03: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
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
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
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)
76d02bb8ac Merge branch 'MDL-53671-master' of git://github.com/dpalou/moodle 2016-04-05 23:57:21 +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
9bb87baf18 MDL-53449 mod_feedback: reponses page clean up and behat 2016-04-05 14:46:20 +01:00
Dan Poltawski
393329069d Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle 2016-04-05 10:47:19 +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
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
Eric Merrill
cdb9e8db73 MDL-53612 search: Add book chapter search area 2016-04-04 15:14:22 -04:00
Dan Poltawski
93c9c9a86b Merge branch 'wip-MDL-49861-master' of git://github.com/abgreeve/moodle 2016-04-04 12:10:17 +01:00
Dan Poltawski
9d6e3cb6c0 Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle 2016-04-04 09:01:46 +01:00