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
87061 commits 37 branches 540 tags 1.3 GiB
Commit graph

87061 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
065a754111 Merge branch 'MDL-60575-master' of https://github.com/snake/moodle 2017-10-31 10:05:38 +08:00
Andrew Nicols
3e4de62607 Merge branch 'MDL-60139' of git://github.com/timhunt/moodle 2017-10-31 09:14:32 +08:00
Andrew Nicols
a37faf9c70 MDL-60635 calendar: Fix end of month issue with previous/next month 
This reverts to the previous way in which this was calculated.
 2017-10-31 08:51:50 +08:00
Andrew Nicols
aba60237cd Merge branch 'MDL-60522-master' of https://github.com/Kathrin84/moodle 2017-10-31 08:12:31 +08:00
Jake Dallimore
5836baf593 MDL-60619 core: fix autocomplete suggestions css for RTL 2017-10-31 07:44:05 +08:00
Jake Dallimore
ed44df22a8 MDL-60575 lang: Change registration string to html from markdown 2017-10-31 07:30:33 +08:00
Andrew Nicols
314b8093e7 MDL-60633 core: Add pendingjs checks for inplace editable 2017-10-31 07:03:13 +08:00
Tim Hunt
ade8dd5d08 MDL-60607 quiz reports: catch separate groups & user has no group case 2017-10-30 17:57:30 +00:00
David Monllao
28196427a2 Merge branch 'MDL-60528-m' of https://github.com/micaherne/moodle 2017-10-30 17:58:39 +01:00
Juan Leyva
8c4d7cee79 MDL-51945 core_user: Prevent duplicated emails in update_users WS 2017-10-30 17:42:03 +01:00
David Monllao
64476c520e Merge branch 'MDL-52037-cloze-whether-correct-feedback-width' of https://github.com/lucaboesch/moodle 2017-10-30 15:58:39 +01:00
Juan Leyva
c851ee5ddb MDL-53501 webservice: Avoid values higher than PHP_INT_MAX 
Integers coming from site settings needs casting to int to avoid
returning values higher than PHP_INT_MAX.
 2017-10-30 15:55:49 +01:00
David Monllao
860d33c90a Merge branch 'MDL-60348-master' of git://github.com/jleyva/moodle 2017-10-30 15:53:53 +01:00
Tim Hunt
eefa2c88e0 MDL-60607 quiz reports: move duplicate code to superclass method 2017-10-30 13:43:36 +00:00
Tim Hunt
284c795d23 MDL-60139 question manual grading: move code to reduce confusion 
Move the variable definition closer to where it is used.
 2017-10-30 12:55:11 +00:00
Tim Hunt
808b68835b MDL-60139 question manual grading: redisplay mark as typed if editing 
When the teacher is upgrading a previously entered grade, we re-display
exactly what they typed before if possible, rather than displaying with
a set number of decimal places.
 2017-10-30 12:52:02 +00:00
Tim Hunt
46a3753424 MDL-60139 phpunit: Make assertTag verify attribute values with === 
I had a test that cared about the difference between value="5.0" and value="5".
 2017-10-30 12:52:00 +00:00
Juan Leyva
7336f854e6 MDL-60348 mod_workshop: Add parameters checks in evaluate_assessment WS 2017-10-30 13:50:57 +01:00
David Monllao
6065875eac Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle 2017-10-30 13:23:35 +01:00
David Monllao
3fdecc2841 Merge branch 'MDL-60377-master' of git://github.com/jleyva/moodle 2017-10-30 11:42:11 +01:00
Luca Bösch
8c00d189f4 MDL-52037 questions: „Whether correct“-feedback marks adaptive width 2017-10-30 10:34:09 +00:00
David Monllao
8c7db03a56 MDL-60631 analytics: Pass evaluation analysables filters as objects 2017-10-30 10:54:07 +01:00
Adrian Greeve
c550fd0e11 MDL-60515 groups: Update to weblib group function. 
Added a new function to get the url for the group picture.
 2017-10-30 16:43:19 +08:00
Adrian Greeve
349b705d31 MDL-60515 groups: Display group information on the participants page. 2017-10-30 16:43:18 +08:00
Kathrin Osswald
9cc55074d5 MDL-60522 message: Removed additional tooltips 
I removed the additional tooltips because I think that they are just used
in the notifications and messages context and duplicate the all over used
title tag that gives the same information when hovering. So the whole system
stays more consistently.
 2017-10-30 08:01:10 +01:00
Damyon Wiese
4fab795ac9 MDL-57560 boost: File upload progress 
Copy / adapt some styles from the bootstrap progress widget to match the DOM used for file upload progress.

