mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
70,514 Commits 36 Branches 519 Tags
Commit Graph

70514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
7a61e645c3 MDL-46527 Grades: Webservice only returns first activity grade. 2014-10-22 11:21:51 +08:00
Damyon Wiese
53f26095c6 Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle 2014-10-22 10:45:57 +08:00
Juan Leyva
a7888487f0 MDL-46527 grades: grade_get_grades external function rewritten 2014-10-21 12:10:01 +02:00
Marina Glancy
b1b66a3d12 Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle 2014-10-21 15:49:10 +08:00
Mark Nelson
7b62567e85 MDL-47736 editor_atto: added fix for IE 9 and 10 2014-10-21 00:46:35 -07:00
Marina Glancy
fb32a64efc Merge branch 'MDL-47736_master_fix' of git://github.com/markn86/moodle 2014-10-21 14:34:05 +08:00
Mark Nelson
3c15d25bcf MDL-47736 editor_atto: exclude <br> from being restored 2014-10-20 23:24:08 -07:00
Damyon Wiese
a6396272f8 Merge branch 'wip_MDL-41593_m28_preventexecdefault' of https://github.com/skodak/moodle 2014-10-21 13:11:27 +08:00
Marina Glancy
e94925ddd2 Merge branch 'MDL-47728_master' of git://github.com/markn86/moodle 2014-10-21 11:56:31 +08:00
Marina Glancy
8b2d85406a Merge branch 'MDL-47400-master-2' of git://github.com/andrewnicols/moodle 2014-10-21 10:55:54 +08:00
Andrew Nicols
82e3440aec MDL-47400 gradereport_history: Fix string notempty test for Oracle 2014-10-21 10:48:28 +08:00
Sam Hemelryk
56f9e921f4 MDL-46133 tool_monitor: version bump for events 2014-10-21 15:22:10 +13:00
Sam Hemelryk
258d9af845 Merge branch 'm28_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle 2014-10-21 15:17:53 +13:00
Sam Hemelryk
7a126c94a4 Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle 2014-10-21 14:44:01 +13:00
Sam Hemelryk
28f1bd0106 Merge branch 'MDL-47695' of git://github.com/timhunt/moodle 2014-10-21 14:42:36 +13:00
Sam Hemelryk
263f8cff7e Merge branch 'MDL-46133_master' of https://github.com/markn86/moodle 2014-10-21 14:39:34 +13:00
Matteo Scaramuccia
8045696b37 MDL-36669 Filters: Remove the last ref to the UFO library. 2014-10-20 23:17:50 +02:00
Dan Poltawski
96b1223387 Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle 2014-10-20 18:28:44 +01:00
Dan Poltawski
83b49754d3 Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle 2014-10-20 18:12:38 +01:00
Dan Poltawski
cf3fbf8a0e Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle 2014-10-20 17:49:02 +01:00
Dan Poltawski
6c75bcb5d6 Merge branch 'MDL-47651' of git://github.com/timhunt/moodle 2014-10-20 17:44:33 +01:00
Dan Poltawski
fb45249754 Merge branch 'MDL-47666' of git://github.com/timhunt/moodle 2014-10-20 17:31:20 +01:00
Dan Poltawski
6366cc0774 Merge branch 'MDL-47711' of git://github.com/timhunt/moodle 2014-10-20 17:28:50 +01:00
Dan Poltawski
30fac84578 Merge branch 'MDL-47726' of git://github.com/timhunt/moodle 2014-10-20 17:26:36 +01:00
Dan Poltawski
670b0d0283 Merge branch 'MDL-47691' of git://github.com/timhunt/moodle 2014-10-20 17:24:22 +01:00
Dan Poltawski
22c4db3ede Merge branch 'MDL-47673' of git://github.com/timhunt/moodle 2014-10-20 17:20:26 +01:00
Tim Hunt
a3d5068083 MDL-47726 availability: fix tests when there is a text custom field 
This unit tests assumed that on a fresh install, there were no custom
user-profile fields. Given some third-party plugins, that assumption is
false.
 2014-10-20 16:15:34 +01:00
Tim Hunt
97ef7ea2ce MDL-47695 quiz editing: descritions don't have a max mark! 
So don't show the UI for editing it.

Also, don't show non-functional page split/join icons after the quiz has
been attempted.
 2014-10-20 15:30:35 +01:00
