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
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
Juan Leyva
16ca026c4b
MDL-58415 mod_lesson: Force int type for calculated progress
...
Under some circumstances the value returned by the function needs
casting.
2017-04-20 09:58:44 +02:00
Andrew Nicols
e44400ceca
Merge branch 'MDL-58494-master' of git://github.com/ryanwyllie/moodle
2017-04-20 15:23:50 +08:00
David Monllao
626b05c09c
Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle
2017-04-20 15:17:59 +08:00
Dan Poltawski
cdfcfb1f8c
Merge branch 'MDL-58498-master' of git://github.com/ryanwyllie/moodle
2017-04-20 07:44:56 +01:00
David Monllao
ba1ad89e7d
Merge branch 'MDL-58278-master' of git://github.com/damyon/moodle
2017-04-20 14:05:39 +08:00
Ryan Wyllie
55e55a773f
MDL-58494 mod_feedback: no action after feedback submitted
...
Don't provide an action in the action event callback if the user has
already submitted their feedback or if they don't have permission to
submit.
2017-04-20 05:51:32 +00:00
Andrew Nicols
6f9f15d1ad
MDL-58515
2017-04-20 13:47:21 +08:00
Andrew Nicols
9517ea662d
Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle
2017-04-20 13:03:34 +08:00
David Monllao
f60404b5ca
MDL-57456 mod_glossary: Proper course access in behat test
2017-04-20 12:32:05 +08:00
Damyon Wiese
f2a6b9cac9
MDL-58278 mod_assign: Ignore send notify with mw
...
When marking workflow is on and the grade is not released we never send notifications anyway.
Instead of preventing the grading form from submitting (validation error) we silently ignore it.
2017-04-20 11:43:34 +08:00
Jake Dallimore
d8f9177462
Merge branch 'MDL-58412-master' of git://github.com/jleyva/moodle
2017-04-20 09:56:10 +08:00
Juan Leyva
78681d03b0
MDL-58431 mod_lesson: Fix error in random jumps on first visit
...
Random jumps to content pages were not working when they were set in
the first page.
This was caused because the page where the jump was, was not being
marked as visited before calculating the jump.
2017-04-19 17:47:21 +02:00
Juan Leyva
bcd6249d53
MDL-58628 mod_quiz: Return missing fields in get_quizzes_by_courses
...
These fields must be returned always (even if the quiz is closed).
Those fields are required to display data to users that, for example,
finished a timed quiz.
2017-04-19 16:12:09 +02:00
