mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
87,766 Commits 36 Branches 527 Tags
Commit Graph

19951 Commits

Author SHA1 Message Date
Marina Glancy
e95df45bba MDL-60591 mod_forum: inline attachments are not displayed in plain text 2017-11-27 14:29:00 +08:00
Carlos Alexandre S. da Fonseca
38e7a9525f MDL-24678 mod_chat: Fixed race condition on chat module 2017-11-24 10:36:42 -02:00
Luca Bösch
b4fcf278c2 MDL-54693 quiz: Info for attempts allowed in user and group override. 2017-11-23 19:11:11 +01:00
Luca Bösch
409758c035 MDL-53004 assignment: Separate label and pulldown in grading (Clean) 2017-11-23 16:42:26 +01:00
Luca Bösch
99618f89bf MDL-27230 quiz: remove and update group overrides in calendar 2017-11-23 16:42:20 +01:00
Damyon Wiese
9a73d11cfd MDL-59766 assign: Allow teachers to disable annotations 
If teachers do not want to use the pdf annotation features, they should be able to disable it for a single assignment.

AMOS BEGIN
    CPY [default,assignfeedback_comments],[default,assignfeedback_editpdf]
    CPY [default_help,assignfeedback_comments],[default_help,assignfeedback_editpdf]
AMOS END
 2017-11-23 10:46:39 +08:00
Jun Pataleta
ddb3857cdf Merge branch 'wip-MDL-60546-master' of git://github.com/abgreeve/moodle 2017-11-22 13:24:33 +01:00
Jun Pataleta
4b560e4a8e Merge branch 'mdl58817-master' of https://github.com/tlock/moodle 2017-11-22 13:24:30 +01:00
Adrian Greeve
7b4e995015 MDL-60546 mod_choice: Update to select all functionality. 2017-11-22 14:10:55 +08:00
Tim Hunt
223419d92c MDL-60682 forms: date/times should use step 1 minute by default 2017-11-21 14:50:28 +00:00
Amy Groshek
ecdfab51a3 MDL-60478 mod_scorm: Makes checknet alerts less obtrusive. 
Alters checknet component to accept frequency,
timeout, and maxalerts arguments. Sets checknet
launched during SCORM session for 30 sec
frequency, 10 sec timeout, and 1 alert max.
 2017-11-20 12:59:14 -06:00
Jake Dallimore
4a9268b6e7 Merge branch 'MDL-60708-master' of git://github.com/jleyva/moodle 2017-11-20 17:54:56 +08:00
Juan Leyva
d995cd47fb MDL-60708 mod_workshop: Return author feedback for submission 
The feedback and grade information for submission should be returned
for teachers in the evaluation and closed phases.
 2017-11-20 10:07:57 +01:00
Jun Pataleta
3e6dabadaa Merge branch 'MDL-60187_master' of git://github.com/markn86/moodle 2017-11-20 21:33:00 +13:00
Jakob Ackermann
4d5a33e424 MDL-60187 mod_lti: Do not create a grade item when grades are disabled. 
If the privacy option "Accept grades from the tool" is disabled, the
module should not appear in the gradebook when edited inline or when
recover grades is running during enrolment.
 2017-11-20 15:13:24 +08:00
Jun Pataleta
4768fa336a Merge branch 'master_MDL-60253' of https://github.com/CengageEng/moodle 2017-11-20 13:21:30 +13:00
Jun Pataleta
1508fa23d2 Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle 2017-11-20 10:34:55 +13:00
Marcus Fabriczy
f32ee5c54e MDL-60546 mod_choice: Fixed select all functionality 
Fixed the functionality which ticks or unticks all checkboxes when
clicking the Select all or Deselect all elements when viewing the
responses.

Caused by deprecating checkall and checknone functions in
MDL-57490.
 2017-11-17 20:08:29 +10:30
Damyon Wiese
e76e6bc8bd MDL-60249 assign: resize quickgrade textareas 
The Bootstrap CSS reset prevents horizontal resizing of textareas. We want to allow it in the quickgrading ui.
 2017-11-17 14:55:28 +08:00