Dan Poltawski
11c6debb0a Merge branch 'MDL-47588' of git://github.com/timhunt/moodle 2014-10-20 14:30:46 +01:00
Tim Hunt
d69a6ad965 MDL-47711 behat: make it easier to copy the init.php command. 2014-10-20 12:11:28 +01:00
Tim Hunt
1c2e05c060 MDL-47691 quiz: only warn re overdue attempts if a Q has been answered 
If a quiz is set to have a grace period when time has expired, we only
email studnets to warn them about their overdue attempt if they have put
in an answer to at least one question that is worth some marks.
 2014-10-20 12:11:10 +01:00
Tim Hunt
0233e2a973 MDL-47673 quiz generator: default grade 100 & fix review options 
The review option defaults need to be like what you get from the editing
form, no what is stored in the database, or they don't work!
 2014-10-20 12:11:01 +01:00
Tim Hunt
a20d675250 MDL-47666 DB auth & enrol: unit tests fail with custom DB drivers 
Changed to used $DB->get_db_family, rather than hard-coding the list of
class names.
 2014-10-20 12:10:52 +01:00
Tim Hunt
a40eaaa28f MDL-47651 quiz responses: allow for qtypes without responses 2014-10-20 12:10:43 +01:00
Tim Hunt
6f336f3602 MDL-47588 question behat tests: don't close the preview window. 
If you do. Chrome + Selenium2 gets stuck (on Windows at least). Selenium
must be trying to send commands ot a window that does not exist any
more.
 2014-10-20 12:10:15 +01:00
Tim Hunt
a92105fd3f MDL-47588 behat: fix switching back to the main window in Chrome 
This fix is mostly based on what Colin Chambers found out. This commit
is a simplification of his work.

The problem is that the Chrome / Selenium 2 integration cannot swich to
a window with a blank name. The work-around applied here is, when we
switch away from an unnamed window, we set a name on it. Then we can use
that name to switch back.
 2014-10-20 12:10:14 +01:00
Marina Glancy
2d2661e3d7 Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle 2014-10-20 17:08:20 +08:00
Marina Glancy
24c11785b3 Merge branch 'wip_MDL-47754_m28_installredir' of git://github.com/skodak/moodle 2014-10-20 17:02:28 +08:00
Damyon Wiese
eafab79941 MDL-47503 Grades: Display the notice about upgraded grades on all grade report pages. 
Moved this to the print_grade_page_head function and added an access check so it only
displays for teachers.
 2014-10-20 16:15:51 +08:00
Andrew Nicols
a07ec4565f MDL-47400 gradereport_history: Ensure float precision is enforced 
Format floats according to the grade item config.
 2014-10-20 15:42:31 +08:00
Marina Glancy
f75f2ecdf4 Merge branch 'MDL-47489-master' of git://github.com/FMCorz/moodle 2014-10-20 15:19:57 +08:00
Marina Glancy
d90f0cab6d Merge branch 'MDL-47736_master' of git://github.com/markn86/moodle 2014-10-20 15:06:43 +08:00
Marina Glancy
1d67a8f209 Merge branch 'MDL-47725-master' of git://github.com/FMCorz/moodle 2014-10-20 15:06:29 +08:00
Frederic Massart
263bf1a10f MDL-47725 gradereport_user: Only hide grades when they were altered 
The method blank_hidden_total_and_adjust_bounds() now checks for more
than just a grade change, and in that cause would hide the grade. We
added a condition to only hide the grade when it effectively changed,
not when its other properties have.
 2014-10-20 14:19:02 +08:00
Marina Glancy
b3729c99aa Merge branch 'MDL-38065-fix-master' of git://github.com/jmarthaler/moodle 2014-10-20 14:08:06 +08:00
Frederic Massart
40f874ce29 MDL-47489 core_grades: Behat tests covering contributions with extra credit 2014-10-20 13:52:18 +08:00
Frederic Massart
8427dc3a23 MDL-47489 core_grades: Adjust weights of extra credit items for Simple 2014-10-20 13:52:18 +08:00
Frederic Massart
e8ac04c191 MDL-47489 core_grades: Adjust weights of extra credit items for Mean 2014-10-20 13:52:17 +08:00
Mark Nelson
e924e1b33a MDL-47736 editor_atto: only save/restore draft when necessary 2014-10-19 22:14:15 -07:00
Marina Glancy
c57681ed49 Merge branch 'MDL-47737-master' of git://github.com/FMCorz/moodle 2014-10-20 12:43:52 +08:00