a20a0a48f0
Merge branch 'MDL-56542-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE
2016-10-31 15:14:02 +00:00
2c08b71880
Merge branch 'MDL-56136_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
2016-10-25 20:44:37 +01:00
9f809b1818
MDL-56542 lang: Merge English strings from the en_fix language pack
2016-10-25 20:26:36 +02:00
2f008b75a7
Merge branch 'MDL-55910-31' of https://github.com/LukeCarrier/moodle into MOODLE_31_STABLE
2016-10-04 12:36:54 +02:00
f0ffb7824d
MDL-56181 lang: Fix CI and CZ country short names to match ISO 3166
2016-09-29 11:52:40 +02:00
493f5d4851
MDL-56136 restore: better error handling copying file at start
2016-09-27 18:10:07 +01:00
e8924af84a
MDL-55910 events: backport MDL-45753 dashboard events
2016-09-09 10:35:22 +01:00
7e24044902
Merge branch 'MDL-55661-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE
2016-08-29 14:40:37 +08:00
59dacea6a6
MDL-55661 lang: Merge English strings from the en_fix language pack
2016-08-25 14:40:28 +02:00
5c2e284ac5
MDL-55273 admin: Change $CFG->cookiesecure default to on
2016-08-16 13:35:47 +10:00
f9bca6404e
MDL-55002 lang: Merge English strings from the en_fix language pack
2016-06-27 23:02:41 +02:00
34d728d3e9
MDL-35104 auth: Don't allow modification of username
...
Presently it is either unreliable, or not possible to change
the username of a user created with an authentication plugin.
In some cases it is even hard coded to fail. Ideally we would
sync the username, and the issue MDL-21928 exists to address
that. However, in the mean time we should not allow the
username of an external user to be modified.
2016-06-21 11:16:06 +08:00
aa6fa3a56e
Merge branch 'MDL-54769-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE
2016-06-06 23:56:51 +02:00
88ed1fab62
MDL-54769 backup: add missing error language string
2016-06-01 09:45:42 +08:00
cfb0491dad
MDL-29905 question: Try to delete unused hidden/random questions
...
Before going to display the warning about moving in use questions,
try to delete unused Random qtype questions, as well as 'hidden'
questions (these are questions that were deleted from the category),
but were in use at the time.
2016-05-30 12:26:40 +08:00
75a22eb9fb
MDL-54549 lang: Merge English strings from the en_fix language pack
2016-05-17 18:26:15 +02:00
897444d761
MDL-53923 mod_assign: Put messages into notifications.
...
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
2016-05-17 17:16:13 +08:00
0eecf87687
MDL-53923 mod_assign: Movement of functions to file_storage.
2016-05-16 14:32:54 +08:00
c4d692285f
MDL-53923 mod_assign: test unoconv path
2016-05-16 14:08:09 +08:00
8de0b1ab7d
MDL-52253 scales: Add new competence scale
2016-05-13 18:12:28 +08:00
e314b35471
MDL-53170 search: New area for my courses
...
Thanks to Skylar Kelty for the initial implementation.
2016-05-10 18:15:42 +08:00
45b9207d7e
MDL-53974 backup: Add option to backup course competencies
2016-05-06 09:27:31 +08:00
f74e3ace69
Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle
2016-05-02 10:46:50 +08:00
3cd9461e77
MDL-53877 competency: Help and better validation text for evidence URL
2016-05-02 10:01:24 +08:00
89ef883129
Merge branch 'MDL-53716-master' of git://github.com/FMCorz/moodle
2016-04-29 12:18:04 +01:00
a5061bf7b7
MDL-53980 lang: Merge English strings from the en_fix language pack
2016-04-28 18:32:03 +02:00
e9114a9ed4
MDL-53716 competency: Backup and restore course competency user data
2016-04-28 18:41:30 +08:00
f23e9b6ba4
MDL-49414 webservices: Remove deprecated functions
2016-04-27 15:54:38 +08:00
e7c979dff8
Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle
2016-04-26 11:29:51 +08:00
6ab41abd3e
Merge branch 'MDL-52781-master' of git://github.com/lameze/moodle
2016-04-21 15:54:45 +08:00
4ce0931462
MDL-52781 core_user: improve core_user::fill_properties_cache()
2016-04-21 15:24:35 +08:00
ab64fe91fc
Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle
2016-04-20 10:33:23 +01:00
eb91deaa85
Merge branch 'MDL-51603-dataformat-MDL-34925-user-download' of https://github.com/brendanheywood/moodle
2016-04-20 14:45:44 +08:00
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
12142298ec
MDL-34925 user: Convert bulk user download to dataformat
2016-04-20 13:02:06 +10:00
bdb80f6a5f
MDL-51603 tablelib: Delegate to dataformat for downloading
2016-04-20 12:39:29 +10:00
bff1edbe44
MDL-51603 dataformat: Implement streaming dataformat plugin
2016-04-20 12:39:25 +10:00
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
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
1e99f31e33
MDL-53654 competency: Provide a way to delete evidence
2016-04-18 11:06:47 +08:00
56537316f6
MDL-53719 competency: Delete content upon course and cm delete/reset
2016-04-18 11:06:01 +08:00
e6dc03d7c4
MDL-53700 competency: Migrating language strings
2016-04-18 11:06:00 +08:00
6be1373ee0
MDL-53700 competency: Migrating settings to core
2016-04-18 11:05:59 +08:00
36a43db821
MDL-53700 competency: Migrating message definitions to core
2016-04-18 11:05:58 +08:00
b90e2205b4
MDL-53700 competency: Migrate capabilities to core
2016-04-18 10:59:01 +08:00
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
Dan Poltawski