Adrian Greeve [Thu, 23 Oct 2014 07:05:32 +0000 (15:05 +0800)]
MDL-43245 mod_lesson: Add string for essay grading permission.
Damyon Wiese [Thu, 23 Oct 2014 06:24:47 +0000 (14:24 +0800)]
Merge branch 'MDL-47740' of git://github.com/timhunt/moodle
Damyon Wiese [Thu, 23 Oct 2014 05:52:15 +0000 (13:52 +0800)]
Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle
Jean-Michel Vedrine [Thu, 16 Oct 2014 19:46:27 +0000 (21:46 +0200)]
MDL-43245 Lesson: non editing teacher cannot grade lesson essay
Damyon Wiese [Thu, 23 Oct 2014 04:02:22 +0000 (12:02 +0800)]
Merge branch 'MDL-32616' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 22 Oct 2014 09:49:07 +0000 (10:49 +0100)]
Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Fri, 24 Oct 2014 09:05:54 +0000 (11:05 +0200)]
Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle
Marina Glancy [Fri, 24 Oct 2014 06:00:30 +0000 (14:00 +0800)]
MDL-47812 mod_lti: execute upgrade script for all DBs
Damyon Wiese [Wed, 22 Oct 2014 08:20:15 +0000 (16:20 +0800)]
MDL-47713 Grades: Update all the behat tests to use % in contribution column
Damyon Wiese [Wed, 22 Oct 2014 07:06:37 +0000 (15:06 +0800)]
on-demand release 2.8beta+
Damyon Wiese [Wed, 22 Oct 2014 07:06:36 +0000 (15:06 +0800)]
NOBUG: Fixed file access permissions
Damyon Wiese [Wed, 22 Oct 2014 07:06:33 +0000 (15:06 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Wed, 22 Oct 2014 06:50:53 +0000 (14:50 +0800)]
Merge branch 'MDL-47706-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 22 Oct 2014 06:14:49 +0000 (14:14 +0800)]
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
Andrew Nicols [Wed, 22 Oct 2014 04:56:07 +0000 (12:56 +0800)]
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.
Damyon Wiese [Wed, 22 Oct 2014 02:56:03 +0000 (10:56 +0800)]
MDL-46527 Grades: Webservice only returns first activity grade.
Damyon Wiese [Wed, 22 Oct 2014 02:45:57 +0000 (10:45 +0800)]
Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle
AMOS bot [Tue, 21 Oct 2014 16:07:37 +0000 (00:07 +0800)]
Automatically generated installer lang files
Tim Hunt [Fri, 17 Oct 2014 13:34:20 +0000 (14:34 +0100)]
MDL-47740 question engine: let qs update variant later if appropriate
Variant has two purposes. First to determine which version of the
question the student will see. Hence it is used to set up the state
of the quetsion when the question is started. Then the internal state of
the question is saved in the first step.
Once that has been done, the variant number is purely informative, and
just used to break down the statistics.
In some cases (the one I have in mind is qtype_opaque) then there is a
complex randomisation process, which may lead to several inital variant
numbers acutally giving the same version of the question. In this case
it is nice if the question can update the stored variant number, to make
the statistics more meaningful.
Juan Leyva [Tue, 14 Oct 2014 15:12:39 +0000 (17:12 +0200)]
MDL-46527 grades: grade_get_grades external function rewritten
Marina Glancy [Tue, 21 Oct 2014 07:49:10 +0000 (15:49 +0800)]
Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle
Mark Nelson [Tue, 21 Oct 2014 07:30:10 +0000 (00:30 -0700)]
MDL-47736 editor_atto: added fix for IE 9 and 10
Marina Glancy [Tue, 21 Oct 2014 06:34:05 +0000 (14:34 +0800)]
Merge branch 'MDL-47736_master_fix' of git://github.com/markn86/moodle
Mark Nelson [Tue, 21 Oct 2014 05:49:59 +0000 (22:49 -0700)]
MDL-47736 editor_atto: exclude <br> from being restored
Damyon Wiese [Tue, 21 Oct 2014 05:34:08 +0000 (13:34 +0800)]
MDL-47713 Grades: Change contribution column to a percent of grademax
Damyon Wiese [Tue, 21 Oct 2014 05:11:27 +0000 (13:11 +0800)]
Merge branch 'wip_MDL-41593_m28_preventexecdefault' of https://github.com/skodak/moodle
Marina Glancy [Tue, 21 Oct 2014 03:56:31 +0000 (11:56 +0800)]
Merge branch 'MDL-47728_master' of git://github.com/markn86/moodle
Marina Glancy [Tue, 21 Oct 2014 02:55:54 +0000 (10:55 +0800)]
Merge branch 'MDL-47400-master-2' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 21 Oct 2014 02:48:28 +0000 (10:48 +0800)]
MDL-47400 gradereport_history: Fix string notempty test for Oracle
Sam Hemelryk [Tue, 21 Oct 2014 02:22:10 +0000 (15:22 +1300)]
MDL-46133 tool_monitor: version bump for events
Sam Hemelryk [Tue, 21 Oct 2014 02:17:53 +0000 (15:17 +1300)]
Merge branch 'm28_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle
Sam Hemelryk [Tue, 21 Oct 2014 01:44:01 +0000 (14:44 +1300)]
Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 21 Oct 2014 01:42:36 +0000 (14:42 +1300)]
Merge branch 'MDL-47695' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 21 Oct 2014 01:39:34 +0000 (14:39 +1300)]
Merge branch 'MDL-46133_master' of https://github.com/markn86/moodle
Matteo Scaramuccia [Mon, 6 Oct 2014 21:02:41 +0000 (23:02 +0200)]
MDL-36669 Filters: Remove the last ref to the UFO library.
Dan Poltawski [Mon, 20 Oct 2014 17:28:44 +0000 (18:28 +0100)]
Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 20 Oct 2014 17:12:38 +0000 (18:12 +0100)]
Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:49:02 +0000 (17:49 +0100)]
Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:44:33 +0000 (17:44 +0100)]
Merge branch 'MDL-47651' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:31:20 +0000 (17:31 +0100)]
Merge branch 'MDL-47666' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:28:50 +0000 (17:28 +0100)]
Merge branch 'MDL-47711' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:26:36 +0000 (17:26 +0100)]
Merge branch 'MDL-47726' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:24:22 +0000 (17:24 +0100)]
Merge branch 'MDL-47691' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Oct 2014 16:20:26 +0000 (17:20 +0100)]
Merge branch 'MDL-47673' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 20 Oct 2014 14:53:19 +0000 (15:53 +0100)]
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.
Tim Hunt [Wed, 15 Oct 2014 18:02:26 +0000 (19:02 +0100)]
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.
Dan Poltawski [Mon, 20 Oct 2014 13:30:46 +0000 (14:30 +0100)]
Merge branch 'MDL-47588' of git://github.com/timhunt/moodle
Tim Hunt [Thu, 16 Oct 2014 10:08:46 +0000 (11:08 +0100)]
MDL-47711 behat: make it easier to copy the init.php command.
Tim Hunt [Wed, 15 Oct 2014 15:31:25 +0000 (16:31 +0100)]
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.
Tim Hunt [Tue, 14 Oct 2014 16:06:49 +0000 (17:06 +0100)]
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!
Tim Hunt [Tue, 14 Oct 2014 10:37:27 +0000 (11:37 +0100)]
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.
Tim Hunt [Mon, 13 Oct 2014 16:32:22 +0000 (17:32 +0100)]
MDL-47651 quiz responses: allow for qtypes without responses
Tim Hunt [Tue, 14 Oct 2014 14:10:59 +0000 (15:10 +0100)]
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.
Tim Hunt [Tue, 14 Oct 2014 13:35:30 +0000 (14:35 +0100)]
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.
Tim Hunt [Thu, 25 Sep 2014 11:38:16 +0000 (12:38 +0100)]
MDL-32616 question engine: set_max_mark_in_attempts MySQL perf
The MySQL (& Maria DB) query 'optimizer' was failing to handle this
query, so for that DB only, we give it an equivalent query that it can
get right.
With unit test.
Tim Hunt [Thu, 25 Sep 2014 11:37:01 +0000 (12:37 +0100)]
MDL-32616 question engine: move unit test to better name
Marina Glancy [Mon, 20 Oct 2014 09:08:20 +0000 (17:08 +0800)]
Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 20 Oct 2014 09:02:28 +0000 (17:02 +0800)]
Merge branch 'wip_MDL-47754_m28_installredir' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 20 Oct 2014 08:14:07 +0000 (16:14 +0800)]
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.
Andrew Nicols [Mon, 20 Oct 2014 07:10:32 +0000 (15:10 +0800)]
MDL-47400 gradereport_history: Ensure float precision is enforced
Format floats according to the grade item config.
Marina Glancy [Mon, 20 Oct 2014 07:19:57 +0000 (15:19 +0800)]
Merge branch 'MDL-47489-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 20 Oct 2014 07:06:43 +0000 (15:06 +0800)]
Merge branch 'MDL-47736_master' of git://github.com/markn86/moodle
Marina Glancy [Mon, 20 Oct 2014 07:06:29 +0000 (15:06 +0800)]
Merge branch 'MDL-47725-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 20 Oct 2014 06:19:02 +0000 (14:19 +0800)]
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.
Marina Glancy [Mon, 20 Oct 2014 06:08:06 +0000 (14:08 +0800)]
Merge branch 'MDL-38065-fix-master' of git://github.com/jmarthaler/moodle
Frederic Massart [Fri, 10 Oct 2014 07:56:17 +0000 (15:56 +0800)]
MDL-47489 core_grades: Behat tests covering contributions with extra credit
Frederic Massart [Fri, 10 Oct 2014 04:42:13 +0000 (12:42 +0800)]
MDL-47489 core_grades: Adjust weights of extra credit items for Simple
Frederic Massart [Fri, 10 Oct 2014 03:47:58 +0000 (11:47 +0800)]
MDL-47489 core_grades: Adjust weights of extra credit items for Mean
Mark Nelson [Mon, 20 Oct 2014 02:53:02 +0000 (19:53 -0700)]
MDL-47736 editor_atto: only save/restore draft when necessary
Marina Glancy [Mon, 20 Oct 2014 04:43:52 +0000 (12:43 +0800)]
Merge branch 'MDL-47737-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Fri, 17 Oct 2014 04:16:18 +0000 (12:16 +0800)]
MDL-47503 Grades: Completely remove aggregationsubcats
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
Frederic Massart [Thu, 9 Oct 2014 07:25:55 +0000 (15:25 +0800)]
MDL-47489 core_grades: Adjust weights of extra credit items for Natural
Frederic Massart [Fri, 17 Oct 2014 10:57:15 +0000 (18:57 +0800)]
MDL-47739 form: Calendar widget causes unintentional focus and scroll
Mark Nelson [Sat, 18 Oct 2014 02:23:29 +0000 (19:23 -0700)]
MDL-47735 mod_forum: added 'My profile' -> 'Forum posts' behat test
Petr Skoda [Sun, 19 Oct 2014 23:52:35 +0000 (12:52 +1300)]
MDL-47754 install: fix redirect loop
Mark Nelson [Sun, 19 Oct 2014 03:15:35 +0000 (20:15 -0700)]
MDL-47728 tool_monitor: added capability check before displaying link
Mark Nelson [Sat, 18 Oct 2014 01:18:11 +0000 (18:18 -0700)]
MDL-47735 core: prevented iteration of 'groupmembersonly'
The course module variable 'groupmembersonly' was removed in 2.8.
Jean-Michel Vedrine [Sun, 12 Oct 2014 13:01:41 +0000 (15:01 +0200)]
MDL-38172 Lesson: Additional Info not displayed at end of lesson
Dan Poltawski [Fri, 17 Oct 2014 15:02:28 +0000 (16:02 +0100)]
on-demand release 2.8beta+
Dan Poltawski [Fri, 17 Oct 2014 13:46:30 +0000 (14:46 +0100)]
Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 17 Oct 2014 13:32:19 +0000 (14:32 +0100)]
on-demand release 2.8beta+
Dan Poltawski [Fri, 17 Oct 2014 13:32:19 +0000 (14:32 +0100)]
NOBUG: Fixed file access permissions
Dan Poltawski [Fri, 17 Oct 2014 13:27:49 +0000 (14:27 +0100)]
Revert "MDL-47684 mod: better validation of rating options"
This reverts commit
8028df293a4f024a954dc12ed4e6cb5161c951b0.
Frederic Massart [Fri, 17 Oct 2014 12:48:43 +0000 (20:48 +0800)]
MDL-47737 editor_atto: Prevent false negative when saving draft on IE9
Dan Poltawski [Fri, 17 Oct 2014 10:44:58 +0000 (11:44 +0100)]
Merge branch 'MDL-47733-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 17 Oct 2014 10:19:11 +0000 (18:19 +0800)]
MDL-47733 editor_atto: Do not prompt error when draft is empty
Dan Poltawski [Fri, 17 Oct 2014 08:34:39 +0000 (09:34 +0100)]
Merge branch 'MDL-45843-master-fix1' of github.com/damyon/moodle
Dan Poltawski [Fri, 17 Oct 2014 08:30:38 +0000 (09:30 +0100)]
Revert "MDL-44548 mod_scorm: force an external sync to check for updated files."
This reverts commit
2d9a4a5f93169207a166d6d7a7426652e2bf83a1.
Damyon Wiese [Fri, 17 Oct 2014 08:21:35 +0000 (16:21 +0800)]
MDL-45843 LTI: Fixes for sloppy form handling
Eloy Lafuente (stronk7) [Fri, 17 Oct 2014 07:37:55 +0000 (09:37 +0200)]
Merge branch 'MDL-47655-master-fix1' of git://github.com/damyon/moodle
Marina Glancy [Fri, 17 Oct 2014 07:22:32 +0000 (15:22 +0800)]
MDL-47290 Grades: added bold for course total
Barbara Ramiro [Wed, 8 Oct 2014 09:10:23 +0000 (17:10 +0800)]
MDL-47290 Grades: Minified CSS and applied coding style standards
Barbara Ramiro [Wed, 8 Oct 2014 08:42:14 +0000 (16:42 +0800)]
MDL-47290 Grades: Style for the Single view table
Barbara Ramiro [Wed, 8 Oct 2014 08:39:38 +0000 (16:39 +0800)]
MDL-47363 Grades: Style for the Setup grades
Barbara Ramiro [Wed, 8 Oct 2014 08:37:50 +0000 (16:37 +0800)]
MDL-47363 Grades: Style for the User report
Andrew Nicols [Fri, 17 Oct 2014 05:28:46 +0000 (13:28 +0800)]
MDL-47664 phpunit: Do not use sequence number changes for Oracle
When resetting a sequence number, we call change_database_structure()
which in turns clears the MUC cache for databasemeta. This cache contains
information about the table, columns, etc.
After the cache is cleared, it must be re-filled, and it was discovered
that the get_columns() code which fills this cache can take a particularly
long time. Given that this is called for every table in Moodle, this can
add up to a significant period, and this is done on a per-testsuite basis.
On my SSD install this was taking approximately 40 seconds on each re-fill
of the cache.
Marina Glancy [Fri, 17 Oct 2014 04:25:44 +0000 (12:25 +0800)]
MDL-18229 gradebook: missing 'use' in singleview
Zachary Durber [Fri, 17 Oct 2014 03:56:39 +0000 (11:56 +0800)]
MDL-18229 gradebook: Fixes for Singleview behat tests.
Mark Nelson [Fri, 3 Oct 2014 20:01:56 +0000 (13:01 -0700)]
MDL-46133 tool_monitor: added unit tests
Mark Nelson [Thu, 2 Oct 2014 23:50:05 +0000 (16:50 -0700)]
MDL-46133 tool_monitor: added event cleanup task