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,482 Commits 36 Branches 527 Tags
6976c8e1b5
Commit Graph

87482 Commits

Author SHA1 Message Date
Mathew May
aa6b85d2b7 MDL-57431 mod_quiz: Quiz editing help icon fix 2017-12-12 09:56:05 +08:00
Brendan Heywood
b588373656 MDL-60968 auth: Allow more flexibility with mapping attributes 2017-12-12 09:37:35 +08:00
Damyon Wiese
4786443998 Merge branch 'MDL-60041' of https://github.com/NeillM/moodle 2017-12-12 09:13:43 +08:00
Zig Tan
6901981962 MDL-42676 mod_assign: Display message fix when using grade override 
Logic fix in mod_assign locallib.php to correctly set the submissionlockedstatus,
and added associated unit test in test_grade_submission_override()
 2017-12-12 09:01:35 +08:00
Damyon Wiese
34adfcb4ee Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle 2017-12-12 08:55:57 +08:00
Mihail Geshoski
2034f57fe1 MDL-52538 lesson: Grade info displayed while ongoing score disabled 2017-12-12 08:54:51 +08:00
David Monllao
895e005989 MDL-60759 search_solr: Solr 7+ compatibility 2017-12-11 12:47:55 +01:00
Simey Lameze
97f4556a94 MDL-60750 mod_quiz: only apply form css rules on clean theme 2017-12-11 16:56:06 +08:00
Damyon Wiese
807ba44cc6 Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle 
Conflicts:
	theme/boost/scss/moodle/modules.scss
 2017-12-11 16:55:27 +08:00
Damyon Wiese
42cec80673 Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle 2017-12-11 16:47:19 +08:00
Neill Magill
3acb294828 MDL-60945 Web services: Too many progress records retrieved 
The core_completion_get_activities_completion_status was getting the
progress for all users on the course called, and then discarding all
the records but one.

This change ensures that only progress for the user we are interested in
is retrieved from the database.

This has a side benefit of removing a full table scan from the query
finding the users inside the get_progress_all() method.
 2017-12-11 08:41:16 +00:00
Neill Magill
61fad215f1 MDL-60041 dml: MOODLELIB sql file must have Unix line endings 
If the file does not have Unix line endings then the regular expression
in oci_native_moodle_database::attempt_oci_package_install() does
not split it correctly.

This leads to an invalid package being created in Oracle.

The .gitattribute file changes for oci_native_moodle_package.sql
force it to have Unix style line endings when the branch is checked
out and the file does not already exist.

The file has been modified so that the Unix style line endings are
applied even if the file already exists, for example when pulling in
this change to an existing branch.
 2017-12-11 08:40:58 +00:00
Mihail Geshoski
83b9a7c88c MDL-56197 lesson: Multichoice answers not on same line as radio button 2017-12-11 15:49:24 +08:00
Andrew Nicols
10cc00b4af Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle 2017-12-11 14:58:14 +08:00
Damyon Wiese
67c0e18ca2 Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle 2017-12-11 14:54:46 +08:00
Simey Lameze
5c1ea9aea5 MDL-60057 mod_lesson: add unit tests for callbacks 2017-12-11 14:45:04 +08:00
Simey Lameze
f077e0af7e MDL-60057 mod_lesson: add calendar drag and drop callbacks 
AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
	CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
	CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END
 2017-12-11 14:29:16 +08:00
Marina Glancy
8326cc5e3e MDL-60594 xmlrpc: wrapper for buggy xmlrpc_decode 2017-12-11 14:27:06 +08:00
Damyon Wiese
5258525f0a Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle 2017-12-11 14:08:08 +08:00
Simey Lameze
61ac58a887 MDL-60060 mod_data: add unit tests for callbacks 2017-12-11 14:05:00 +08:00
Simey Lameze
5e401a2a51 MDL-60060 mod_data: add calendar drag and drop callbacks 2017-12-11 14:05:00 +08:00
Ankit Agarwal
8d6b7f0c6c MDL-60861 analytics: Remove enable menu, if no timesplitting method 2017-12-11 10:47:02 +05:30
Ankit Agarwal
fabe98ac92 MDL-60861 analytics: Enabling a model requires timesplitting 2017-12-11 10:47:01 +05:30
Damyon Wiese
fe955c5645 Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle 2017-12-11 12:56:18 +08:00
Shamim Rezaie
9d27b68ce8 MDL-59438 calendar: Added a foreign key and an index 
Added foreign key constraint to the event.subscriptionid column.
Also added index to the event.uuid column.
 2017-12-11 12:54:49 +08:00
