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

17801 commits

Author SHA1 Message Date
Dan Poltawski
ffce908869 Merge branch 'MDL-53780' of https://github.com/bostelm/moodle 2016-04-26 15:37:36 +01:00
Dan Poltawski
55905d6313 Merge branch 'MDL-53811_master' of git://github.com/markn86/moodle 2016-04-25 22:01:38 +01:00
Dan Poltawski
32bdfd74c0 Merge branch 'MDL-53864_master-alt' of git://github.com/markn86/moodle 2016-04-25 15:53:12 +01:00
Dan Poltawski
f60e024fdc Merge branch 'MDL-49754-master' of https://github.com/xow/moodle 2016-04-25 14:13:51 +01:00
Simey Lameze
48da3eef6e MDL-52490 mod_assign: fix lang strings to make it consistent 2016-04-22 10:25:07 +08:00
David Monllao
bc3b5a6a2f MDL-51603 quiz statistics: Using dataformats selector 2016-04-21 16:20:36 +08:00
Mark Nelson
4aa7e3fe18 MDL-53864 mod_feedback: fixed varying results on MSSQL 2016-04-21 11:32:49 +08:00
Dan Poltawski
8ef18bda2b Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-20 22:20:35 +01:00
Tim Hunt
de2fec2e9a MDL-46092 bootstrapbase: add OU quiz styling 
It is a nicer default to have in Moodle that what we had before.
 2016-04-20 15:43:34 +01:00
Dan Poltawski
795adc89af Merge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle 2016-04-20 12:38:15 +01:00
David Monllao
65f9001d31 Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle 2016-04-20 12:24:07 +08:00
David Monllao
d7eb33652f Merge branch 'MDL-53702_master' of https://github.com/liorgil/moodle 2016-04-20 11:10:23 +08:00
David Monllao
edc0c29f7b Merge branch 'MDL-25742-fix-individual-wiki' of git://github.com/cameron1729/moodle 2016-04-20 11:07:23 +08:00
David Monllao
c16c7530b1 Merge branch 'MDL-52596-assign-maxperpage' of https://github.com/brendanheywood/moodle 2016-04-20 11:04:10 +08:00
Cameron Ball
d5722b4447 MDL-25742 mod_wiki: Fix bug in get_tagged_pages 2016-04-20 10:37:34 +08:00
Eloy Lafuente (stronk7)
3a97e39825 Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle 2016-04-20 01:19:58 +02:00
Simey Lameze
bc577c541f MDL-51267 mod: move the changes from the API to the form file 2016-04-19 16:36:26 +08:00
Mark Nelson
fcc9218fb8 MDL-53811 mod_assign: fixed error in convert submissions task 2016-04-19 13:08:27 +08:00
David Monllao
56ff87aea5 Merge branch 'wip-MDL-25742-master' of https://github.com/marinaglancy/moodle 2016-04-19 12:42:21 +08:00
David Monllao
218fbd6ca2 Merge branch 'MDL-51267-master' of git://github.com/lameze/moodle 2016-04-19 11:53:22 +08:00
Simey Lameze
819e1ff0ad MDL-51267 mod_url: make the url and resource forms friendlier 2016-04-19 11:13:18 +08:00
Brendan Heywood
80989850b6 MDL-52596 assign: Add max assignment per grading page site wide setting 2016-04-18 16:34:40 +10:00
David Monllao
fbc6c48736 Merge branch 'MDL-53841-master' of http://github.com/damyon/moodle 2016-04-18 14:03:32 +08:00
David Monllao
064814eabe MDL-52490 mod_assign: Patch refinements 2016-04-18 09:17:08 +08:00
evltuma
d0d8a2da8f MDL-52490 assign: download selected assigment submissions as zip file 2016-04-18 09:17:08 +08:00
Ben Kelada
48143990e0 MDL-53345 forum: rename itemid 2016-04-18 11:04:57 +10:00
Ben Kelada
e881c4f5c3 MDL-53345 forum: Add attachmentareaid to support attachments in api 2016-04-18 11:04:57 +10:00
Ben Kelada
41182118ae MDL-53345 forum: Add item id as parameter to support inline attachments 2016-04-18 11:04:57 +10:00
Damyon Wiese
77a530601a MDL-53841 assign: Fix for assignment listing page. 
Was throwing debugging because there is no course module defined on this page.
 2016-04-17 22:35:41 +08:00
Eloy Lafuente (stronk7)
cd9e057be3 NOBUG: Fixed file access permissions 2016-04-15 10:19:04 +02:00
Damyon Wiese
821ab1bf9b MDL-52954 assign: Behat fixes because the assign grading ui has changed 2016-04-15 15:57:56 +08:00
liorgi
db3a6216cc MDL-48089 mod_forum: Improve DB query in observer 2016-04-14 14:20:32 +01:00
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
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
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
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