82852 Commits

Author SHA1 Message Date
Ryan Wyllie
42e2f6c0e9 MDL-57370 message: fix duplicate ids 2017-02-08 07:40:07 +00:00
Rajesh Taneja
808cfcc372
MDL-56954 behat: Fixed string to pass behat
colon is not concatenated to Search courses string
2017-02-08 09:50:02 +08:00
Dan Poltawski
cf8c463de6 Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle 2017-02-07 12:32:34 +00:00
Dan Poltawski
125fa38af3 Merge branch 'MDL-57370-master' of git://github.com/ryanwyllie/moodle 2017-02-07 10:35:13 +00:00
Damyon Wiese
3d6ae65b61 MDL-57009 javascript: Reject on all errors
Not all error paths were resulting in a reject() call to fail a promise.
2017-02-07 15:36:48 +08:00
Damyon Wiese
f3cd5c5b7b MDL-57009 javascript: Always use when.apply
Or it does not really wait for the promises.
2017-02-07 15:03:43 +08:00
Eloy Lafuente (stronk7)
3587ee29c2 Merge branch 'MDL-56954-master' of git://github.com/lameze/moodle 2017-02-07 06:20:26 +01:00
Ryan Wyllie
b1e6f1a8fb MDL-57370 message: deprecate message_get_recent_conversations 2017-02-07 01:40:47 +00:00
Ryan Wyllie
98be2d2009 MDL-57370 message: change indexes on message tables 2017-02-07 01:40:47 +00:00
Ryan Wyllie
4d146f1a45 MDL-57370 message: unit tests for get_conversations 2017-02-07 01:04:11 +00:00
Ryan Wyllie
349f426197 MDL-57370 message: remove joins from get_conversations
I have broken up the single query that was doing multiple joins on the
messaging and user tables. It no longer does any joins and will instead
query each data set individually.

This may cost more in terms of PHP processing but it will mean that
standard database tunings should be able to handle larger data sets.

For example this function was taking a long time to run on moodle.org
and was causing the MySQL join buffer to overflow.
2017-02-07 01:04:11 +00:00
Eloy Lafuente (stronk7)
470ae44956 Merge branch 'wip-mdl-57851' of https://github.com/rajeshtaneja/moodle 2017-02-07 01:26:03 +01:00
Eloy Lafuente (stronk7)
7373f641e5 Merge branch 'MDL-57846-master' of git://github.com/jleyva/moodle 2017-02-07 00:12:30 +01:00
Eloy Lafuente (stronk7)
7c8ae843ed Merge branch 'wip-mdl-57853' of https://github.com/rajeshtaneja/moodle 2017-02-06 21:52:16 +01:00
Eloy Lafuente (stronk7)
f20f598ab5 Merge branch 'MDL-57841-master' of git://github.com/damyon/moodle 2017-02-06 20:18:17 +01:00
Eloy Lafuente (stronk7)
8abe17288b Merge branch 'MDL-57844-master' of git://github.com/dpalou/moodle 2017-02-06 19:53:55 +01:00
Eloy Lafuente (stronk7)
f65a48c50e Merge branch 'MDL-53349-master' of https://github.com/xow/moodle 2017-02-06 16:06:25 +01:00
Dan Poltawski
808d652e81 Merge branch 'MDL-57660-master' of git://github.com/junpataleta/moodle 2017-02-06 13:46:50 +00:00
Dan Poltawski
586543f2dc Merge branch 'MDL-57587' of git://github.com/timhunt/moodle 2017-02-06 10:59:26 +00:00
David Monllao
695f2b09ce Merge branch 'MDL-57777-m' of https://github.com/micaherne/moodle 2017-02-06 09:41:13 +01:00
Rajesh Taneja
9bb156ee75
MDL-57853 phpunit: Remove use of setExpectedException 2017-02-06 11:44:42 +08:00
Rajesh Taneja
a30e1c3192
MDL-57851 behat: Add some more wait for scenario to pass
On slow machine with phnatomjs profile
this scenario keeps failing. Add some more
wait to ensure the page is stable and next
step can be executed
2017-02-03 12:53:24 +08:00
Dani Palou
21d9f020ae MDL-57844 message: Add some message WS to the Mobile service 2017-02-02 10:03:05 +01:00
Damyon Wiese
b302369d17 MDL-57009 javascript: cibot nagging 2017-02-02 15:54:19 +08:00
Damyon Wiese
39bf2a985b MDL-57009 javascript: Dont rely on async ajax
Recursively pre-scan mustache templates to extract the list of blocks and partials. Then
we can pre-fetch them all and don't have to rely on jquery async ajax (which is deprecated).

