moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84585 commits 37 branches 540 tags 1.3 GiB
Commit graph

84585 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
e5eef6c545 Merge branch 'MDL-58600-master' of git://github.com/ankitagarwal/moodle 2017-04-24 11:09:33 +08:00
Ankit Agarwal
266d033896 MDL-58600 competencies: Use correct formating api in exporter 2017-04-24 08:31:13 +05:30
Jun Pataleta
a84e03ed69 Merge branch 'MDL-58681' of git://github.com/stronk7/moodle 2017-04-24 10:24:33 +08:00
Jun Pataleta
439616450e Merge branch 'MDL-58586-master' of git://github.com/damyon/moodle 2017-04-24 09:33:12 +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
Eloy Lafuente (stronk7)
641d75bde6 MDL-58681 behat: Split checkbox and advcheckbox tests 
MDL-58267 converted "Display description on course page" to advcheckbox
(see 7f53e8aa22).

Advanced checkboxes cannot be tested without real browser because Goutte
does not support the hidden+checkbox duality (MDL-55386).

So this patch does:

- Convert the NON-JS checks to use the "Force format" field (normal checkbox).
- Move the "Display description on course page" (adv. checkbox) to the JS scenario.
- Complete the 2 groups of checks above so the two ways to tick and untick are covered:
    - I set the field "xxxx" to "yyyy"
    - I set the following fields to these values:
- Complete the 2 groups of checks above so the two ways to verify the values are covered:
    - the field "xxxx" [matches|does not match] value "yyyy"
    - the following fields [match|do not match] these values:

That's all! The scenario is a bit spaghetti but it's way off the scope
of the issue to fix that.
 2017-04-23 18:13:02 +02:00
AMOS bot
75ce4b4cfa Automatically generated installer lang files 2017-04-23 00:04:01 +08:00
Dan Poltawski
faedb2736e Moodle release 3.3beta 2017-04-21 15:48:31 +01:00
Dan Poltawski
bff89dd434 NOBUG: Fixed SVG browser compatibility 2017-04-21 15:48:28 +01:00
Dan Poltawski
427327e9be Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-04-21 15:48:27 +01:00
Dan Poltawski
97182da01a Merge branch 'MDL-58138-master-bulkcompletefix' of https://github.com/mudrd8mz/moodle 2017-04-21 15:37:51 +01:00
David Mudrák
4088416c14 MDL-58138 completion: Fix capability required for setting defaults 
As per core_completion\manager::get_available_completion_tabs() the
required capability for this feature is moodle/course:manageactivities,
not moodle/course:update.
 2017-04-21 16:22:50 +02:00
Dan Poltawski
79420165f0 Merge branch 'wip-MDL-58138-fix2' of https://github.com/marinaglancy/moodle 2017-04-21 09:04:43 +01:00
Marina Glancy
694502b611 MDL-58138 completion: manual completion may have expected date 2017-04-21 15:01:32 +08:00
David Monllao
f0de5c5500 Merge branch 'MDL-58621-master-fix' of git://github.com/lameze/moodle 2017-04-21 14:30:52 +08:00
Simey Lameze
55c64521a8 MDL-58621 block_myoverview: remove behat steps checking dates 2017-04-21 13:15:47 +08:00
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