Commit Graph

838 Commits

Author SHA1 Message Date
Mark Nelson
1d8886fa31 MDL-52035 auth_lti: added auth plugin 2016-04-26 15:58:08 +08:00
David Monllao
e7c979dff8 Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle 2016-04-26 11:29:51 +08:00
Simey Lameze
aa788b3c42 MDL-52781 core_user: fix wrong lang check 2016-04-22 13:07:22 +08:00
David Mudrák
62ea3c439e MDL-53899 admin: Fix permissions of extracted plugin files 2016-04-21 14:37:00 +02:00
Brendan Heywood
5b95105600 MDL-51603 dataformat: Fixed worksheet title bug 2016-04-21 16:20:36 +08:00
Andrew Nicols
6ab41abd3e Merge branch 'MDL-52781-master' of git://github.com/lameze/moodle 2016-04-21 15:54:45 +08:00
Simey Lameze
4ce0931462 MDL-52781 core_user: improve core_user::fill_properties_cache() 2016-04-21 15:24:35 +08:00
David Monllao
15a813cda2 Merge branch 'MDL-53599' of git://github.com/nhoobin/moodle 2016-04-20 16:38:57 +08:00
David Monllao
ba44323329 MDL-51603 dataformat: Removing subsystem from the list 2016-04-20 14:41:28 +08:00
David Monllao
a5acf308ae Merge branch 'MDL-51603-dataformat' of https://github.com/brendanheywood/moodle
Conflicts:
	lib/tests/component_test.php
2016-04-20 12:37:05 +08:00
Brendan Heywood
bff1edbe44 MDL-51603 dataformat: Implement streaming dataformat plugin 2016-04-20 12:39:25 +10:00
David Monllao
9a1414c4d8 Merge branch 'MDL-49279-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/classes/plugin_manager.php
2016-04-19 16:55:01 +08:00
Juan Leyva
b2478ed0f6 MDL-49279 mobile: Support export of mobile addons in plugins 2016-04-19 10:32:53 +02:00
Frederic Massart
746da8ba60 MDL-53632 competency: Consistently use the terms frameworks, plans, ...
- Templates: 'Learning plan templates'
- Plans: 'Learning plans'
- Frameworks: 'Competency frameworks'

When the context, or sentence, is already stating that we are talking
about 'learning plans' or 'competencies', it may sound redundant to
repeat those terms, therefore we can simply refer to 'Templates',
'Plans', and 'Frameworks'.
2016-04-18 16:51:39 +08:00
Nicholas Hoobin
c5211882f7 MDL-53599 session: Added a session_class_handler for Redis.
It is now possible to set up Redis as a session handler for Moodle.
Ensure that the phpredis extension is enabled and working on your sever.

Please place the following lines in config.php
$CFG->session_handler_class = '\core\session\redis';
$CFG->session_redis_save_path = 'tcp://127.0.0.1';

To determine if it has been set correctly, navigate to
$CFG->wwwroot/admin/phpinfo.php and find following the strings in the
session block,

session.save_handler = redis
session.save_path = tcp://127.0.0.1
2016-04-18 16:28:45 +10:00
Frederic Massart
899f46d6de MDL-53700 competency: Use URL resolver in events 2016-04-18 11:06:00 +08:00
Frederic Massart
d8370908b5 MDL-53700 competency: Update standard plugins list 2016-04-18 11:06:00 +08:00
Frederic Massart
e6dc03d7c4 MDL-53700 competency: Migrating language strings 2016-04-18 11:06:00 +08:00
Frederic Massart
4aa6acb22a MDL-53700 competency: Migrating comment related APIs to core 2016-04-18 11:05:59 +08:00
Frederic Massart
5a1a685c28 MDL-53700 competency: Migrating events to core
Leaving comments behind for now as it's a tricky one.
2016-04-18 11:05:59 +08:00
Frederic Massart
767f66c028 MDL-53700 competency: Migrating the competency API to core 2016-04-18 11:05:59 +08:00
Frederic Massart
67bc0eaf38 MDL-53700 competency: Migrate main classes to core 2016-04-18 11:05:59 +08:00
Frederic Massart
42a7899f0d MDL-53700 competency: Migrate tasks to core 2016-04-18 11:05:58 +08:00
David Monllao
468ef66775 Merge branch 'MDL-52385-master' of git://github.com/andrewnicols/moodle 2016-04-11 13:54:23 +08:00
Daniel Neis Araujo
dfb9daeae2 MDL-52385 tasks: Queue ad-hoc tasks in future 2016-04-07 11:49:52 +08:00
Dan Poltawski
88e8e6006f Merge branch 'MDL-53633-master' of git://github.com/andrewnicols/moodle 2016-04-05 09:40:41 +01:00
Andrew Nicols
9c048e21ac MDL-53633 javascript: Ensure that ordering of options is preserved 2016-03-29 15:47:00 +08:00
Dan Poltawski
f7074f5db4 Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle 2016-03-29 10:37:25 +08:00
Vadim Dvorovenko
dd399f51ab MDL-45835 group: events for groupings assign/unassign 2016-03-24 10:59:35 +08:00
David Monllao
b5335149f4 Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle 2016-03-23 09:17:11 +08:00
David Monllao
c111ef9718 Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle 2016-03-21 09:41:09 +08:00
Marina Glancy
352bfbf55c MDL-53254 tags: tag collections inplace editable 2016-03-18 08:07:19 +08:00
Mark Nelson
393038961e MDL-48012 core: added recyclebin to list of standard tools 2016-03-15 16:58:47 +08:00
Eric Merrill
208a79c920 MDL-53430 dml: Fix recordset_walk for additional parameters 2016-03-10 16:32:02 -05:00
Simey Lameze
dccf9ca308 MDL-50705 core_user: introduce new fill_properties_cache()
Also the get_property_definition() was created to get the property without retrieve the whole definition cache and
    unit tests were created to tests those new methods.
