John Okely
220602b7f0
MDL-47767 tool_monitor: Add links between subscribe and rule manager
2014-10-24 11:48:12 +02:00
Dan Poltawski
7a811fb63a
Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle
2014-10-24 11:47:59 +02:00
Eloy Lafuente (stronk7)
e739fbcf27
Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle
2014-10-24 11:05:54 +02:00
Marina Glancy
d4a9e66130
MDL-47812 mod_lti: execute upgrade script for all DBs
2014-10-24 14:00:30 +08:00
Damyon Wiese
b0c5a9c491
MDL-47713 Grades: Update all the behat tests to use % in contribution column
2014-10-22 16:20:15 +08:00
Damyon Wiese
8950e7f535
on-demand release 2.8beta+
2014-10-22 15:06:37 +08:00
Damyon Wiese
6a196cf14d
NOBUG: Fixed file access permissions
2014-10-22 15:06:36 +08:00
Damyon Wiese
2746fbe47c
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2014-10-22 15:06:33 +08:00
Damyon Wiese
718f179c22
Merge branch 'MDL-47706-master' of git://github.com/andrewnicols/moodle
2014-10-22 14:50:53 +08:00
Marina Glancy
fca97cbec4
MDL-47673 grades: unittest change caused by generator change
...
Unit test was introduced in MDL-40697 when the generator for quiz activity was setting grade=0
2014-10-22 14:14:49 +08:00
Andrew Nicols
bedcf338dc
MDL-47706 gradebook: Update pageload time between changes
...
Since MDL-38732 we reject changes if another change has been made more
recently. As a result, if process_data is called, and then we roll into the
next millisecond period before process_data is called again, the change is
rejected.
Different errors were seen because the millisecond rollover occurred at
different time within the test.
Different error conditions were seen because not all of the tests check for
an error from the call to process_data(), instead just checking that the
value had been updated correctly.
2014-10-22 12:56:07 +08:00
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
AMOS bot
e15766c19c
Automatically generated installer lang files
2014-10-22 00:07:37 +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
fc9150cb0e
MDL-47713 Grades: Change contribution column to a percent of grademax
2014-10-21 13:50:18 +08: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
