mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
87,346 Commits 36 Branches 527 Tags
d766bbc5b9
Commit Graph

87346 Commits

Author SHA1 Message Date
Jun Pataleta
78a534dde0 Merge branch 'wip-MDL-45068-master' of git://github.com/marinaglancy/moodle 2017-11-27 19:36:00 +13:00
Marina Glancy
e95df45bba MDL-60591 mod_forum: inline attachments are not displayed in plain text 2017-11-27 14:29:00 +08:00
Marina Glancy
ec43371a3f MDL-45068 groups: fixes to group import 
- If 'coursename' is specified in the CSV it should match the course short name - thanks Yusuf Yılmaz for the patch
- If 'idnumber' is specified but 'groupidnumber' is not, idnumber should be used for matching the course idnumber only
- If 'groupingname' is not specified, there should be no notices (regression from MDL-42514)
- If 'coursename' or 'idnumber' column is present, it can contain empty values in some/all lines
 2017-11-27 14:24:58 +08:00
Shamim Rezaie
0897d6588e MDL-60188 groups: cache user's groups and groupings 
The function groups_get_user_groups is called too often both before rendering the page and after the page is rendered (using ajax).
The function was executing a query joining 3 tables in each call. The plementation of the function has now modified to store the
query result in a request cache.
 2017-11-27 10:46:35 +08:00
Jake Dallimore
d735cb5230 Merge branch 'MDL-60830-master' of git://github.com/sarjona/moodle 2017-11-27 10:29:55 +08:00
Jun Pataleta
d470de673c Merge branch 'MDL-58887-master' of git://github.com/ryanwyllie/moodle 2017-11-27 15:05:46 +13:00
Jake Dallimore
29abde4709 Merge branch 'MDL-27230-master' of https://github.com/lucaboesch/moodle 2017-11-27 09:43:44 +08:00
Jun Pataleta
84ae267c56 Merge branch 'MDL-60904' of git://github.com/stronk7/moodle 2017-11-27 11:27:57 +13:00
Eloy Lafuente (stronk7)
2fdd9eed54 MDL-60904 behat: Update master to use 3.35.0 behat extension tag 2017-11-26 20:27:00 +01:00
Andrew Hancox
1744570b2e MDL-60801 tool_uploaduser: Fix issue with defaults being ignored 2017-11-24 15:29:23 +00: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
sam marshall
411b5f3a02 MDL-60838 core_search: File upload does not honour timeout 2017-11-24 11:00:45 +00:00
Sara Arjona
6820f36bda MDL-57569 core_files: Fix to let show generated f3 image 2017-11-24 11:48:32 +01:00
Sara Arjona
d77a6026d2 MDL-46768 core_badges: changed badge name type from FILE to TEXT 2017-11-24 11:34:15 +01: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
David Monllao
5bde2c2b62 weekly release 3.5dev 2017-11-23 13:35:10 +01:00
Damyon Wiese
07a91fd4cc Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle 2017-11-23 12:25:31 +08:00
Marina Glancy
dc9353a07b MDL-27886 backup: When setting is unlocked set it to original value 2017-11-23 12:21:03 +08: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
Jake Dallimore
1cce91b1bb Merge branch 'MDL-60831-master' of git://github.com/ankitagarwal/moodle 2017-11-22 13:24:34 +01:00
Ankit Agarwal
7e6ef63e5f MDL-60831 search: add BS classes to block elements 2017-11-22 13:24:34 +01: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
9ff02b52b2 Merge branch 'MDL-60813-master' of git://github.com/jleyva/moodle 2017-11-22 13:24:33 +01:00
Jun Pataleta
fd64ae3140 Merge branch 'MDL-60526-master-fix1' of http://github.com/damyon/moodle 2017-11-22 13:24:32 +01:00
Damyon Wiese
992c5ccfbf MDL-60526 forms: Button elements should have type 
The mform "buttons" should be of type "button", instead it's not specified so they get
the default of "submit". This is causing behat fails.
 2017-11-22 13:24:32 +01:00
David Monllao
63469571c8 Merge branch 'm34_MDL-60745_Bump_ComposerLock_ToPHPUnit_6d4d4' of https://github.com/scara/moodle 2017-11-22 13:24:31 +01:00
David Monllao
e968cf1def MDL-59512 version: Following 2 digits scheme 2017-11-22 13:24:31 +01:00
David Monllao
eee87c8a24 Merge branch 'MDL-59512-master' of git://github.com/Dagefoerde/moodle 2017-11-22 13:24:31 +01:00
Jun Pataleta
4b560e4a8e Merge branch 'mdl58817-master' of https://github.com/tlock/moodle 2017-11-22 13:24:30 +01:00
Jun Pataleta
6472ad5600 Merge branch 'MDL-60637-master' of git://github.com/lameze/moodle 2017-11-22 13:24:30 +01:00
Jake Dallimore
ef4192b8e7 Merge branch 'MDL-60796-master' of git://github.com/ankitagarwal/moodle 2017-11-22 13:24:30 +01:00
Jun Pataleta
8317549dff Merge branch 'MDL-60780_master' of git://github.com/dmonllao/moodle 2017-11-22 13:24:29 +01:00
David Monllao
5d96469c8c Merge branch 'MDL-60751-master' of git://github.com/lameze/moodle 2017-11-22 13:24:29 +01:00
Sara Arjona
46ea440b87 MDL-60830 core_enrol: Added email when searching users in course enrol 2017-11-22 13:16:16 +01:00
Damyon Wiese
9a7671da80 MDL-59970 competencies: performance 
Remove useless get_records call in get_least_proficient_competencies_for_course function.
On big sites this would cause huge memory usage.
 2017-11-22 15:35:20 +08:00
Adrian Greeve
7b4e995015 MDL-60546 mod_choice: Update to select all functionality. 2017-11-22 14:10:55 +08:00
Ryan Wyllie
05df02a0ec MDL-58887 core: fix default title for action menu 
Thanks to Michelle Melton <meltonml@appstate.edu> for the original
version of this patch.
 2017-11-22 01:36:31 +00:00
Tim Hunt
223419d92c MDL-60682 forms: date/times should use step 1 minute by default 2017-11-21 14:50:28 +00:00
Marina Glancy
077edd3038 MDL-56864 forms: allow to remove last tag with forced standard tags 2017-11-21 15:29:03 +08:00
Marina Glancy
be2e38ed92 MDL-56864 forms: boost templates don't allow remove last tag 2017-11-21 15:29:02 +08:00
Simey Lameze
486ecb1b89 MDL-60637 core_group: fix unit tests failures 2017-11-21 09:59:56 +08:00
Simey Lameze
effa7d2ba1 MDL-60637 group: remove useless id number validation on web services 2017-11-21 09:52:40 +08: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
David Monllao
b78d40e637 Merge branch 'MDL-60526-master' of git://github.com/damyon/moodle 2017-11-20 13:43:54 +01:00
David Monllao
d6170fe7f8 Merge branch 'MDL-60436' of https://github.com/NeillM/moodle 2017-11-20 13:26:01 +01:00
David Monllao
007dd71c17 Merge branch 'MDL-56253-master' of https://github.com/lucaboesch/moodle 2017-11-20 12:55:28 +01:00
David Monllao
c39071d32a Merge branch 'MDL-60823-master' of git://github.com/lameze/moodle 2017-11-20 12:06:42 +01:00
Jake Dallimore
4a9268b6e7 Merge branch 'MDL-60708-master' of git://github.com/jleyva/moodle 2017-11-20 17:54:56 +08:00