David Monllao
9304ba2212 Merge branch 'MDL-60789-master' of git://github.com/sarjona/moodle 2017-11-15 10:35:30 +01:00
Sara Arjona
3dbb8dc598 MDL-60789 workshop: Check title submission maxlength 2017-11-14 08:52:31 +01:00
Tim Lock
a33be61af8 MDL-58817 mod_lti: cartridge: maintain custom icons 2017-11-13 10:15:33 +10:30
Eloy Lafuente (stronk7)
6499085f36 MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts 2017-11-12 18:43:30 +01:00
David Monllao
08641175b3 Merge branch 'MDL-60764' of git://github.com/stronk7/moodle 2017-11-10 10:20:25 +01:00
Jun Pataleta
cb04dcf4ce Merge branch 'MDL-60771-master' of git://github.com/lameze/moodle 2017-11-10 18:03:49 +13:00
Damyon Wiese
4ceece6ea1 Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle 2017-11-10 12:05:46 +08:00
Simey Lameze
fbbcf45ef2 MDL-60771 mod_scorm: typecast score to integer 2017-11-10 12:00:17 +08:00
Andrew Nicols
6e2d8c121b Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle 2017-11-10 11:38:13 +08:00
Damyon Wiese
ce225e1c5e MDL-52838 workshop: Each criterion > 0 levels 
Add validation to the edit assessment form so each criterion in a rubric requires at least one level.
 2017-11-10 10:22:27 +08:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release 
version = 2017111300 release version
requires= 2017110800 current rc2 version
 2017-11-10 02:52:53 +01:00
Sara Arjona
2f673d8b6a MDL-60749 scorm: Remove   from files when downloading 2017-11-09 10:15:03 +01:00
Andrew Nicols
f169f4fd21 MDL-60752 lti: Compare text in types_config properly 2017-11-09 14:25:51 +08:00
David Monllao
29adfbc3c8 Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle 2017-11-08 15:56:25 +01:00
Jun Pataleta
7a2300fd82 Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle 2017-11-08 14:43:15 +13:00
Helen Foster
8d64443452 MDL-60717 lang: Merge English strings from the en_fix language pack 
Significant string changes:

- needbcmath,auth_ldap - 'grace logins' changed to 'expired password
  checking'
 2017-11-07 21:30:14 +01:00
Jake Dallimore
5243e93661 Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle 2017-11-07 16:03:43 +08:00
David Monllao
aa30dc8860 MDL-59256 analytics: Respect activities specific access conditions 2017-11-07 08:14:53 +01:00
Jake Dallimore
7783fd0ec1 Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle 2017-11-07 15:01:31 +08:00
Andrew Nicols
03561ea899 Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle 2017-11-07 13:49:47 +08:00
Ryan Wyllie
6688ae2ba2 MDL-60062 calendar: prevent drag and drop of override events 2017-11-07 05:47:18 +00:00
Damyon Wiese
65c52e05d1 MDL-58699 mod_quiz: Require javascript for popup 
If any of the access rules require the attempt to open in a new window, assume we
require javascript to attempt the quiz. This makes it harder to bypass the javascript
pseudo security restrictions.
 2017-11-07 12:48:21 +08:00
Damyon Wiese
efe2681894 MDL-57772 chat: BEEP is back baby! 2017-11-07 11:25:02 +08:00
Ryan Wyllie
478b1d194f MDL-60062 calendar: remove validate_event_timestart callback 2017-11-07 01:25:33 +00:00
Ryan Wyllie
9aac9f7074 MDL-60062 quiz: add support for drag drop of calendar events 2017-11-07 01:25:32 +00:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
Eloy Lafuente (stronk7)
796e48a58b MDL-60611 phpunit: remove deprecated stuff and other minor fixes 
Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons
 2017-11-05 01:45:04 +01:00
Damyon Wiese
79ea89fea2 MDL-58047 assign: submission sorting 
Only exclude new submission records from the sorting, draft and reopened submission are valid.
 2017-11-03 15:55:10 +08:00
Eloy Lafuente (stronk7)
801a372dad MDL-60611 phpunit: switch to namespaced phunit classes 2017-11-02 23:45:34 +01:00
David Monllao
bb2071ca17 Merge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle 2017-11-02 16:57:03 +01:00
Eloy Lafuente (stronk7)
f816ea9a67 Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle 2017-11-02 12:45:22 +01:00