This is part of a refactoring of the promises code in the templates module to prevent duplicate requests.
2017-02-02 15:54:19 +08:00
Damyon Wiese
f20a336b43 MDL-57009 js: Do not fetch the same template twice
Also clean up promises use of done vs then.
2017-02-02 15:54:19 +08:00
Damyon Wiese
dcdf7c6155 MDL-57009 js: Skip ajax request for same string
This is done by caching the first promise generated to fetch a string.
2017-02-02 15:54:19 +08:00
Simey Lameze
6dccde9d41 MDL-56954 theme_boost: apply bs4 styles to course management page 2017-02-02 15:52:00 +08:00
Andrew Nicols
f99313477d weekly release 3.3dev 2017-02-02 11:32:03 +08:00
Andrew Nicols
ea6eb1cc48 Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle 2017-02-02 09:18:17 +08:00
Rajesh Taneja
6fd35788c1 MDL-54628 behat: Rerun command now include replace option passed 2017-02-02 08:21:11 +08:00
Juan Leyva
d472f530ac MDL-57846 core_exporter: Allow properties description in exporters 2017-02-01 19:10:18 +01:00
Nadav Kavalerchik
e375029ea0 MDL-53349 Autocomplete: Support multi lingual COMMA keycode (44) 2017-02-01 16:00:41 +08:00
Damyon Wiese
13fb78a4f6 MDL-57841 exporter: Allow scalars as related objects 2017-02-01 15:30:56 +08:00
Ankit Agarwal
2118859218 MDL-57300 lti: Make tool provider page more readable 2017-02-01 11:40:47 +05:30
Ankit Agarwal
5e80c61df4 MDL-57027 accesslib: Improve perf of sql 2017-02-01 13:01:29 +08:00
Petr Skoda
a6210651a9 MDL-57027 fix get_users_by_capability()
Change-Id: I98dc88784dfa0293f88a19c3d36e7a46a3f52672
2017-02-01 13:01:28 +08:00
Eloy Lafuente (stronk7)
326cd6f661 Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle 2017-02-01 13:01:27 +08:00
Dan Poltawski
326efc7c66 Merge branch 'MDL-57588' of git://github.com/timhunt/moodle 2017-02-01 13:01:27 +08:00
Dan Poltawski
8cf4591a8e Merge branch 'wip-mdl-54628' of https://github.com/rajeshtaneja/moodle 2017-02-01 13:01:26 +08:00
Dan Poltawski
ac08d4556a Merge branch 'MDL-57300-master' of git://github.com/ankitagarwal/moodle 2017-02-01 13:01:26 +08:00
Dan Poltawski
7a6b7f0b75 Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle 2017-02-01 13:01:25 +08:00
Dan Poltawski
f17eb36771 Merge branch 'MDL-57728_m33v1' of https://github.com/sbourget/moodle 2017-02-01 13:01:24 +08:00
Michael Aherne
655727381d MDL-57777 rss: Return 404 when context not found. 2017-01-31 09:29:08 +00:00
Andrew Nicols
22f93579fa Merge branch 'MDL-57638_rss_skip' of git://github.com/davosmith/moodle 2017-01-31 13:21:35 +08:00
Andrew Nicols
7a2121d7f2 Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle 2017-01-31 12:19:13 +08:00
Andrew Nicols
ca12fb5458 Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle 2017-01-31 12:10:48 +08:00
Andrew Nicols
88107dc944 Merge branch 'MDL-35978-master-blockfix' of https://github.com/snake/moodle 2017-01-31 11:43:38 +08:00
Jake Dallimore
bb80768558 MDL-35978 comments: fix for comments block which has no toggler 2017-01-31 11:24:42 +08:00
Andrew Nicols
b462c655dc Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle 2017-01-31 09:00:34 +08:00