19321 Commits

Author SHA1 Message Date
Jake Dallimore
e84fefdb09 Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle 2017-05-11 11:41:48 +08:00
Dan Poltawski
e838654b4e Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-10 12:01:08 +01:00
Helen Foster
0d86195e8d MDL-58877 lang: Merge English strings from the en_fix language pack
Significant string changes:

* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
  error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
  in core_backup - switch fix
2017-05-10 12:24:36 +02:00
David Monllao
a5ea94d85f Merge branch 'MDL-58843-master-exchandler' of git://github.com/mudrd8mz/moodle 2017-05-10 14:05:51 +08:00
Cameron Ball
9eb5a0417c
MDL-58777 mod_assign: Remove unnecessary upgrade step
This upgrade step was setting the priority field for assign events
in the events table. This is redundant since we queue a task to
refresh all events.

This patch also removes a redundant refresh_events task that is
queued from assign.
2017-05-10 13:41:18 +08:00
Cameron Ball
56d1ddd775
MDL-58777 mod_assign: Explicitly sort records and set event priority
The assign update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
2017-05-10 13:41:18 +08:00
Cameron Ball
8dada7e334
MDL-58777 mod_lesson: Explicitly sort records and set event priority
The lesson update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
2017-05-10 13:41:18 +08:00
Cameron Ball
4133df6fd6
MDL-58777 mod_quiz: Explicitly sort records and set event priority
The quiz update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
2017-05-10 13:41:18 +08:00
Andrew Nicols
865e2bc7dc Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle 2017-05-10 11:48:40 +08:00
Jun Pataleta
834da9a30f Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle 2017-05-09 17:05:39 +08:00
Dan Poltawski
cd501e12c6 Merge branch 'MDL-58853' of git://github.com/stronk7/moodle 2017-05-09 09:17:47 +01:00
Juan Leyva
b50ff71052 MDL-58860 mod_lesson: Fix get_attempts_overview for no attempts
WS get_attempts_overview was failing when there weren’t attempts in the
given assignment.
2017-05-09 10:03:39 +02:00
David Mudrák
8a9785a036 MDL-58843 core: Do not expect a particular class of the thrown exception
Since PHP 7, the custom exception handlers are also called to handle
thrown Errors which are not Exceptions.
2017-05-09 08:41:41 +02:00
Andrew Nicols
381db2fe8d Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle 2017-05-09 13:55:20 +08:00
Ryan Wyllie
9e452e35d0 MDL-58822 backup: backup and restore user override events 2017-05-09 05:48:40 +00:00
Jun Pataleta
b5c24c99a0 MDL-58780 mod_assign: Remove AS keyword in table alias
* The AS keyword is not recognised by Oracle for table aliases.
This is okay with other databases, but optional, so better to
remove it.
2017-05-09 11:58:00 +08:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release
version = 2017051500 release version
requires= 2017050500 current rc1 version
2017-05-09 02:58:28 +02:00
Marina Glancy
7b14c50bb0 MDL-58784 mod_glossary: student can see his entries before approval 2017-05-08 11:35:29 +08:00
Jake Dallimore
42a123b1b7 Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle 2017-05-05 12:01:06 +08:00
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
Eloy Lafuente (stronk7)
da60573291 MDL-58772 behat: change step to 3.2 and up alternative 2017-05-05 00:14:31 +02: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
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
Simey Lameze
84d4411b01 MDL-58796 mod_quiz: add handling for fontawesome icons 2017-05-04 13:51:14 +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
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
Andrew Nicols
b1517237ad Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle 2017-05-04 08:49:48 +08: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
Dan Poltawski
c201e4df40 Merge branch 'MDL-58772' of git://github.com/aolley/moodle 2017-05-03 16:50:29 +01:00
Dan Poltawski
a724a97f25 Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle 2017-05-03 14:01:59 +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
Andrew Hancox
dca8394630 MDL-58172 mod_choice: Make export choice respect id fields 2017-05-03 10:49:01 +08:00
Juan Leyva
91357e7c36 MDL-58434 mod_lesson: Display invalid responses in detailed report
In the detailed statistics view for one user attempt, the user response
for numerical question types was not being displayed.
This was only happening for incorrect responses.
2017-05-02 19:56:47 +02:00
Adam Olley
0fb1335924 MDL-58772 mod_feedback: Dont overwrite anonymous entries
The feedback module lets you alternate between responses being anonymised and
not anonymised. When the module is in anonymous mode, its possible for a single
user to make multiple responses.

However when the activity is switched to non-anon mode, if a user leaves a
follow up feedback, one of their previously anonymous responses is used, so
their new response stays anonymous and their old anon response is lost.

This change lets them leave a new non-anonymised feedback entry and retains all
previous anonymous responses instead of incorrectly reusing one of their anon
ones at random.
2017-05-02 12:49:33 +09:30
Andrew Nicols
db2c66e700 Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle 2017-05-02 09:00:07 +08:00
Marina Glancy
bb9d5f7f1b MDL-55468 mod_feedback: revive export analysis to excel 2017-05-01 14:28:55 +01:00
Marina Glancy
50d845e3ed MDL-58665 dashboard: use bigger course object for completion
class completion_info will make an extra DB query to retrieve the course if course->enablecompletion is not present
2017-05-01 16:59:07 +08:00
Marina Glancy
cd477f8c3e MDL-58665 mod_scorm: cache times in modinfo for performance 2017-05-01 16:59:04 +08:00
Ankit Agarwal
bb40a28d9b MDL-58497 forum: Show correct itemcount on action events 2017-05-01 13:48:30 +05:30
Damyon Wiese
c593a0b001 MDL-58535 assign: Always pass file serving options.
This allows the mobile app to pass offline=1 in urls to files to force export/download of the source file
for controlled links.
2017-05-01 16:15:35 +08:00
Jun Pataleta
e85579693b Merge branch 'MDL-58632-master' of https://github.com/xow/moodle 2017-05-01 14:26:37 +08:00
Marina Glancy
e1577187ed MDL-58665 mod_data: cache times in modinfo for performance 2017-05-01 12:57:22 +08:00
Marina Glancy
19228840b8 MDL-58665 mod_choice: cache choice time in modinfo for performance 2017-05-01 12:57:22 +08:00
Marina Glancy
aa708b550e MDL-58665 mod_feedback: avoid extra db queries on dashboard 2017-05-01 12:57:19 +08:00
Andrew Nicols
847d88bb4c MDL-58573 mod_assign: Whitespace fix 2017-04-28 11:58:14 +08:00
Andrew Nicols
8374422402 Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle 2017-04-28 11:46:02 +08:00
Andrew Nicols
e6c0e75ed8 Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle 2017-04-28 10:29:50 +08:00