moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77939 commits 37 branches 540 tags 1.3 GiB
Commit graph

77939 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
e689d68b54 Merge branch 'MDL-52954-master-behat-fixes' of git://github.com/damyon/moodle 2016-04-14 14:26:16 +08:00
David Monllao
3dd89357d4 Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/upgrade.txt
 2016-04-14 14:01:16 +08:00
Marina Glancy
787ec240c1 MDL-53772 inplace_editable: set context in callbacks 2016-04-14 13:58:29 +08:00
Damyon Wiese
56fa860ead MDL-53772 externallib: Fix busted webservices context handling 
Fix:
$PAGE->context must be reset when calling validate_context

Improve:
Provide wrapper for calling an external function

The wrapper correctly checks the function parameters and return type against
the description of the external function, and stores the PAGE and COURSE global
state variables, restoring them before the function returns.

Fix: buggy unit tests.

These tests are expecting debugging from a bug that was fixed, and calling web
service functions with no user or session.
 2016-04-14 13:58:23 +08:00
Damyon Wiese
5267d632ff MDL-52954 assign: Fixes to webservices and context. 
This patch gets the behat tests passing again - but only with MDL-53772 in the branch.
 2016-04-13 21:23:50 +08:00
Dan Poltawski
e92a39cf0c Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle" 
This reverts commit 61a0465ce7, reversing
changes made to 2408f8fe2b.
 2016-04-13 10:48:59 +01:00
David Monllao
27cec47220 Merge branch 'wip-MDL-53443-fix' of git://github.com/marinaglancy/moodle 2016-04-13 12:41:04 +08:00
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
Eloy Lafuente (stronk7)
1d981ae4c2 Merge branch 'wip-MDL-53443-master' of https://github.com/marinaglancy/moodle 2016-04-13 03:26:46 +02: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
f40b444ef8 MDL-52707 tags: fix SQL query to work on all DBs 2016-04-13 07:46:44 +08:00
Eloy Lafuente (stronk7)
aca13ea2b6 Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle 2016-04-12 22:39:26 +02:00
Eloy Lafuente (stronk7)
11c673f3a3 Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle 2016-04-12 21:34:41 +02:00
AMOS bot
6526005fcf Automatically generated installer lang files 2016-04-13 00:04:10 +08:00
Dan Poltawski
d350414813 Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle 2016-04-12 16:50:29 +01:00
Dan Poltawski
61a0465ce7 Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle 2016-04-12 14:13:36 +01:00
Pau Ferrer Ocaña
b1a9804a9b MDL-52263 libraries: Add test cases to external_format_text options 2016-04-12 15:05:46 +02:00
Pau Ferrer Ocaña
19a131edff MDL-52263 libraries: Add options to external_format_text 2016-04-12 14:39:23 +02:00
Damyon Wiese
2408f8fe2b MDL-52954 assign: Fix CSS lint issues 2016-04-12 08:19:31 +01:00
David Monllao
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08:00
David Monllao
45c49f3218 Merge branch 'MDL-53007_master' of https://github.com/marxjohnson/moodle 2016-04-12 11:31:17 +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
Eric Merrill
935ee1c6c6 MDL-53167 search: Adding unit tests for external API change 2016-04-11 21:24:18 -04:00
AMOS bot
f82ad999cb Automatically generated installer lang files 2016-04-12 00:04:19 +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