David Monllao
35ec6bebaa
Merge branch 'MDL-58349-int-fix-1' of github.com:ryanwyllie/moodle
2017-04-21 13:10:50 +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
Jun Pataleta
4b358b4f39
Merge branch 'MDL-58566_master' of github.com:markn86/moodle
2017-04-21 11:52:35 +08:00
Damyon Wiese
711cf2cda1
MDL-58586 css: add margin to userpictures
...
Boost has a right margin on the userpicture but this is missing in bootstrapbase (it is
added only on random pages).
Add a margin to bootstrapbase so it matches boost.
2017-04-21 11:38:32 +08:00
Jun Pataleta
6d65f190f0
Merge branch 'MDL-58636-master' of git://github.com/andrewnicols/moodle
2017-04-21 11:37:57 +08:00
Mark Nelson
37c38dfca1
MDL-58566 calendar: fixed comment's reference to non-existent function
2017-04-21 11:27:15 +08:00
Andrew Nicols
a496497c57
MDL-58636 course: Ensure that the drag constraint has height
2017-04-21 10:45:53 +08:00
Andrew Nicols
7125b4f17c
Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle
2017-04-21 10:39:41 +08:00
Simey Lameze
c5515a34b5
MDL-58490 block_myoverview: add missing completionlib include
2017-04-21 10:33:36 +08: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
David Monllao
8e96553708
Merge branch 'MDL-58590' of https://github.com/sk-unikent/moodle
2017-04-21 10:03:59 +08:00
Jun Pataleta
7a7dbe1b7a
Merge branch 'MDL-58482-master' of git://github.com/lameze/moodle
2017-04-21 09:04:32 +08:00
Andrew Nicols
4707816095
Merge branch 'MDL-58490-master' of git://github.com/lameze/moodle
2017-04-21 08:52:15 +08:00
Simey Lameze
ff54d94bd1
MDL-58482 theme_boost: css fixes for view badge page
2017-04-21 08:50:27 +08:00
AMOS bot
421802e9a4
Automatically generated installer lang files
2017-04-21 00:09:48 +08:00
Dan Poltawski
992b296209
Merge branch 'MDL-58621-master' of git://github.com/ryanwyllie/moodle
2017-04-20 13:14:00 +01:00
Juan Leyva
01c26702d3
MDL-58659 enroll: Add start and end date fields required by overview
...
Those fields are required to display the courses overview for final
users.
2017-04-20 13:00:15 +02:00
Juan Leyva
ef83fc2a33
MDL-58659 course: Add missing enddate field in get_courses_by_field
2017-04-20 12:53:10 +02:00
Dan Poltawski
1d53b80c44
Merge branch 'MDL-58426-master-bigicons' of git://github.com/mudrd8mz/moodle
2017-04-20 10:33:53 +01:00
David Mudrák
750bbb68a8
MDL-58426 icons: Fix CSS for displaying big icons
...
The expected size of icons in the pix/b/ (big) folder was not respected
and they were displayed as 16x16 px.
2017-04-20 10:48:38 +02:00
Skylar Kelty
30fccfcd82
MDL-58590 mobile: Cache mobile-supporting plugins
2017-04-20 09:36:20 +01:00
Jun Pataleta
c1e917844c
Merge branch 'MDL-58415-master' of git://github.com/jleyva/moodle
2017-04-20 16:11:31 +08:00
David Monllao
10e5071b85
Merge branch 'MDL-58623_master' of git://github.com/markn86/moodle
2017-04-20 16:08:52 +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
Dan Poltawski
8afd1e2bd6
Merge branch 'MDL-58538-master' of git://github.com/junpataleta/moodle
2017-04-20 08:26:54 +01:00
Mark Nelson
0f5e3fd952
MDL-58623 course: allow course summaries to be null in exporter
2017-04-20 15:26:11 +08: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
Jake Dallimore
7b79a90bea
Merge branch 'wip-MDL-58452-master' of git://github.com/marinaglancy/moodle
2017-04-20 15:10:21 +08:00
Simey Lameze
4a995a1fe7
MDL-58490 block_myoverview: separate course and activity completion
2017-04-20 14:45:04 +08:00
Dan Poltawski
cdfcfb1f8c
Merge branch 'MDL-58498-master' of git://github.com/ryanwyllie/moodle
2017-04-20 07:44:56 +01:00
Dan Poltawski
fd91fe42ca
Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle
2017-04-20 07:27:56 +01:00
Dan Poltawski
13e58982bb
Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle
2017-04-20 07:19:17 +01:00
David Monllao
ba1ad89e7d
Merge branch 'MDL-58278-master' of git://github.com/damyon/moodle
2017-04-20 14:05:39 +08:00
Simey Lameze
f3dacc3860
MDL-58617 core_output: add mapping for dashboard on user menu
2017-04-20 13:56:13 +08:00
Andrew Nicols
d1131cd8b6
Merge branch 'wip-MDL-58138-fix' of https://github.com/marinaglancy/moodle
2017-04-20 13:54:43 +08:00
Mark Nelson
2c77be65cc
MDL-58637 format_*: fixed incorrect CSS selector
2017-04-20 13:53:42 +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