Commit Graph

20348 Commits

Author SHA1 Message Date
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
Stephen Vickers 1768b85f09 MDL-58770 mod_lti: Strip HTML from parameters
Remove HTML tags from parameters which should be plain text.
2017-05-01 21:15:37 +01: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
Cameron Ball ec4b1e6183 MDL-58496 mod_chat: Update timesort when updating timestart
Previously when a repeating chat was updating the calendar
it would only update the timestart column. It needs to also
update the timesort column to display correctly on the new
overview.
2017-04-28 12:06:25 +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
Jun Pataleta a43e85d5e4 MDL-58573 mod_assign: Upgrade code for default gradingduedate
* Set default grading due date one week from the due date if:
  - there is no grading due date set; and
  - the assignment's due date is not older than 3 weeks from the
    current date.
2017-04-28 10:28:35 +08:00
Marina Glancy 438c01d0dd MDL-58731 modules: display intro on the course page
something that was forgotten when adding _get_coursemodule_info to activities in MDL-58190
2017-04-28 09:14:25 +08:00
Eloy Lafuente (stronk7) 7a21720039 Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle 2017-04-27 09:55:45 +02:00
David Monllao af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00
Cameron Ball 30aa540fe7 MDL-58578 mod_assign: Correctly update user override priority
Since we now sort priority in ASC order, the top priority should be 0.
2017-04-27 15:15:12 +08:00
Cameron Ball 7eae70e167 MDL-58578 mod_quiz: Correctly provide group override priorities
Previously the override priorities were being provided
back to front.
2017-04-27 15:15:12 +08:00
Cameron Ball 756a132ff6 MDL-58578 mod_lesson: Correctly provide group override priorities
Previously the override priorities were being provided
back to front.
2017-04-27 15:15:12 +08:00
Ryan Wyllie a0499b7fff MDL-58557 mod_choice: only check responses if event is actionable 2017-04-27 07:00:03 +00:00
David Monllao aabee00d58 Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle 2017-04-27 12:19:20 +08:00
David Monllao d40c8844a1 Merge branch 'MDL-58708-master' of git://github.com/jleyva/moodle 2017-04-27 12:07:21 +08:00
Marina Glancy 56236c7d86 MDL-58683 mod_data: fix behat in clean
In clean theme the behat step to add record to mod_data does not actually view the database
activity. In 3.3 the default value for completionview is 1 and it breaks the behat in Clean.
2017-04-27 11:40:47 +08:00
David Monllao 160c263da5 Merge branch 'MDL-58557-master' of git://github.com/ryanwyllie/moodle 2017-04-27 11:36:26 +08:00
David Monllao f944d2561f Merge branch 'wip-MDL-57807-master' of git://github.com/abgreeve/moodle 2017-04-27 11:33:27 +08:00
David Monllao 3e7d5a82b9 Merge branch 'MDL-54849-master' of git://github.com/damyon/moodle 2017-04-27 11:20:02 +08:00
Adrian Greeve 0a497898c5 MDL-57807 mod_data: Advanced search with menu item.
It is now possible to search other criteria without first
setting the menu items.

Thanks to Sergey Gorbatov for providing this patch.
2017-04-27 08:58:13 +08:00
Juan Leyva e7a11c20d6 MDL-58708 mod_lesson: Fix notice in lesson
The notice was displayed only when accesing restored Moodle 1.X lessons.
2017-04-26 16:05:25 +02:00
Jun Pataleta abaf8106ea Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle 2017-04-26 11:06:30 +08:00
Ryan Wyllie 71cd51b8ff MDL-58557 mod_choice: change action event callback logic 2017-04-26 02:11:18 +00:00
John Okely d1076e3ef5 MDL-58632 assignsubmission_file: Don't allow any extension 2017-04-26 09:34:44 +08:00
Juan Leyva 3b07da4a6d MDL-58707 mod_assign: Fix param type for returned field
The ‘description’ field is populated via a get_string call, this means
that it may content html.
The component used for translation is also fixed in this commit.
2017-04-25 14:41:24 +02:00
Juan Leyva d5eefdb6a0 MDL-58668 mod_lesson: Fix how multi answers are processed
The module was choosing as incorrect the first possible incorrect
answer instead the first student incorrect answer.
In the patch I also refactored the foreach loop to avoid code
duplication.
2017-04-24 13:32:44 +02:00
Damyon Wiese ff8a1930ad MDL-54849 lesson: Move on to next question
Move on to next question button takes you to the same question again.
2017-04-24 14:06:57 +08:00
David Monllao ac44bda247 Merge branch 'wip-MDL-58666-master' of git://github.com/marinaglancy/moodle 2017-04-24 11:47:56 +08:00
Jun Pataleta 3e9c150d94 Merge branch 'MDL-51932-master-workshopswitch' of git://github.com/mudrd8mz/moodle 2017-04-24 08:34:06 +08:00