101303034f
Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle
2016-04-13 09:51:35 +08:00
9ca0420e93
MDL-45064 course: mod callback get_shortcuts()
...
also deprecate callback get_types()
2016-04-13 08:30:04 +08:00
11c673f3a3
Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle
2016-04-12 21:34:41 +02:00
212153767a
Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle
2016-04-12 14:34:11 +08:00
4a39dd3071
Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle
2016-04-11 16:34:26 +01:00
5702a8289b
Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle
2016-04-11 09:52:40 +01:00
4218ad9371
MDL-53363 tags: helper to search for tagged items; search course modules
2016-04-11 13:22:47 +08:00
1e34257ec2
MDL-16855 tags: allow to filter tags on management page
2016-04-11 10:04:17 +08:00
0d2027896d
MDL-52707 core_tag: allow to combine tags
2016-04-11 09:49:56 +08:00
427e3cbcd6
MDL-53167 search: Add ability to limit courses searched
2016-04-07 14:41:59 -04:00
f164cab739
Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle
2016-04-05 14:27:25 +01:00
c56e8bc6ff
Merge branch 'MDL-53577_master' of https://github.com/jinhofer/moodle
2016-04-05 09:38:00 +01:00
a2fb838e82
MDL-53577 repository: Added maxbytes error message
...
Changing the error message that is displayed to users when they
upload a file that is greater than the maximum upload size. Does not
include all upload cases; focuses on those most used by students.
2016-04-04 15:33:40 -05:00
9470e4d1ed
MDL-53272 search: Remove search results cache
2016-04-04 15:38:03 +08:00
221bfffd4e
MDL-53104 core_blog: remove deprecated capabilities
...
This commit removes moodle/blog:associatecourse and moodle/blog:associatemodule deprecated capabilities.
2016-04-01 08:42:09 +08:00
1356d85151
MDL-52954 core: Change from pandoc to unoconv - it gives better results
...
Most importantly it retains formatting better, and supports different charsets far better than pandoc.
2016-03-30 11:48:39 +08:00
2e76c14e11
MDL-52954 core: Add a document converter to file_storage
...
This lets us convert between common office formats. E.g. docx -> pdf
html -> pdf, html -> ods.
This commit also updates assignment editpdf plugin to use this converter
on all compatible submission files.
2016-03-30 11:48:39 +08:00
868e5ef0d5
Merge branch 'MDL-53515-master' of git://github.com/merrill-oakland/moodle
2016-03-29 14:39:53 +08:00
f7074f5db4
Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle
2016-03-29 10:37:25 +08:00
ca0d7bf21c
Merge branch 'MDL-53508-master' of git://github.com/merrill-oakland/moodle
2016-03-26 10:26:02 +08:00
091973dbd7
MDL-53515 search: Extend search API to allow file indexing
2016-03-24 15:44:27 -04:00
dd399f51ab
MDL-45835 group: events for groupings assign/unassign
2016-03-24 10:59:35 +08:00
4894840dc6
MDL-53508 search: Improve highlighting and move to text fields
2016-03-23 08:55:48 -04:00
b5335149f4
Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle
2016-03-23 09:17:11 +08:00
5aaa2b3750
Merge branch 'MDL-52158-master' of https://github.com/xow/moodle
2016-03-22 10:32:34 +08:00
efdbc2929d
MDL-52158 auth: Improve recaptcha settings and help
2016-03-21 10:21:18 +08:00
2904f66421
Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle
2016-03-21 10:04:29 +08:00
352bfbf55c
MDL-53254 tags: tag collections inplace editable
2016-03-18 08:07:19 +08:00
131b78b9a7
MDL-53254 tags: tag areas inplace editable
2016-03-18 08:07:19 +08:00
ef474575e1
Merge branch 'MDL-51374-master-new' of git://github.com/lameze/moodle
...
Conflicts:
lib/db/caches.php
2016-03-16 10:13:14 +08:00
5162ffec0d
Merge branch 'wip-MDL-52869-master' of https://github.com/marinaglancy/moodle
2016-03-16 10:05:52 +08:00
4235b98110
Merge branch 'wip-MDL-53026-master' of https://github.com/marinaglancy/moodle
2016-03-16 10:00:28 +08:00
baa536188b
Merge branch 'MDL-52386-master' of git://github.com/cameron1729/moodle
2016-03-16 07:50:10 +08:00
f59f89b4a8
MDL-52869 course: use inplace_editable for activity names
2016-03-15 17:19:38 +08:00
26e7eceefc
MDL-51374 cache: add temp_tables cache definition
...
Also a helper method get_temp_tables_cache() has been created for temporary tables cache operations.
2016-03-15 10:57:43 +08:00
28774c9263
MDL-48838 grades: New grade_categories cache
2016-03-14 11:20:35 +08:00
6141dcfe67
MDL-52386 auth_ldap: Add support for disabled accounts
2016-03-11 16:48:18 +08:00
48983fb9e7
MDL-53026 cohorts: edit names and idnumbers in place
2016-03-11 08:14:49 +08:00
b8bc9037f1
Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle
2016-03-09 15:35:16 +08:00
dffcf46f43
MDL-52252 Tags: Add tags to modules (Resources and Activities)
2016-03-09 14:19:47 +08:00
bd2e5ef17d
Merge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle
2016-03-09 10:06:47 +08:00
65e7fee267
Merge branch 'MDL-53327-master' of git://github.com/danpoltawski/moodle
2016-03-09 08:48:44 +08:00
fa8e27b32b
MDL-52522 grades: Add rescale grades option for grade categories.
...
When a grade category is overridden, it starts to behave like a regular grade item.
Therefore we need similar behaviour to what was implemented in MDL-48634.
2016-03-08 16:26:44 +08:00
5b7c500a71
MDL-49963 core: Select all button on participant list works across pages
2016-03-07 11:08:12 +00:00
bf2235bb11
MDL-53325 search: Optimize Solr less often
2016-03-06 13:46:54 -05:00
0296f08e71
MDL-53327 search: add missing pluginfo lang strings
...
AMOS BEGIN
CPY [searchengine,admin],[type_search,plugin]
AMOS END
2016-03-03 17:04:24 +08:00
852f32f7b3
Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle
2016-03-02 15:49:45 +08:00
d2de503c80
MDL-50887 antivirus: clamav is standard plugin, missing strings
2016-03-02 15:42:35 +08:00
25a73245c0
Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle
2016-03-01 21:23:16 +01:00
2158e87492
Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle
2016-03-01 14:49:33 +08:00
David Monllao