moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78855 commits 37 branches 544 tags 1.3 GiB
Commit graph

78855 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mark Nielsen
39b2d8700d MDL-53660 mod_forum: Fix coding style 2016-04-13 15:59:45 +01:00
Mark Nielsen
9258045b9b MDL-53660 mod_forum: Fix link decoding in single discussions 
This only happens when user data is not included.
 2016-04-13 15:59:44 +01: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
Gareth J Barnard
c44ec0d6aa MDL-53033 themes: Invalid attribute values for div.c1.btn. 2016-04-13 13:10:11 +01: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 Risner
4584c3de23 MDL-53095 repository_merlot: change merlot url use https 2016-04-13 15:10:26 +08: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
Marina Glancy
b06a90b0a0 MDL-53798 search: correct URL for frontpage course 2016-04-13 11:35:10 +08:00
David Monllao
8918a8115e MDL-53796 behat: Move get_debug_text to base class 2016-04-13 10:34:28 +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
Eric Merrill
e214f22f39 MDL-53795 logging: Add DB index for use when backing up logs 2016-04-12 21:44:15 -04: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
92c90b96ce MDL-25742 mod_wiki: show wiki pages tagged with a tag 2016-04-13 07:57:58 +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
Frederic Massart
bf6239eddb MDL-53779 external: get_string and get_strings use PARAM_RAW 
For the string parameters and translated strings.
 2016-04-12 17:04:19 +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
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08:00
Adrian Greeve
cfd1bcfa03 MDL-52642 blog: Fix notices for swapping contexts in activities. 2016-04-12 11:53:34 +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
Stephen Bourget
2ed2e692a6 MDL-52642 block_blog_menu: behat test 2016-04-12 10:45:33 +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
Henning Bostelmann
64ccb37d49 MDL-53780 mod_assign: Remove teachers from submission group members 2016-04-11 19:45:26 +01: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