77609 Commits

Author SHA1 Message Date
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
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
David Monllao
a697023350 Merge branch 'MDL-53432-git-less-css' of https://github.com/brendanheywood/moodle 2016-03-29 15:43:23 +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
Dan Poltawski
1bed89fe6a Merge branch 'MDL-52945' of https://github.com/mr-russ/moodle 2016-03-29 09:43:30 +08:00
Adrian Greeve
f6592b9439 MDL-53467 repositories: Upgrade s3 to v0.5.1 2016-03-29 09:07:41 +08:00
Marina Glancy
2aad1094b1 MDL-29303 mod_feedback: allow any characters in labels 2016-03-27 21:47:49 +08:00
Marina Glancy
17e166847b MDL-53557 mod_feedback: partial boundaries in numeric items 2016-03-27 21:37:32 +08:00
Marina Glancy
02b2e3e70e MDL-53209 mod_feedback: allow frontpage users to view and complete 2016-03-27 21:03:01 +08:00
Dan Poltawski
0114ca3244 Merge branch 'wip-MDL-53538-master' of git://github.com/abgreeve/moodle 2016-03-26 11:37:35 +08:00
Dan Poltawski
ec7a8d3da3 Merge branch 'wip-MDL-50941-master' of https://github.com/marinaglancy/moodle 2016-03-26 11:26:31 +08:00
Dan Poltawski
35689b71a8 Merge branch 'MDL-53562-forum-reply-re' of https://github.com/brendanheywood/moodle 2016-03-26 10:35:55 +08:00
Dan Poltawski
ca0d7bf21c Merge branch 'MDL-53508-master' of git://github.com/merrill-oakland/moodle 2016-03-26 10:26:02 +08:00
Dan Poltawski
879f3c7a97 MDL-53507 quiz: fix bad htmlid 2016-03-26 10:05:40 +08:00
Dan Poltawski
b3687410df Merge branch 'MDL-53507' of git://github.com/timhunt/moodle 2016-03-26 09:42:46 +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
Eric Merrill
cd894f84b3 MDL-53516 search: Adding file indexing support to Solr
Expand the Solr engine to use the built in (to Solr) Tika
file indexing engine. Files are shipped off for indexing with
curl. Each file must have it's own document. So grouping is
used to keep files and Moodle docs associated.
2016-03-24 16:39:55 -04:00
Eric Merrill
091973dbd7 MDL-53515 search: Extend search API to allow file indexing 2016-03-24 15:44:27 -04:00
Eloy Lafuente (stronk7)
fb75b07c9e weekly release 3.1dev 2016-03-24 12:58:10 +01: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
Dan Poltawski
a4302a8fbe MDL-53147 theme_bootstrapbase: Fix RTL issues in messags 2016-03-24 09:05:44 +08:00
Eric Merrill
4894840dc6 MDL-53508 search: Improve highlighting and move to text fields 2016-03-23 08:55:48 -04:00
Brendan Heywood
2c8c24412e MDL-53356 admin: Fixed erroneous sectionerror when upgrade is needed 2016-03-23 16:26:04 +08:00
Dan Poltawski
c0c26e5e69 Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle 2016-03-23 14:40:05 +08:00
Jun Pataleta
54285c3ff5 MDL-53260 upgrade: Fix lang help text description. 2016-03-23 14:13:36 +08:00
David Monllao
f87fcf42ee MDL-52924 mod_assign: Bump version for new external function 2016-03-23 13:53:18 +08:00
Dan Poltawski
d137e671f7 Merge branch 'MDL-52952-master-fix' of github.com:xow/moodle 2016-03-23 12:08:32 +08:00
John Okely
94eb96aa78 MDL-52952 forms: Ignore autofill catching fields in form change checker 2016-03-23 11:54:27 +08:00