Bootstrap changed this alot in the current beta so I opted to do a minimal change (affect the scss for boost only), rather
than adapt the HTML to something that will change again anyway when we upgrade to the release version of bootstrap 4.
 2017-10-30 13:12:05 +08:00
Jake Dallimore
51af04ab2f Merge branch 'MDL-59606' of git://github.com/timhunt/moodle 2017-10-30 11:23:18 +08:00
Andrew Nicols
9e6d1a3884 Merge branch 'MDL-60605_filetree-spacing' of https://github.com/dvdcastro/moodle 2017-10-30 10:50:26 +08:00
Jun Pataleta
391ea5b7de Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle 2017-10-30 14:34:58 +13:00
Andrew Nicols
9d0e1fca5a Merge branch 'MDL-60360_enable_file_indexing_retroactively' of https://github.com/mattporritt/moodle 2017-10-30 09:17:13 +08:00
Ryan Wyllie
8f730872a7 MDL-59936 calendar: use event colour in summary modal header 2017-10-30 08:34:26 +08:00
Ryan Wyllie
4febb36efe MDL-59936 calendar: use icons in event summary modal 2017-10-30 08:33:54 +08:00
Ryan Wyllie
368832d51c MDL-59936 javascript: hide modal footer without content 2017-10-30 08:33:54 +08:00
Jun Pataleta
cc80554892 Merge branch 'MDL-60608-master' of git://github.com/lameze/moodle 2017-10-30 11:47:54 +13:00
Jun Pataleta
e905b656f5 Merge branch 'MDL-60570-master' of git://github.com/andrewnicols/moodle 2017-10-30 11:00:44 +13:00
Jun Pataleta
526d354991 Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle 2017-10-30 10:10:34 +13:00
Andrew Nicols
eb3b38f04c MDL-60570 calendar: Correct course filter label in day view 2017-10-29 21:05:55 +08:00
Andrew Nicols
a1b696f943 MDL-60576 calendar: Remove underline between icons and text 2017-10-29 21:01:40 +08:00
David Castro
4e52eb8eb0 MDL-60605 assignment: Added some styles to fix spacing in YUI file tree 2017-10-27 11:06:25 -05:00
Tim Hunt
dae0ccfc45 MDL-59606 quiz responses: fix edge cases in the report 
This patch conbines valuable contributions from Kashmira Nagwekar and
Luca Bösch. Many thanks to them. However, the final form of the fix,
and hence the blame, falls to me -- Tim.

There were several issues here:

* The load_questions_usages_by_activity method in
  question/engine/datalib.php was incorrectly treating the case
  when no data was returned. (Looks like a historic copy-pase from
  other methods that fetch one item by unique id, which therefore
  must exist.)

* The report was not correctly handling the display when the 'Which
  tries' was set to 'with, and without, attempts'.

* It was possible to select the 'All tries' option when also saying
  'Users without attempts'. This combination makes not sense, so
  a disabledIf rule was added to the form.
 2017-10-27 16:57:01 +01:00
David Monllao
40f1801c4b on-demand release 3.4beta+ 2017-10-27 12:49:10 +02:00
Juan Leyva
6078d420bf MDL-60572 admin: Enforce URLs in forgottenpasswordurl setting 
Also display warnings for admins.
 2017-10-27 11:15:01 +02:00
Juan Leyva
2479a7c446 MDL-60572 admin: Fix forgottenpasswordurl for WS 
We should expect URLs in that field.
The tool_mobile change is to not break the WS response if
forgottenpasswordurl does not contain a URL.
 2017-10-27 11:12:32 +02:00
David Monllao
ef9f60a635 MDL-59950 analytics: Use cognitive depth and social breadth constants 2017-10-27 10:48:42 +02:00
David Monllao
db9d745c7b MDL-59950 analytics: Add constants for cognitive and social levels 2017-10-27 10:48:38 +02:00
Simey Lameze
0d049757c0 MDL-60608 calendar: change eventdefaultcontext default to 0 2017-10-27 14:19:16 +08:00
Matt Porritt
0f56f6e6da MDL-60360 Global Search: Enable file indexing message update. 
If you have Global Search set up on a site without file
indexing enabled, then at a later date you enable file indexing
files associated with existing objects are not added.

The only way to have files for existing objects indexed is to
run a reindex of all content.

This patches updates the file indexing language string in the
solr search settings of Global Search to make this clear
to the site administrator.
 2017-10-27 11:11:12 +11:00
David Monllao
ff340a0afa Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle 2017-10-26 19:17:28 +02:00
David Monllao
62a38a4ece Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle 2017-10-26 19:15:44 +02:00
David Monllao
a272c25649 Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle 2017-10-26 18:33:49 +02:00