Damyon Wiese
c6a507e9e7 Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle 2017-12-11 12:52:23 +08:00
Andrew Nicols
b9819842d9 MDL-60948 tool_httpsreplace: Correct use of test URLs 2017-12-11 12:05:57 +08:00
Damyon Wiese
917923c860 Merge branch 'MDL-60043' of git://github.com/timhunt/moodle 2017-12-11 11:49:40 +08:00
Damyon Wiese
5ec2ce20f5 Merge branch 'MDL-54106-master' of https://github.com/lucaboesch/moodle 2017-12-11 11:37:48 +08:00
Damyon Wiese
e82c025e60 Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle 2017-12-11 11:27:28 +08:00
Marcus Fabriczy
e7ec2f901b MDL-59709 mod_assign: Export to portfolio button not working 
Changed the button to a text link
 2017-12-10 13:47:47 +10:30
Luca Bösch
970dc511e2 MDL-44660 grade: Typos @package core_grade instead of core_grades 2017-12-08 14:21:34 +01:00
Luca Bösch
41d335f31a MDL-60920 quiz: removed legacy "edit questions" button 2017-12-08 14:13:05 +01:00
Luca Bösch
7f8773ffb8 MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed 2017-12-08 14:12:57 +01:00
Tomek Muras
aceb84ad76 MDL-60043 accesslib: improve query performance by removing ORDER BY 
then add back the minimal necessary sorting in PHP. That part was
added by Tim Hunt.
 2017-12-08 12:08:44 +00:00
Simey Lameze
f9bb74c037 MDL-58058 competency: replace other sortorder usages 2017-12-08 15:58:52 +08:00
Frederic Massart
f250cdbb34 MDL-58058 competency: Allow unspecified sortorder for new competencies 2017-12-08 15:58:52 +08:00
Mihail Geshoski
473391b667 MDL-40790 lesson: Lesson content button runs off the edge of the page 2017-12-08 09:55:36 +08:00
Mihail Geshoski
d381732329 MDL-54021 blocks: Course completion block lang problem 2017-12-08 09:24:03 +08:00
Jake Dallimore
46878ed87f MDL-58272 core_files: get converters from file extension not mimetype 2017-12-08 09:07:29 +08:00
AMOS bot
f1ae118df3 Automatically generated installer lang files 2017-12-08 00:09:38 +00:00
Matt Clarkson
1c06098b6b MDL-60976 dml: Optimise replace_all_text() 
Avoid updating fields that do not match the search string.
 2017-12-08 12:35:56 +13:00
Jun Pataleta
109aa07648 weekly release 3.5dev 2017-12-08 09:09:53 +13:00
Tim Hunt
91c8d8b130 MDL-60983 get_user_capability_course: fix buggy edge cases 
There were basically two problems, which are demostrated by
the new test users u7 and u8 in the unit test.

1. There was a problem if a role was overridden in a context above the
one where it was assigned. E.g. User has teacher role in a course, and
there is a role override in the course-category context. That was being
ignored.

2. Problems with the handling of PROHIBITs. It should be the case that
if there is a PROHIBIT in force, then it cannot be overridden by another
role, or by a role override. However, this was not working in all cases.

Also, I had to add comments to the unit test so that I could understand
it. Hopefully these will be hepful to other developers too.
 2017-12-07 18:28:18 +00:00
Andrew Nicols
f017a30ff3 Merge branch 'MDL-60880-master-fix1' of http://github.com/damyon/moodle 2017-12-07 16:18:28 +08:00
Damyon Wiese
6f7daa5e48 MDL-60880 core_search: Behat fix for clean theme 
The navigation block is visible in clean so "I should not see courses" finds the link in the navigation block
 2017-12-07 15:54:03 +08:00
Jun Pataleta
4ffbf22046 Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle 2017-12-07 17:33:41 +13:00
David Mudrák
9cefe2f2b2 MDL-57564 enrol: Fix typos and copy&paste mistake in the exception msg 2017-12-06 23:15:17 +01:00
David Mudrák
04985346a2 MDL-57564 enrol: Make use of the new default sort parameter 
Now when enrol_get_my_courses(), enrol_get_users_courses() and
enrol_get_all_users_courses() methods automatically reflect the
navsortmycoursessort setting by default, we do not need to manually
compose the sorting any more.
 2017-12-06 23:15:17 +01:00
David Mudrák
c260117d15 MDL-57564 enrol: Add unit tests for the new sorting behaviour 2017-12-06 23:15:17 +01:00