mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
78,342 Commits 36 Branches 519 Tags
Commit Graph

12565 Commits

Author SHA1 Message Date
Frederic Massart
e9114a9ed4 MDL-53716 competency: Backup and restore course competency user data 2016-04-28 18:41:30 +08:00
David Monllao
e7c979dff8 Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle 2016-04-26 11:29:51 +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
Dan Poltawski
ab64fe91fc Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle 2016-04-20 10:33:23 +01:00
Andrew Nicols
eb91deaa85 Merge branch 'MDL-51603-dataformat-MDL-34925-user-download' of https://github.com/brendanheywood/moodle 2016-04-20 14:45:44 +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
12142298ec MDL-34925 user: Convert bulk user download to dataformat 2016-04-20 13:02:06 +10:00
Brendan Heywood
bdb80f6a5f MDL-51603 tablelib: Delegate to dataformat for downloading 2016-04-20 12:39:29 +10:00
Brendan Heywood
bff1edbe44 MDL-51603 dataformat: Implement streaming dataformat plugin 2016-04-20 12:39:25 +10:00
Clement Smith
98d53af7b6 MDL-51354 report/log: Add context sensitive help 
Adds context sensitive help to the Reports > Logs page (both admin
and course level) to help users understand how the filters will
affect their search.
 2016-04-18 12:37:29 -05: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
Frederic Massart
1e99f31e33 MDL-53654 competency: Provide a way to delete evidence 2016-04-18 11:06:47 +08:00
Frederic Massart
56537316f6 MDL-53719 competency: Delete content upon course and cm delete/reset 2016-04-18 11:06:01 +08:00
Frederic Massart
e6dc03d7c4 MDL-53700 competency: Migrating language strings 2016-04-18 11:06:00 +08:00
Frederic Massart
6be1373ee0 MDL-53700 competency: Migrating settings to core 2016-04-18 11:05:59 +08:00
Frederic Massart
36a43db821 MDL-53700 competency: Migrating message definitions to core 2016-04-18 11:05:58 +08:00
Frederic Massart
b90e2205b4 MDL-53700 competency: Migrate capabilities to core 2016-04-18 10:59:01 +08:00
David Monllao
101303034f Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:51:35 +08:00
Marina Glancy
9ca0420e93 MDL-45064 course: mod callback get_shortcuts() 
also deprecate callback get_types()
 2016-04-13 08:30:04 +08:00
Eloy Lafuente (stronk7)
11c673f3a3 Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle 2016-04-12 21:34:41 +02:00
David Monllao
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08:00
Dan Poltawski
4a39dd3071 Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle 2016-04-11 16:34:26 +01:00
Dan Poltawski
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
Marina Glancy
4218ad9371 MDL-53363 tags: helper to search for tagged items; search course modules 2016-04-11 13:22:47 +08:00
Marina Glancy
1e34257ec2 MDL-16855 tags: allow to filter tags on management page 2016-04-11 10:04:17 +08:00
Marina Glancy
0d2027896d MDL-52707 core_tag: allow to combine tags 2016-04-11 09:49:56 +08:00
Eric Merrill
427e3cbcd6 MDL-53167 search: Add ability to limit courses searched 2016-04-07 14:41:59 -04:00
Dan Poltawski
f164cab739 Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle 2016-04-05 14:27:25 +01:00
Dan Poltawski
c56e8bc6ff Merge branch 'MDL-53577_master' of https://github.com/jinhofer/moodle 2016-04-05 09:38:00 +01:00
Ben Tindell
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
David Monllao
9470e4d1ed MDL-53272 search: Remove search results cache 2016-04-04 15:38:03 +08:00
Simey Lameze
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
Damyon Wiese
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
Damyon Wiese
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
Dan Poltawski
868e5ef0d5 Merge branch 'MDL-53515-master' of git://github.com/merrill-oakland/moodle 2016-03-29 14:39:53 +08:00
Dan Poltawski
f7074f5db4 Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle 2016-03-29 10:37:25 +08:00
Dan Poltawski
ca0d7bf21c Merge branch 'MDL-53508-master' of git://github.com/merrill-oakland/moodle 2016-03-26 10:26:02 +08:00
Eric Merrill
091973dbd7 MDL-53515 search: Extend search API to allow file indexing 2016-03-24 15:44:27 -04:00
Vadim Dvorovenko
dd399f51ab MDL-45835 group: events for groupings assign/unassign 2016-03-24 10:59:35 +08:00
Eric Merrill
4894840dc6 MDL-53508 search: Improve highlighting and move to text fields 2016-03-23 08:55:48 -04:00
David Monllao
b5335149f4 Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle 2016-03-23 09:17:11 +08:00
Dan Poltawski
5aaa2b3750 Merge branch 'MDL-52158-master' of https://github.com/xow/moodle 2016-03-22 10:32:34 +08:00
Jay Jayswal
efdbc2929d MDL-52158 auth: Improve recaptcha settings and help 2016-03-21 10:21:18 +08:00
David Monllao
2904f66421 Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle 2016-03-21 10:04:29 +08:00
Marina Glancy
352bfbf55c MDL-53254 tags: tag collections inplace editable 2016-03-18 08:07:19 +08:00
Marina Glancy
131b78b9a7 MDL-53254 tags: tag areas inplace editable 2016-03-18 08:07:19 +08:00
David Monllao
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
David Monllao
5162ffec0d Merge branch 'wip-MDL-52869-master' of https://github.com/marinaglancy/moodle 2016-03-16 10:05:52 +08:00
David Monllao
4235b98110 Merge branch 'wip-MDL-53026-master' of https://github.com/marinaglancy/moodle 2016-03-16 10:00:28 +08:00