2016-03-10 13:17:08 +01:00
Andrew Nicols
02726a29cc Merge branch 'MDL-53273-master' of git://github.com/merrill-oakland/moodle 2016-03-09 14:11:17 +08:00
Eric Merrill
bf2235bb11 MDL-53325 search: Optimize Solr less often 2016-03-06 13:46:54 -05:00
Eric Merrill
08c21a1beb MDL-53273 search: Use unicode safe string truncation 2016-03-06 13:32:59 -05:00
Eloy Lafuente (stronk7)
5aac4a23e5 Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle 2016-03-02 16:36:03 +01:00
Dan Poltawski
852f32f7b3 Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle 2016-03-02 15:49:45 +08:00
Marina Glancy
d2de503c80 MDL-50887 antivirus: clamav is standard plugin, missing strings 2016-03-02 15:42:35 +08:00
Andrew Nicols
2f244f1cc6 MDL-30811 core: Initiate notifications on first use only 2016-03-02 13:30:09 +08:00
Eloy Lafuente (stronk7)
ce878562f3 Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle 2016-03-02 05:25:57 +01:00
Andrew Nicols
0b4bff8ca9 MDL-52136 core: Add support for quoting variables in mustache helpers
This is required for when helpers include json-encoded variables as arguments.
As an example, imagine a template with content:

{{# str }} somekey, someidentifier, { "fullname": "{{ fullname }}" } {{/ str }}

If the fullname variable were to include the double-quote character (e.g.
John "Trevor" Doe) because of the way in which mustache renders content, it
would become:

{{# str }} somekey, someidentifier, { "fullname": "John "Trevor" Doe" } {{/ str }}

This results in an invalid JSON structure.

To work around this issue, the quote characters in the passed variable
must be escaped:

{{# str }} somekey, someidentifier, { "fullname": "John \"Trevor\" Doe" } {{/ str }}

Unfortunately, Mustache provides no way of doing so natively.

With this function, we can quote the text as appropriate:

{{# str }} somekey, someidentifier, { "fullname": {{# quote }}{{ fullname }}{{/ quote }} } {{/ str }}

This also handles the case where the quoted content includes the Mustache
delimeter ({{ or }}).

For example:
fullname = 'John "}}Trevor{{" Doe'

Ordinarily this would be rendered as:
{{# str }} somekey, someidentifier, { "fullname": "John "}}Trevor{{" Doe" } {{/ str }}

This rendering is both a JSON error, and also a mustache syntax error because of the mustache delimeters.

The quote helper also escapes these by wrapping them in change delimeter
tags:

{{# str }} somekey, someidentifier, { "fullname": "John "{{=<% %>=}}}}<%={{ }}=%>Trevor{{=<% %>=}}{{{{=<% %>=}}" Doe" } {{/ str }}
2016-03-02 08:48:46 +08:00
Dan Poltawski
2158e87492 Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle 2016-03-01 14:49:33 +08:00
Eloy Lafuente (stronk7)
d9dfc410ad Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle 2016-03-01 01:59:31 +01:00
Ruslan Kabalin
17d7ee0eea MDL-50887 antivirus: Add config getter to base class.
Improving architecture to make it testable.
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
11362ae3ff MDL-50887 antivirus: Use namespace referenced classes. 2016-02-29 09:31:09 +00:00
Andrew Nicols
0346323cec MDL-30811 output: Add support for session notifications 2016-02-29 09:05:56 +08:00
Andrew Nicols
243468030a MDL-30811 output: Tidy up notifications 2016-02-28 19:16:34 +08:00