Commit graph

74527 commits

Author SHA1 Message Date
Marina Glancy
034fed3edc MDL-49667 navigation: allow items without branches in the settings menu
also remove the code that adds a "return to XXX user" link that was
supposed to be removed in MDL-23911 , otherwise the link would become
visible after the bug fix (but not functional).
2015-06-16 10:19:52 +08:00
Martin Mastny
78ee66c097 MDL-50216 JavaScript: Default visibility of M.core.info set to false 2015-06-16 09:50:36 +08:00
Dan Poltawski
28887344d6 Merge branch 'MDL-49368' of git://github.com/timhunt/moodle 2015-06-15 12:14:35 +01:00
Dan Poltawski
846dade5ab Merge branch 'MDL-49098-master' of git://github.com/xow/moodle 2015-06-15 12:12:07 +01:00
Dan Poltawski
459fccb791 Merge branch 'MDL-50219-master' of git://github.com/jleyva/moodle 2015-06-15 11:06:09 +01:00
Andrew Nicols
9cd9a27422 Merge branch 'MDL-50459-master' of git://github.com/jleyva/moodle 2015-06-15 16:02:53 +08:00
Andrew Nicols
951bd98f73 Merge branch 'wip-MDL-50222-master' of git://github.com/marinaglancy/moodle 2015-06-15 15:16:30 +08:00
Tony Levi
303936aa57 MDL-50453 core: Replace reserved word usage in progress\null (PHP7) 2015-06-15 12:21:27 +09:30
GeekSmith
82cca1ab16 MDL-50583 upgrade: Optimize upgrade_minmaxgrade
Reverse join order to use existing database keys. Changed query to use the
more easily read NOT IN.
2015-06-15 10:40:46 +08:00
Andrew Nicols
d0d93a769d Merge branch 'MDL-50438-master' of git://github.com/mastnym/moodle 2015-06-15 10:20:19 +08:00
Andrew Nicols
941420c266 Merge branch 'MDL-50509-master-vartypo' of git://github.com/mudrd8mz/moodle 2015-06-15 09:56:49 +08:00
Andrew Nicols
62c6744fc8 MDL-50554 themes: Rebuild of bootstrapbase 2015-06-15 09:48:44 +08:00
Andrew Nicols
e9ca711ecc Merge branch 'MDL-50520-master' of git://github.com/jethac/moodle 2015-06-15 09:08:48 +08:00
Mary Evans
f6218c4be8 MDL-50004 theme: Fixes frontpage coursename and enrolment icons. 2015-06-15 00:23:34 +01:00
Gareth J Barnard
3f737fc07d MDL-50554 themes: Drag a link move mouse makes icons move in Chrome. 2015-06-14 21:36:02 +01:00
Juan Leyva
0b074e88d6 MDL-50459 messages: Handle deleted users in external functions 2015-06-14 22:12:00 +02:00
Juan Leyva
32fb60e761 MDL-50219 users: Include add_user_private_files in the mobile service 2015-06-14 22:09:28 +02:00
Dan Poltawski
f1a415ea70 weekly release 3.0dev 2015-06-12 10:24:37 +01:00
Dan Poltawski
51150c54ff Merge branch 'MDL-48618_master-test-calculated' of git://github.com/dmonllao/moodle 2015-06-12 10:19:23 +01:00
Eloy Lafuente (stronk7)
6eb9e03872 MDL-50176 repository_youtube: delay loading google service stuff
Loading Google client services is a little monster, eating around
2MB (opcache enabled) of memory. As far as we instantiate the
repository instances really early, no matter they are not used
later (editor, file picker, admin...).. we are delaying the
load of the service until we know we are going to use it.

Surely applying this very same (sort of lazy load) techinque
to other repositories could lead to a nice memory reduction
in lots of pages.

MDL-50176 repository_youtube: also delay the inclusion of client.

