19281 Commits

Author SHA1 Message Date
Simey Lameze
84d4411b01 MDL-58796 mod_quiz: add handling for fontawesome icons 2017-05-04 13:51:14 +08:00
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
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
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
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
Marina Glancy
23e5104ae2 MDL-58666 course: add module name to cache
without it there will be an extra db read in get_array_of_activities() to retrieve it for each activity
2017-04-21 13:00:28 +08:00
Ryan Wyllie
fa16d7fb8c MDL-58349 mod_assign: text wrap for comment search while grading 2017-04-21 04:58:14 +00:00
Jake Dallimore
dd9c469ffc Merge branch 'MDL-58613-master-workshopfullname' of git://github.com/mudrd8mz/moodle 2017-04-21 10:26:00 +08:00
Marina Glancy
aef1e7f500 MDL-57457 mod_book: Chapters are not userdata plus some improvements 2017-04-21 10:06:09 +08:00
Andrew Hancox
0e8c334eb5 MDL-57457 mod_book: Fix bug with edit form when tagging disabled 2017-04-21 10:06:08 +08:00
Andrew Hancox
4282634fcd MDL-57457 mod_book: performance improvement for tags backup/restore 2017-04-21 10:06:08 +08:00
Andrew Hancox
0178314682 MDL-57457 mod_book: Implement tagging 2017-04-21 10:06:08 +08:00
Jun Pataleta
c1e917844c Merge branch 'MDL-58415-master' of git://github.com/jleyva/moodle 2017-04-20 16:11:31 +08:00
Juan Leyva
d96d72955e MDL-58415 mod_lesson: Fix code styles and missing declaration
Found by the integrator review:
- Some incorrect code style declaration and phpdocs
- Missing $USER declaration
- Incorrect use of $lesson (should be $this)
2017-04-20 09:58:48 +02:00
Juan Leyva
9c543014a2 MDL-58415 mod_lesson: Add missing answer fields
There were a couple of fields missing when returning the complete
answer information required for offline usage.
2017-04-20 09:58:47 +02:00
Juan Leyva
dd60892155 MDL-58415 mod_lesson: EOL var must be always numeric
Otherwise it will break the Web Service return description.
2017-04-20 09:58:47 +02:00
Juan Leyva
f1cdd978aa MDL-58415 mod_lesson: Out of time should be a string
process_eol_page expects a string, right now we are passing a boolean.
We should convert it to the correct string when is set to true, that is
‘normal’
2017-04-20 09:58:46 +02:00
Juan Leyva
a33c0e30eb MDL-58415 mod_lesson: Return always allowofflineattempts
We need this field always to be able to display if the lesson is
available or not for download
2017-04-20 09:58:46 +02:00
Juan Leyva
0fc1f24b12 MDL-58415 mod_lesson: Handle correctly review mode 2017-04-20 09:58:45 +02:00
Juan Leyva
0259109fb5 MDL-58415 mod_lesson: Avoid API http redirections
Deep in the lesson API there are some http redirections in special
pages like clusters.
We need to handle it via new parameters to avoid redirections.
2017-04-20 09:58:44 +02:00