mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
77,797 Commits 36 Branches 528 Tags
Commit Graph

21482 Commits

Author SHA1 Message Date
Brendan Heywood
bff1edbe44 MDL-51603 dataformat: Implement streaming dataformat plugin 2016-04-20 12:39:25 +10:00
Brendan Heywood
b4772a41d1 MDL-51603 dataformat: Imported 3rd party lib spout 2016-04-20 12:33:35 +10:00
Damyon Wiese
821ab1bf9b MDL-52954 assign: Behat fixes because the assign grading ui has changed 2016-04-15 15:57:56 +08:00
Damyon Wiese
11c16f5fc8 MDL-53772 externallib: Deprecate external_function_info() 2016-04-14 15:07:41 +08:00
Damyon Wiese
e02e7f5a01 MDL-53772 libraries: More context fixes 
1. Improve upgrade note
2. Don't abuse $PAGE to get the current course/cm
3. Use validate_context, never $PAGE->set_context()
4. Reset current coursemodule in validate_context().
5. Respect moodlepageclass when calling an external function.
 2016-04-14 15:02:41 +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
Dan Poltawski
e92a39cf0c Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle" 
This reverts commit 61a0465ce76154dbe223649c58c66313e9b510ae, reversing
changes made to 2408f8fe2bf6321592cc1ab5a8db6f9b3c65eb4b.
 2016-04-13 10:48:59 +01: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
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
Eloy Lafuente (stronk7)
11c673f3a3 Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle 2016-04-12 21:34:41 +02: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
David Monllao
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08: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
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01: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
Marina Glancy
1e34257ec2 MDL-16855 tags: allow to filter tags on management page 2016-04-11 10:04:17 +08:00
Marina Glancy
0d2027896d MDL-52707 core_tag: allow to combine tags 2016-04-11 09:49:56 +08:00
Cameron Ball
a6a59bcaa4 MDL-52944 atto: Use event-key to handle enter key 2016-04-08 12:25:27 +08:00
Panagiotis Nikoloutsopoulos
92a8ca4ba2 MDL-52944 atto: Contenteditable command 'FormatBlock' set to 'p' 2016-04-08 12:13:23 +08:00
Eric Merrill
427e3cbcd6 MDL-53167 search: Add ability to limit courses searched 2016-04-07 14:41:59 -04: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
Rajesh Taneja
80c3b48409 MDL-52502 behat: Flush buffer to show differences 2016-04-07 09:29:50 +08: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
Eloy Lafuente (stronk7)
d9c557250c MDL-52502 behat: clean 2 uses of deleted method 2016-04-06 00:16:08 +02:00
Eloy Lafuente (stronk7)
f6825a62ef Merge branch 'wip-mdl-52502' of https://github.com/rajeshtaneja/moodle 2016-04-06 00:12:00 +02:00
Dan Poltawski
245192accc Merge branch 'MDL-50050-master' of git://github.com/lameze/moodle 2016-04-05 16:23:24 +01:00
Dan Poltawski
f164cab739 Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle 2016-04-05 14:27:25 +01:00
Dan Poltawski
529ea77b13 MDL-53175 upgrade.txt: fix trailing whitespace 2016-04-05 12:23:50 +01:00
Dan Poltawski
393329069d Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle 2016-04-05 10:47:19 +01:00
Dan Poltawski
88e8e6006f Merge branch 'MDL-53633-master' of git://github.com/andrewnicols/moodle 2016-04-05 09:40:41 +01:00
Dan Poltawski
c56e8bc6ff Merge branch 'MDL-53577_master' of https://github.com/jinhofer/moodle 2016-04-05 09:38:00 +01:00
Dan Poltawski
c019cc57f4 Merge branch 'MDL-53595' of git://github.com/stronk7/moodle 2016-04-05 08:28:48 +01:00
Andrew Nicols
efaf5c0570 MDL-53056 JS: Whitespace fix 2016-04-05 14:58:57 +08:00
Andrew Nicols
2697ece323 Merge branch 'MDL-53056-master' of git://github.com/damyon/moodle 2016-04-05 14:57:26 +08:00
Andrew Nicols
44a72e9bd0 Merge branch 'MDL-53462-master' of git://github.com/jleyva/moodle 2016-04-05 12:54:58 +08:00
Rajesh Taneja
e891c8381e MDL-52502 behat: Ensure php web and cli version is same 2016-04-05 11:46:44 +08:00
Rajesh Taneja
af2dc48b41 MDL-52502 phpunit: Add php, db and os deatils 2016-04-05 11:46:43 +08:00
Ben Tindell
a2fb838e82 MDL-53577 repository: Added maxbytes error message 
Changing the error message that is displayed to users when they
upload a file that is greater than the maximum upload size. Does not
include all upload cases; focuses on those most used by students.
 2016-04-04 15:33:40 -05:00
Eloy Lafuente (stronk7)
f8b059f245 MDL-53595 install: update the list of stale files for 3.1 
Note I've deleted a couple of files there, 99.99% not problematic
(repository/boxnet) because as a general rule it's better to avoid
adding plugin files in the function and, instead, use core ones that
cannot be "reinstalled". Exception to the rule (what's a rule without
an exception) being forum that cannot be deleted. ;-)
 2016-04-04 19:22:08 +02:00