Juan Leyva
296ab1e253
MDL-53175 file: Allow file_rewrite_pluginfile_urls to reverse
2016-03-30 09:37:32 +01:00
Adrian Greeve
f27ca9451f
MDL-49861 mod_data: Behat step to test adding records.
...
Clicking 'Save and add another' should clear the form.
2016-03-30 16:22:49 +08:00
Adrian Greeve
c18ad4afd6
MDL-49861 mod_data: Save and add another button clears fields.
2016-03-30 16:18:50 +08:00
Dan Poltawski
79efd94da3
Merge branch 'MDL-53643_master' of git://github.com/dmonllao/moodle
2016-03-30 15:52:26 +08:00
David Monllao
19773d756f
MDL-53397 search_solr: Updating param types
2016-03-30 15:44:02 +08:00
David Monllao
53c2f82960
MDL-53397 search_solr: No index default name
2016-03-30 15:41:34 +08:00
Damyon Wiese
6853cd5ed4
MDL-52954 assign: Fix the reasonable cibot warnings.
2016-03-30 14:07:28 +08:00
Damyon Wiese
07a7d9a5f1
MDL-52954 assign: Fix new behat tests
...
This is the result of new tests added using the old lang strings.
2016-03-30 13:47:21 +08:00
Damyon Wiese
bb690849c9
MDL-52954 assign: Rebuild the assignment single grade page.
2016-03-30 13:47:21 +08:00
Damyon Wiese
2a3647bae5
MDL-52954 marking guide: Wrap radio fields in a label for styling
2016-03-30 13:47:10 +08:00
Dan Poltawski
e1ec2bbbf3
Merge branch 'wip-MDL-53274-fix' of https://github.com/marinaglancy/moodle
2016-03-30 13:01:42 +08:00
Marina Glancy
0a4f89e5b6
MDL-53274 message: set page context
2016-03-30 12:57:32 +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
David Monllao
bd5d2c60be
MDL-53643 search_solr: Setting correctly test server data
2016-03-30 11:40:38 +08:00
David Monllao
13e2c1bf58
Merge branch 'MDL-53314-imap-debugging' of https://github.com/brendanheywood/moodle
2016-03-30 09:49:05 +08:00
David Monllao
99fddd48c3
Merge branch 'wip-MDL-53557-fix' of https://github.com/marinaglancy/moodle
2016-03-30 09:33:46 +08:00
David Monllao
121b97e2ed
MDL-53401 auth_mnet: Update upgrade note according to reality.
...
Grrrr David, thanks DanP.
2016-03-30 09:29:50 +08:00
David Monllao
c573ca1cfd
MDL-53401 auth_mnet: Note in upgrade.txt about the change
2016-03-30 09:21:11 +08:00
Marina Glancy
4ba67534d8
MDL-53557 mod_feedback: fix to formatting float
2016-03-30 09:17:51 +08:00
David Monllao
11e60abf75
Merge branch 'MDL-53401-master' of git://github.com/lameze/moodle
2016-03-30 09:12:25 +08:00
Dan Poltawski
a3e3b696ef
Merge branch 'MDL-53516-integration' of https://github.com/merrill-oakland/moodle
2016-03-30 09:10:09 +08:00
Eloy Lafuente (stronk7)
213fdb1d98
Merge branch 'wip-mdl-49150' of https://github.com/rajeshtaneja/moodle
2016-03-30 00:10:46 +02:00
Eloy Lafuente (stronk7)
d4f69a462e
Merge branch 'MDL-52388-master' of git://github.com/cameron1729/moodle
2016-03-29 23:14:06 +02:00
AMOS bot
c609682c96
Automatically generated installer lang files
2016-03-30 00:04:12 +08:00
Eric Merrill
8dfc6291dd
MDL-53516 search: Remove file index unit test disable flag
2016-03-29 08:59:44 -04:00
Eric Merrill
7a3bc40cb5
MDL-53515 search: Add template example
2016-03-29 08:52:25 -04: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
Dan Poltawski
8783393bc4
Merge branch 'MDL-53578-master' of git://github.com/merrill-oakland/moodle
2016-03-29 16:38:58 +08:00
Dan Poltawski
e195da19e0
Merge branch 'MDL-53516-master' of git://github.com/merrill-oakland/moodle
2016-03-29 16:35:44 +08:00
David Monllao
dd39020d68
Merge branch 'MDL-53356-master' of git://github.com/cameron1729/moodle
2016-03-29 15:56:13 +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
a697023350
Merge branch 'MDL-53432-git-less-css' of https://github.com/brendanheywood/moodle
2016-03-29 15:43:23 +08:00
Andrew Nicols
c71d185658
MDL-17955 forum: Remove timed postings from experimental
...
This commit does two things:
1) remove the note about the feature being experimental; and
2) changes the default to be enabled for new sites.
This will not enable the feature for existing sites where it is not
enabled.
2016-03-29 15:39:58 +08:00
Dan Poltawski
868e5ef0d5
Merge branch 'MDL-53515-master' of git://github.com/merrill-oakland/moodle
2016-03-29 14:39:53 +08:00
David Monllao
ae2d413b2c
Merge branch 'wip-MDL-53467-master' of git://github.com/abgreeve/moodle
2016-03-29 13:38:14 +08:00
David Monllao
686bb3ea9d
Merge branch 'wip-MDL-53557-master' of https://github.com/marinaglancy/moodle
2016-03-29 13:28:04 +08:00
David Monllao
f3f9f716e9
Merge branch 'MDL-52646' of https://github.com/wjroes/moodle
2016-03-29 12:58:33 +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
David Monllao
227a4f1419
Merge branch 'wip-MDL-53209-master' of git://github.com/marinaglancy/moodle
2016-03-29 12:52:07 +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
David Monllao
981649256a
Merge branch 'wip-MDL-29303-master2' of https://github.com/marinaglancy/moodle
2016-03-29 10:01:58 +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