Sam Hemelryk [Thu, 23 Oct 2014 23:02:14 +0000 (12:02 +1300)]
Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:58:36 +0000 (11:58 +1300)]
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)]
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:19:43 +0000 (11:19 +1300)]
Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)]
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
Sam Hemelryk [Thu, 23 Oct 2014 20:58:53 +0000 (09:58 +1300)]
Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
gdharris [Fri, 15 Aug 2014 19:31:48 +0000 (15:31 -0400)]
MDL-46853 calendar: fix import of no duration events
Dan Poltawski [Thu, 23 Oct 2014 16:30:28 +0000 (17:30 +0100)]
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)]
Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 22 Oct 2014 08:49:00 +0000 (16:49 +0800)]
MDL-47815 assign: Fix random unit test fails
This test was failing when it was run really slowly (looking at you oracle).
Dan Poltawski [Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)]
Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle
Juan Leyva [Thu, 23 Oct 2014 13:24:07 +0000 (15:24 +0200)]
MDL-47847 Web Services: Add messaging functions to the mobile service
Dan Poltawski [Thu, 23 Oct 2014 15:31:24 +0000 (16:31 +0100)]
Merge branch '47752-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:31:08 +0000 (16:31 +0100)]
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:17:49 +0000 (16:17 +0100)]
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:16:07 +0000 (16:16 +0100)]
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:13:11 +0000 (16:13 +0100)]
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 22 Oct 2014 08:50:21 +0000 (16:50 +0800)]
MDL-47814 core_grades: Improved coverage of user_graded event tests
The tests needed to use the API in order to trigger the user_graded
event that occurs when the course final grade has changed.
Dan Poltawski [Thu, 23 Oct 2014 09:50:01 +0000 (10:50 +0100)]
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
John Okely [Tue, 21 Oct 2014 04:18:19 +0000 (12:18 +0800)]
MDL-47767 tool_monitor: Use renderers for links between subscription and rule managers
Dan Poltawski [Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)]
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
John Okely [Mon, 20 Oct 2014 09:01:08 +0000 (17:01 +0800)]
MDL-47767 tool_monitor: Add links between subscribe and rule manager
Dan Poltawski [Thu, 23 Oct 2014 09:19:53 +0000 (10:19 +0100)]
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)]
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 23 Oct 2014 09:09:32 +0000 (17:09 +0800)]
Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle
Dave Cooper [Thu, 23 Oct 2014 07:08:14 +0000 (15:08 +0800)]
MDL-47689 user: Add duplicate field check to avoid oracle db error.
Marina Glancy [Thu, 23 Oct 2014 08:57:56 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 23 Oct 2014 08:35:59 +0000 (16:35 +0800)]
Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 23 Oct 2014 08:09:29 +0000 (16:09 +0800)]
Merge branch '47077-28' of git://github.com/samhemelryk/moodle
Frederic Massart [Mon, 20 Oct 2014 07:24:45 +0000 (15:24 +0800)]
MDL-47762 gradereport_user: Hide contribution and weights when relevant
The contribution and weight columns should be hidden when the course
total is because they can be used to compute the hidden course total.
Damyon Wiese [Thu, 23 Oct 2014 07:47:10 +0000 (15:47 +0800)]
Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle
Marina Glancy [Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)]
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 07:42:46 +0000 (15:42 +0800)]
Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 23 Oct 2014 07:38:35 +0000 (15:38 +0800)]
Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle
Damyon Wiese [Thu, 23 Oct 2014 03:22:10 +0000 (11:22 +0800)]
MDL-47763 Grades: Handle the case when a grade category is hidden.
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
Marina Glancy [Thu, 23 Oct 2014 07:23:52 +0000 (15:23 +0800)]
Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle
Adrian Greeve [Thu, 23 Oct 2014 07:05:32 +0000 (15:05 +0800)]
MDL-43245 mod_lesson: Add string for essay grading permission.
Marina Glancy [Thu, 23 Oct 2014 07:21:28 +0000 (15:21 +0800)]
Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle
Damyon Wiese [Thu, 23 Oct 2014 03:31:55 +0000 (11:31 +0800)]
MDL-47836 Grades: Fix the url for the upgraded grades warning page url.
Dan Poltawski [Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)]
Merge branch 'MDL-47713-master-fix1' of github.com/damyon/moodle
Jetha Chan [Thu, 23 Oct 2014 03:58:11 +0000 (11:58 +0800)]
MDL-47819 user_menu: fixed showing up in popups
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:37:24 +0000 (13:37 +0800)]
MDL-47713 Grades: Fix new behat test after conversion from points to %
The contribution to course total column was changed from points to % but
this new test was submitted using points. It just needs the numbers converted
to %.
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
Dan Poltawski [Wed, 22 Oct 2014 09:49:07 +0000 (10:49 +0100)]
Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 23 Oct 2014 04:02:22 +0000 (12:02 +0800)]
Merge branch 'MDL-32616' of git://github.com/timhunt/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
Andrew Nicols [Tue, 14 Oct 2014 01:41:48 +0000 (09:41 +0800)]
MDL-47513 Fix RTL issues with grade report
Andrew Nicols [Thu, 23 Oct 2014 00:43:29 +0000 (08:43 +0800)]
MDL-47808 mod_forum: Correct maxeditingtime for unit tests
The maxeditingtime needs to be a negative value for unit tests to ensure
that the messages are actually sent out.
Whilst fixing this I also discovered that the create_discussion part of the
generator also creates the first post.
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
Frederic Massart [Wed, 15 Oct 2014 07:49:55 +0000 (15:49 +0800)]
MDL-47637 core_grades: Outcomes must not be weighted when non aggregated
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
Mark Nelson [Sun, 12 Oct 2014 00:35:30 +0000 (17:35 -0700)]
MDL-47153 tool_monitor: altered unit tests to pass
Mark Nelson [Thu, 9 Oct 2014 03:36:50 +0000 (20:36 -0700)]
MDL-47153 tool_monitor: added subscription_criteria_met event
Mark Nelson [Wed, 8 Oct 2014 06:14:48 +0000 (23:14 -0700)]
MDL-47153 tool_monitor: added subscription_deleted event
Mark Nelson [Sun, 5 Oct 2014 22:59:29 +0000 (15:59 -0700)]
MDL-47153 tool_monitor: added subscription_created event
Mark Nelson [Sun, 5 Oct 2014 22:35:47 +0000 (15:35 -0700)]
MDL-47153 tool_monitor: added rule_deleted event
Mark Nelson [Sun, 5 Oct 2014 22:07:52 +0000 (15:07 -0700)]
MDL-47153 tool_monitor: added rule_updated event
Mark Nelson [Sun, 5 Oct 2014 21:34:23 +0000 (14:34 -0700)]
MDL-47153 tool_monitor: added rule_created event
AMOS bot [Tue, 21 Oct 2014 16:07:37 +0000 (00:07 +0800)]
Automatically generated installer lang files
Gareth J Barnard [Tue, 21 Oct 2014 14:37:31 +0000 (15:37 +0100)]
MDL-47795 SCORM: SCORM report not a report.
Tim Hunt [Tue, 21 Oct 2014 14:03:20 +0000 (15:03 +0100)]
MDL-47791 question editing: remove permission info from above the form
This information is not really meaningful for users, and takes up prime
real-estate, so we are removing it.
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
Damyon Wiese [Wed, 3 Sep 2014 03:39:21 +0000 (11:39 +0800)]
MDL-20367 Grades: Allow real numbers as grade boundaries
Patch by Huy Hoang (I just git-ified it).
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.