216bb33940
Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle
2017-11-02 08:50:42 +08:00
58280ae0b8
Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle
2017-11-02 08:47:17 +08:00
c8e7777766
on-demand release 3.4beta+
2017-11-01 13:40:07 +01:00
d25f1c3c3c
Merge branch 'MDL-60503-master' of git://github.com/damyon/moodle
2017-11-01 10:41:48 +01:00
ab2095fb0f
MDL-60515 groups: Behat test for viewing the group description.
2017-11-01 15:24:38 +08:00
6b839f3222
MDL-60515 groups: Group details template change.
...
The group details template has been changed to be
simpler and is styled a bit nicer.
2017-11-01 15:24:38 +08:00
66242b95e0
MDL-60503 npm: Lock required node 8.9.x (LTS)
2017-11-01 14:52:16 +08:00
14a1672cff
Merge branch 'MDL-52037-master-fix' of https://github.com/andrewnicols/moodle
2017-11-01 11:14:50 +08:00
89cf38c6d9
MDL-52037 theme: Correct question feedback width
...
This relates to the cloze question answer when hovered.
2017-11-01 11:12:16 +08:00
76f11421a4
MDL-60007 mod lti: allow delete without content-type
2017-10-31 09:57:38 -04:00
1b0978abf3
MDL-60433 mod_data: Fix strict check for groupid
2017-10-31 13:24:07 +01:00
4916c9bb66
MDL-52037 theme: Update compiled css
2017-10-31 11:00:59 +01:00
8fcb479246
MDL-52037 questions: „Whether correct“-feedback marks adaptive width
2017-10-31 10:42:49 +01:00
73ec9b4778
Merge branch 'MDL-60635-master' of git://github.com/andrewnicols/moodle
2017-10-31 21:30:01 +13:00
9cca2db570
Merge branch 'MDL-60472_master' of git://github.com/markn86/moodle
2017-10-31 15:18:37 +08:00
9daa5874a0
Merge branch 'MDL-60607' of git://github.com/timhunt/moodle
2017-10-31 12:57:36 +08:00
60829fbe6d
Merge branch 'MDL-60631_master' of git://github.com/dmonllao/moodle
2017-10-31 12:08:01 +08:00
9f33d5ac6e
MDL-60472 core_user: filter by group id when specified in URL
2017-10-31 12:05:13 +08:00
1cc7a14ce4
Merge branch 'MDL-59936-int-fix-1' of github.com:ryanwyllie/moodle
2017-10-31 16:02:50 +13:00
958c9c17ca
Merge branch 'MDL-57560-master' of git://github.com/damyon/moodle
2017-10-31 15:40:19 +13:00
4397da0c4d
MDL-59936 boost: improve focus outline on modal header
2017-10-31 02:38:29 +00:00
d8966238dd
Merge branch 'wip-MDL-60569-master' of git://github.com/marinaglancy/moodle
2017-10-31 10:15:56 +08:00
065a754111
Merge branch 'MDL-60575-master' of https://github.com/snake/moodle
2017-10-31 10:05:38 +08:00
3e4de62607
Merge branch 'MDL-60139' of git://github.com/timhunt/moodle
2017-10-31 09:14:32 +08:00
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
aba60237cd
Merge branch 'MDL-60522-master' of https://github.com/Kathrin84/moodle
2017-10-31 08:12:31 +08:00
ed44df22a8
MDL-60575 lang: Change registration string to html from markdown
2017-10-31 07:30:33 +08:00
ade8dd5d08
MDL-60607 quiz reports: catch separate groups & user has no group case
2017-10-30 17:57:30 +00:00
28196427a2
Merge branch 'MDL-60528-m' of https://github.com/micaherne/moodle
2017-10-30 17:58:39 +01:00
64476c520e
Merge branch 'MDL-52037-cloze-whether-correct-feedback-width' of https://github.com/lucaboesch/moodle
2017-10-30 15:58:39 +01:00
860d33c90a
Merge branch 'MDL-60348-master' of git://github.com/jleyva/moodle
2017-10-30 15:53:53 +01:00
eefa2c88e0
MDL-60607 quiz reports: move duplicate code to superclass method
2017-10-30 13:43:36 +00:00
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
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
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
7336f854e6
MDL-60348 mod_workshop: Add parameters checks in evaluate_assessment WS
2017-10-30 13:50:57 +01:00
6065875eac
Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle
2017-10-30 13:23:35 +01:00
3fdecc2841
Merge branch 'MDL-60377-master' of git://github.com/jleyva/moodle
2017-10-30 11:42:11 +01:00
8c00d189f4
MDL-52037 questions: „Whether correct“-feedback marks adaptive width
2017-10-30 10:34:09 +00:00
8c7db03a56
MDL-60631 analytics: Pass evaluation analysables filters as objects
2017-10-30 10:54:07 +01:00
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
349b705d31
MDL-60515 groups: Display group information on the participants page.
2017-10-30 16:43:18 +08:00
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
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
51af04ab2f
Merge branch 'MDL-59606' of git://github.com/timhunt/moodle
2017-10-30 11:23:18 +08:00
9e6d1a3884
Merge branch 'MDL-60605_filetree-spacing' of https://github.com/dvdcastro/moodle
2017-10-30 10:50:26 +08:00
391ea5b7de
Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle
2017-10-30 14:34:58 +13:00
9d0e1fca5a
Merge branch 'MDL-60360_enable_file_indexing_retroactively' of https://github.com/mattporritt/moodle
2017-10-30 09:17:13 +08:00
8f730872a7
MDL-59936 calendar: use event colour in summary modal header
2017-10-30 08:34:26 +08:00
4febb36efe
MDL-59936 calendar: use icons in event summary modal
2017-10-30 08:33:54 +08:00
Jake Dallimore