While memory was fixed with previous commit, still some extra included
files where being reported, so go crazy and move all the stuff to
the new init delayed method.
2015-06-12 10:27:30 +02:00
David Monllao
12a4770d9b MDL-48618 grades: Testing calculated items with minmaxtouse 2015-06-12 13:19:04 +08:00
Marina Glancy
1d61d56574 MDL-50568 navigation: correct cap check 2015-06-12 10:41:36 +08:00
Frederic Massart
6bd5ca3db0 MDL-48618 grades: Do not run minmax upgrade for fresh installs 2015-06-11 17:16:34 +08:00
Dan Poltawski
e2ddd9ad04 Merge branch 'wip-mdl-49659' of https://github.com/rajeshtaneja/moodle 2015-06-11 09:56:07 +01:00
David Monllao
d8ee571298 MDL-48618 upgrade: Matching conditions and upgrade savepoints 2015-06-11 15:02:06 +08:00
David Monllao
408e3812af MDL-48618 grades: Forcing new upgrade savepoint 2015-06-11 14:37:31 +08:00
David Monllao
e87acc8386 Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle 2015-06-11 14:20:56 +08:00
Rajesh Taneja
352a70e25d MDL-49659 theme_clean: Add login info in the nav bar 2015-06-11 10:21:35 +08:00
Eloy Lafuente (stronk7)
b2521cfa45 Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle 2015-06-11 00:32:11 +02:00
Eloy Lafuente (stronk7)
05df4bc5f9 MDL-50452 behat: 2nd level dep. Update twig/twig to v1.18.2 2015-06-10 13:34:58 +02:00
Juan Leyva
d421a41979 MDL-50107 webservices: Enable CORS in login/token.php 2015-06-10 11:33:53 +02:00
Rod Norfor
0f382fe2e7 MDL-39353 xmlrpc: Add proxy support 2015-06-10 08:17:36 +01:00
Frederic Massart
056aeae8d4 MDL-48618 grades: Test for the minmax upgrade step 2015-06-10 12:33:42 +08:00
Frederic Massart
597fc6db1a MDL-48618 grades: Behat tests to cover min/max grade changes
The values provided as part of this test are similar to values
that can be found in 2.7. This is to ensure that users will not
experience changes in grades.
2015-06-10 12:33:42 +08:00
Frederic Massart
2eb4a83c29 MDL-48618 grades: Unit tests for grade_grade::get_min/max_grade() 2015-06-10 12:33:41 +08:00
Frederic Massart
ebea19cb26 MDL-48618 grades: Handling of inconsistencies due to min/max grades 2015-06-10 12:33:41 +08:00
Eloy Lafuente (stronk7)
22214c22d1 Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle 2015-06-10 01:39:17 +02:00
Eloy Lafuente (stronk7)
28ddf1e94d Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle 2015-06-10 00:32:10 +02:00
Eloy Lafuente (stronk7)
75704fe6b8 Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle 2015-06-10 00:23:20 +02:00
Eloy Lafuente (stronk7)
db91aae8f4 Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle 2015-06-09 20:40:56 +02:00
Eloy Lafuente (stronk7)
7d91e86452 Merge branch 'm30_MDL-50415_Add_PHP_Variables_In_PHPInfo_Admin_Page' of https://github.com/scara/moodle 2015-06-09 20:35:02 +02:00
Eloy Lafuente (stronk7)
094356a954 Merge branch 'wip-mdl-50179' of https://github.com/rajeshtaneja/moodle 2015-06-09 20:32:10 +02:00
Eloy Lafuente (stronk7)
b3b6dc9d66 Merge branch 'MDL-50176' of git://github.com/aolley/moodle 2015-06-09 20:28:36 +02:00
Dan Poltawski
cc9806146d Merge branch 'MDL-43731' of https://github.com/ramdesh/moodle 2015-06-09 14:56:52 +01:00
Dan Poltawski
f68cf0a2b7 Merge branch 'MDL-49659_master' of git://github.com/lazydaisy/moodle 2015-06-09 14:42:12 +01:00
Dan Poltawski
6362f68ebe Merge branch 'MDL-49885_course_overview_block2' of https://github.com/andyjdavis/moodle 2015-06-09 13:57:10 +01:00
Dan Poltawski
39e8ff6226 Merge branch 'MDL-50186-master' of git://github.com/mastnym/moodle 2015-06-09 13:28:16 +01:00
Barry Oosthuizen
a3657f8b42 MDL-49959 course: Fix hidden drag and drop message 2015-06-09 09:37:53 +01:00
Mark Nelson
1254e48f26 MDL-50145 mod_lesson: added behat test for multiple dashboard lessons 2015-06-09 00:49:04 -07:00
Jetha Chan
e37d53dac1 MDL-50520 templates: fix helpers not firing inside pix helper 2015-06-09 15:23:04 +08:00