Commit graph

22043 commits

Author SHA1 Message Date
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
Dan Poltawski
ad6bdd1301 Merge branch 'MDL-53641' of git://github.com/stronk7/moodle 2016-04-04 16:59:46 +01:00
David Monllao
9470e4d1ed MDL-53272 search: Remove search results cache 2016-04-04 15:38:03 +08:00
Eloy Lafuente (stronk7)
7ca2c19b81 MDL-53641 paging bar: add missing space before last element 2016-04-02 00:13:51 +02:00
Simey Lameze
a77e0611a0 MDL-50050 core_deprecated: remove deprecated functions from 2.9 2016-04-01 09:33:30 +08:00
Simey Lameze
221bfffd4e MDL-53104 core_blog: remove deprecated capabilities
This commit removes moodle/blog:associatecourse and moodle/blog:associatemodule deprecated capabilities.
2016-04-01 08:42:09 +08:00
Juan Leyva
f4fb827ed1 MDL-53462 core_badges: New WS core_badges_get_user_badges 2016-03-30 10:44:55 +01:00
Juan Leyva
296ab1e253 MDL-53175 file: Allow file_rewrite_pluginfile_urls to reverse 2016-03-30 09:37:32 +01:00
Damyon Wiese
6853cd5ed4 MDL-52954 assign: Fix the reasonable cibot warnings. 2016-03-30 14:07:28 +08:00
Damyon Wiese
bb690849c9 MDL-52954 assign: Rebuild the assignment single grade page. 2016-03-30 13:47:21 +08:00
Damyon Wiese
84a32f156e MDL-52954 forms: Allow form submission via ajax (ignoring GET and POST) 2016-03-30 11:48:40 +08:00
Damyon Wiese
b803df8170 MDL-52954 atto: Stop autosave timer, when editor no-longer exists. 2016-03-30 11:48:40 +08:00
Damyon Wiese
1356d85151 MDL-52954 core: Change from pandoc to unoconv - it gives better results
Most importantly it retains formatting better, and supports different charsets far better than pandoc.
2016-03-30 11:48:39 +08:00
Damyon Wiese
128d8736d3 MDL-52954 core: Unit tests for pandoc document converter. 2016-03-30 11:48:39 +08:00
Damyon Wiese
2e76c14e11 MDL-52954 core: Add a document converter to file_storage
This lets us convert between common office formats. E.g. docx -> pdf
html -> pdf, html -> ods.

This commit also updates assignment editpdf plugin to use this converter
on all compatible submission files.
2016-03-30 11:48:39 +08:00
Damyon Wiese
1fca8a7bdd MDL-53056 javascript: Improve the fragments API
Instead of injecting the HTML + JS directly - return a promise that is resolve with
the HTML and JS. This gives the caller control over how and when to inject the nodes
in the DOM. Also modify templates.replaceNode functions to cleanup YUI events mess.
Also pass the context to the callback so it can be verified.
Also pass the arguments to the callback as a named array - not a flat argument list.
Also - only load external scripts if they are not already loaded.
2016-03-30 11:48:38 +08:00
Eloy Lafuente (stronk7)
d4f69a462e Merge branch 'MDL-52388-master' of git://github.com/cameron1729/moodle 2016-03-29 23:14:06 +02:00
Dan Poltawski
0729ea9fd7 Merge branch 'wip-MDL-53274-master' of https://github.com/marinaglancy/moodle 2016-03-29 17:12:42 +08:00
Dan Poltawski
b9280927d6 Merge branch 'MDL-53543_master' of git://github.com/dmonllao/moodle 2016-03-29 16:45:37 +08:00
Andrew Nicols
9c048e21ac MDL-53633 javascript: Ensure that ordering of options is preserved 2016-03-29 15:47:00 +08:00
David Monllao
0ae7fa12ac Merge branch 'wip-MDL-52760-master' of https://github.com/marinaglancy/moodle 2016-03-29 12:55:46 +08:00
Dan Poltawski
a042f56be5 Merge branch 'wip-mdl-53623' of https://github.com/rajeshtaneja/moodle 2016-03-29 12:49:27 +08:00
Dan Poltawski
f7074f5db4 Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle 2016-03-29 10:37:25 +08:00
Rajesh Taneja
225265b03d MDL-53623 behat: catch expection if failed to trigger event
Inline editing element might hide before
event is triggred, so don't trigger exception
if exception happens
2016-03-29 09:52:37 +08:00
David Monllao
497cd6d48b Merge branch 'MDL-53181-master' of git://github.com/andrewnicols/moodle 2016-03-29 09:50:52 +08:00
Dan Poltawski
1bed89fe6a Merge branch 'MDL-52945' of https://github.com/mr-russ/moodle 2016-03-29 09:43:30 +08:00
Dan Poltawski
6a3116dd3c Merge branch 'wip-MDL-50795-master' of git://github.com/abgreeve/moodle 2016-03-26 09:31:54 +08:00
Eloy Lafuente (stronk7)
3615219889 NOBUG: Fixed file access permissions 2016-03-24 12:58:10 +01:00
Cameron Ball
b31bbcf839 MDL-52388 output: Only stop displaying pager next link on last page
Thank you to Brenda Uga for working on this.
2016-03-24 16:56:30 +08:00
Vadim Dvorovenko
dd399f51ab MDL-45835 group: events for groupings assign/unassign 2016-03-24 10:59:35 +08:00
Adrian Greeve
387c8026a5 MDL-50795 atto: Pasting into atto removes background colour style.
Copying from one atto editor to another comes with a lot of style
information. This removes the color attributes which make the page
look ugly when competing with different themes.
2016-03-24 10:53:59 +08:00
John Okely
94eb96aa78 MDL-52952 forms: Ignore autofill catching fields in form change checker 2016-03-23 11:54:27 +08:00
David Monllao
b5335149f4 Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle 2016-03-23 09:17:11 +08:00
Dan Poltawski
8ca99daf86 Merge branch 'MDL-53383-master' of git://github.com/andrewnicols/moodle 2016-03-23 08:14:23 +08:00
Marina Glancy
cbecc3c35a MDL-53254 tags: little fixes after review 2016-03-22 17:10:34 +08:00
Eloy Lafuente (stronk7)
8261a8a3ed MDL-53393 libraries: Fix thirdpartylib to point to directory 2016-03-22 09:06:04 +01:00
Dan Poltawski
4a166bfd16 Merge branch 'wip-MDL-51867-master2' of https://github.com/marinaglancy/moodle 2016-03-22 13:13:57 +08:00
Dan Poltawski
ce32fa5572 MDL-39524 tests: fix incorrect phpdoc 2016-03-22 12:56:53 +08:00
Dan Poltawski
cdb2a2ef9f Merge branch 'MDL-39524' of https://github.com/jrchamp/moodle 2016-03-22 12:52:26 +08:00
Dan Poltawski
afda050660 MDL-39524 tests: unit test for get_real_size() 2016-03-22 12:47:07 +08:00