mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
82,876 Commits 36 Branches 527 Tags
Commit Graph

82876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
69723d002b Merge branch 'MDL-57752_tracksessionip' of git://github.com/davosmith/moodle 2017-02-13 13:53:10 +00:00
Dan Poltawski
f5af2e6866 Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle 2017-02-13 13:41:13 +00:00
Dan Poltawski
b747a90082 Merge branch 'MDL-57768-webservice-config-error' of https://github.com/ilya-catalyst/moodle 2017-02-13 13:28:37 +00:00
David Monllao
43e890aabe Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle 2017-02-13 13:19:39 +01:00
David Monllao
815ce88f44 Merge branch 'MDL-57766-master' of git://github.com/damyon/moodle 2017-02-13 10:12:14 +01:00
Davo Smith
a2f1c5c39a MDL-57752 session: fix check_security() session termination 2017-02-13 07:54:02 +00:00
Marina Glancy
a572272768 MDL-50770 blocks: remove orphaned block positions 2017-02-13 15:18:51 +08:00
Marina Glancy
34c9d28e62 MDL-50770 blocks: copy sitewide blocks positions when cloning dashboards 2017-02-13 15:17:09 +08:00
Ilya Tregubov
1138af352a MDL-57768 webservice: Delete manual setting of config in test 2017-02-10 11:49:09 +11:00
Damyon Wiese
230ae095b4 MDL-57766 mod_assign: Marker allocation fixes 
Marking allocation was only ever applied in the view for the grading table. It should
have been added to the list_participants function because that is used by webservices and
the new grading UI.
 2017-02-09 17:06:21 +08:00
David Monllao
7a3b115d37 weekly release 3.3dev 2017-02-09 08:00:01 +01:00
David Monllao
0c991a2e06 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-02-09 08:00:00 +01:00
Ryan Wyllie
e12d9f494c MDL-57370 message: add unread count to conversation tests 2017-02-09 03:39:14 +00:00
Ryan Wyllie
c9b82e402e MDL-57370 message: improve message union sql 2017-02-09 03:39:09 +00:00
David Monllao
375b9ce0e7 Merge branch 'wip-MDL-57316-master' of git://github.com/marinaglancy/moodle 2017-02-08 13:11:28 +01:00
Dan Poltawski
3f037586ae MDL-57697 survery: migrate validation script from yui2 
Just a modernisation of the existing yui2 code to AMD/jQuery and away from alert();
 2017-02-08 11:22:11 +00:00
Dan Poltawski
a06677a3b5 Merge branch 'MDL-57370-master-int-fix-1' of git://github.com/ryanwyllie/moodle 2017-02-08 09:14:07 +00:00
Ryan Wyllie
42e2f6c0e9 MDL-57370 message: fix duplicate ids 2017-02-08 07:40:07 +00:00
Marina Glancy
63c102e095 MDL-57316 media: create different instances for different pages 2017-02-08 10:17:43 +08: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
AMOS bot
0c66451c51 Automatically generated installer lang files 2017-02-08 00:08:49 +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
John Okely
1abd43763c MDL-57316 media: Setup media plugins in media_manager::instance() 2017-02-07 09:16:01 +08:00
John Okely
c2e00335e1 MDL-57316 videojs: Add behat tests for lesson, url and resource 2017-02-07 09:16:01 +08: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
AMOS bot
199994d398 Automatically generated installer lang files 2017-02-07 00:05:17 +08: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
AMOS bot
17699abe5a Automatically generated installer lang files 2017-02-03 00:03:53 +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