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
84,455 Commits 36 Branches 519 Tags
Commit Graph

84455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Leyva
609a10739d MDL-58259 mod_forum: Check create attachment cap in forum_add_attachment 
We should add the permission check there because this function is used
indirectly by the external API that is not checking for this capability.
 2017-05-05 10:28:11 +08:00
Andrew Nicols
fbc15bb977 Merge branch 'MDL-55371-master' of git://github.com/jleyva/moodle 2017-05-05 09:57:40 +08:00
Andrew Nicols
c428f58a3a Merge branch 'MDL-58772' of git://github.com/stronk7/moodle 2017-05-05 08:26:26 +08:00
Andrew Nicols
5e7de08be5 Merge branch 'MDL-58749' of git://github.com/stronk7/moodle 2017-05-05 08:23:27 +08:00
Eloy Lafuente (stronk7)
da60573291 MDL-58772 behat: change step to 3.2 and up alternative 2017-05-05 00:14:31 +02:00
Eloy Lafuente (stronk7)
2df7f223b8 MDL-58749 lang: fix couple of scenarios to use new lang string 2017-05-04 23:46:46 +02:00
Dan Poltawski
97b93cafef Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle 2017-05-04 15:15:35 +01:00
Dan Poltawski
ad587bee83 Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle 2017-05-04 15:13:05 +01:00
Luca Bösch
e0e70bda35 MDL-58807 block_activity_results: Use multilang in block title 
The title passes format_string now.
 2017-05-04 11:30:00 +02:00
Dan Poltawski
bf39e7c7aa Merge branch 'MDL-58800-master' of git://github.com/damyon/moodle 2017-05-04 10:00:37 +01:00
Marina Glancy
47a710177a MDL-58688 calendar: retrieve event module without db queries 2017-05-04 16:53:19 +08:00
Juan Leyva
396395b8d3 MDL-55371 mod_assign: Do not return empty users in get_participant WS 
The WS was returning null users making the WS to fail.
 2017-05-04 10:09:35 +02:00
Mark Nelson
dbcc8b3153 MDL-58725 course: include selector change notes in format/upgrade.txt 2017-05-04 15:40:55 +08:00
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
Andrew Nicols
6628153eb3 Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle 2017-05-04 14:33:27 +08:00
Andrew Nicols
641af8d17c Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle 2017-05-04 14:11:23 +08:00
Simey Lameze
84d4411b01 MDL-58796 mod_quiz: add handling for fontawesome icons 2017-05-04 13:51:14 +08:00
David Monllao
03262b0469 Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle 2017-05-04 13:32:59 +08:00
Andrew Nicols
28bf0a03a7 MDL-56675 cachestore_memcached: Check all connected servers for support 2017-05-04 13:11:07 +08:00
Mark Nelson
c61b3b4a70 MDL-56251 format_weeks: added observers for updating the course end date 2017-05-04 13:08:50 +08:00
Jun Pataleta
e8d39b3926 MDL-58803 calendar: Require calendar/lib.php 2017-05-04 13:03:55 +08:00
Damyon Wiese
00879eca66 MDL-58800 repository_googledocs: Switch oauth clients 
We need to ensure we use the correct oauth client to download files. This change
is the same as the one made to the onedrive repository where a usesystem flag
is added to the file reference if the file has been copied to the system account.
 2017-05-04 12:57:23 +08:00
David Monllao
175a51c472 Merge branch 'wip-MDL-58594-v2' of https://github.com/marinaglancy/moodle 2017-05-04 12:38:04 +08:00
Cameron Ball
eeb27f03bd
MDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation 
We modified calendar_get_events in a non backwards compatible way
so instead of fixing that, an easier approch is to simply revert
it to the 3.2 implementation. This should be fine since the way
to get events is going to change in an upcomming release, and we
had to swap all occurences of calendar_get_events in core with
calendar_get_legacy_events to make sure the calendar and overview match.
 2017-05-04 12:19:35 +08:00
Andrew Nicols
2e3c23b25f Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle 2017-05-04 11:42:38 +08:00
Andrew Nicols
f8633212ee Merge branch 'MDL-58803-master' of git://github.com/junpataleta/moodle 2017-05-04 11:07:37 +08:00
Andrew Nicols
edf1ea10ca Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle 2017-05-04 11:01:39 +08:00
David Monllao
bde7f06ce8 Merge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle 2017-05-04 10:58:36 +08:00
David Monllao
5abd0f6e6f Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle 2017-05-04 10:56:29 +08:00
Andrew Nicols
680ad78cf0 Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle 2017-05-04 10:14:41 +08:00
Jake Dallimore
5529b4701a MDL-58684 portfolio: use file id instead of stored_file 2017-05-04 10:00:54 +08:00
Damyon Wiese
039ff55129 MDL-56251 format_weeks: add new 'automaticenddate' setting 2017-05-04 09:56:51 +08:00
Jun Pataleta
c9d775fc92 MDL-58803 calendar: Use fully qualified name for call to rrule_manager 2017-05-04 08:58:11 +08:00
Andrew Nicols
b1517237ad Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle 2017-05-04 08:49:48 +08:00
David Mudrák
ee9e7ee31d MDL-58749 lang: Change "inline text" to "online text" in qtype_essay 
This change has been agreed by Helen and Tim in MDL-49208.
 2017-05-03 22:07:01 +02:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
 2017-05-03 22:05:51 +02:00
Eloy Lafuente (stronk7)
c30bddcfb4 Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle 2017-05-03 19:32:45 +02:00
Eloy Lafuente (stronk7)
91edf89d86 Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle 2017-05-03 18:44:38 +02:00
Dan Poltawski
c201e4df40 Merge branch 'MDL-58772' of git://github.com/aolley/moodle 2017-05-03 16:50:29 +01:00
Dan Poltawski
9a5f5ed56b Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle 2017-05-03 14:15:11 +01:00
Dan Poltawski
a724a97f25 Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle 2017-05-03 14:01:59 +01:00
Dan Poltawski
a1646c1869 Merge branch 'MDL-50670_master' of git://github.com/markn86/moodle 2017-05-03 13:30:43 +01:00
Dan Poltawski
93c253d303 Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle 2017-05-03 13:19:19 +01:00
Dan Poltawski
be7c4e4cac Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle 2017-05-03 12:17:13 +01:00
Dan Poltawski
2e04d92718 Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle 2017-05-03 11:17:45 +01:00
David Mudrák
31bd102316 MDL-58692 auth: Improve the migration of auth setting names 
Some auth plugins used to have a mix of the legacy style of plugin names
in config_plugins table (such as 'auth/mnet') and the new correct
style (such as 'auth_mnet'). Attempting to rename the setting plugin via
low level SQL UPDATE could lead to duplicate key violation.

The patch introduces a new helper function to safely migrate the old
settings to the new ones, eventually informing the admin about the
values mismatch.
 2017-05-03 12:02:43 +02:00
Dan Poltawski
b2a57a53f8 Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle 2017-05-03 10:39:51 +01:00
Dan Poltawski
69cdead3d1 MDL-58788 docs: Note new behat compatibility page 2017-05-03 10:35:48 +01:00
Cameron Ball
26aedd4abf
MDL-58514 mod_assign: Apply consistent logic for overrides 
Previously the assign submission page was using "lenient" logic
for overrides when more than one group override applied to a user
(i.e., use the earliest "open" date and the latest "due" date)
when really it should be using the sortorder as per the assign
grading table.
 2017-05-03 16:59:22 +08:00
Jun Pataleta
4d771e8099 Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle 2017-05-03 16:41:38 +08:00