73736 Commits

Author SHA1 Message Date
Juan Leyva
3c4d2965de MDL-50171 data: Fixed incorrect text formatting in external functions 2015-06-19 09:43:51 +02:00
Dan Poltawski
f4bfbd5aa2 weekly release 3.0dev 2015-06-18 14:03:02 +01:00
Dan Poltawski
096ca66866 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-06-18 14:03:00 +01:00
Eloy Lafuente (stronk7)
c13b7bca50 Merge branch 'MDL-50004-M30' of git://github.com/lazydaisy/moodle 2015-06-18 07:25:29 +02:00
Eloy Lafuente (stronk7)
51a09cb43e Merge branch 'MDL-50107-master' of git://github.com/jleyva/moodle 2015-06-18 07:13:40 +02:00
Dan Poltawski
bceaa941c8 Merge branch 'MDL-49959_course_dnd_message' of https://github.com/barrysspace/moodle 2015-06-18 07:13:39 +02:00
Martin Mastny
25bfc7cfc0 MDL-49744 JavaScript: Glossary term window is draggable 2015-06-18 07:13:38 +02:00
Dan Poltawski
4b22fa7996 Merge branch 'MDL-42192-simpledata-unit-test' of git://github.com/dmonllao/moodle 2015-06-18 07:13:37 +02:00
Dan Poltawski
a0dffaa946 MDL-42192 accesslib: tweak get_all_capabilities
Tony thinks its bike shed painting, I think its a bit more readable
and memory efficient. I am using integrator dictatorship for sure.
2015-06-18 07:13:37 +02:00
Dan Poltawski
a6661ae013 Merge branch 'capabilities_cache' of git://github.com/tlevi/moodle 2015-06-18 07:13:35 +02:00
Andrew Nicols
40d7ef8231 Merge branch 'wip-MDL-50216-master' of git://github.com/abgreeve/moodle 2015-06-18 07:13:34 +02:00
Andrew Nicols
cd27a8608c MDL-39353 xmlrpc: Add note to upgrde.txt regarding proxybypass 2015-06-18 07:13:34 +02:00
Andrew Nicols
4265cfa557 Merge branch 'MDL-39353' of https://github.com/rtcn2/moodle 2015-06-18 07:13:33 +02:00
Andrew Nicols
670befcc0b Merge branch 'wip-MDL-49667-master' of git://github.com/marinaglancy/moodle 2015-06-18 07:13:32 +02:00
Eloy Lafuente (stronk7)
33e8095d94 Merge branch 'MDL-48283-master' of git://github.com/xow/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
2015-06-18 07:13:10 +02:00
Andrew Nicols
d04e408e38 Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle 2015-06-18 07:10:38 +02:00
Andrew Nicols
7512af87d4 Merge branch 'MDL-50380-master' of git://github.com/lameze/moodle 2015-06-18 07:10:37 +02:00
AMOS bot
f506c4b3bb Automatically generated installer lang files 2015-06-17 00:03:59 +08:00
AMOS bot
34fcf06cae Automatically generated installer lang files 2015-06-17 00:03:58 +08:00
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
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
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