Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)]
Merge branch '48026-28' of git://github.com/samhemelryk/moodle
John Okely [Fri, 31 Oct 2014 02:29:24 +0000 (10:29 +0800)]
MDL-47862 tool_monitor: Fix tool monitor navigation tree
Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear
John Okely [Mon, 27 Oct 2014 07:36:36 +0000 (15:36 +0800)]
MDL-47862 event_monitor: Fix context for capability check on subscription page
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:22:32 +0000 (00:22 +0100)]
Merge branch 'MDL-47990' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:01:01 +0000 (00:01 +0100)]
Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle
Sam Hemelryk [Wed, 5 Nov 2014 22:55:46 +0000 (11:55 +1300)]
Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 20:34:37 +0000 (21:34 +0100)]
Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 5 Nov 2014 16:24:14 +0000 (16:24 +0000)]
Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle
Dan Poltawski [Wed, 5 Nov 2014 14:27:12 +0000 (14:27 +0000)]
Merge branch 'MDL-47874' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:11:16 +0000 (12:11 +0000)]
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php
Dan Poltawski [Wed, 5 Nov 2014 12:05:58 +0000 (12:05 +0000)]
Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:03:48 +0000 (12:03 +0000)]
Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:00:19 +0000 (12:00 +0000)]
Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 5 Nov 2014 11:42:37 +0000 (11:42 +0000)]
MDL-47922 tool_monitor: bump version
Dan Poltawski [Wed, 5 Nov 2014 11:18:22 +0000 (11:18 +0000)]
Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 5 Nov 2014 11:03:57 +0000 (11:03 +0000)]
Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle
Andrew Nicols [Mon, 3 Nov 2014 01:49:00 +0000 (09:49 +0800)]
MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs
This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.
Dan Poltawski [Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)]
Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle
Damyon Wiese [Wed, 5 Nov 2014 08:54:32 +0000 (16:54 +0800)]
Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 5 Nov 2014 08:52:07 +0000 (16:52 +0800)]
Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle
Marina Glancy [Wed, 5 Nov 2014 08:35:05 +0000 (16:35 +0800)]
Merge branch 'MDL-47390-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 5 Nov 2014 07:39:27 +0000 (15:39 +0800)]
Merge branch '48025-28' of git://github.com/samhemelryk/moodle
Simey Lameze [Wed, 5 Nov 2014 06:00:06 +0000 (14:00 +0800)]
MDL-48047 gradebook: change the missing ID number to checkbox on XML export
Damyon Wiese [Wed, 5 Nov 2014 07:22:55 +0000 (15:22 +0800)]
Merge branch 'MDL-47893-master-fix' of https://github.com/zbdd/moodle
Damyon Wiese [Wed, 5 Nov 2014 07:12:56 +0000 (15:12 +0800)]
Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle
Frederic Massart [Wed, 5 Nov 2014 07:06:27 +0000 (15:06 +0800)]
MDL-48068 tool_monitor: Link to course points to the right course
Simey Lameze [Wed, 5 Nov 2014 06:57:53 +0000 (14:57 +0800)]
MDL-47360 tool_monitor: add more help link and default template message
Andrew Nicols [Wed, 5 Nov 2014 01:09:02 +0000 (09:09 +0800)]
MDL-48054 mod_forum: Fix unit test failures
These sporadic unit test failures were happening because the post time and
subscription time sometimes differ depending on the amount of time it takes
to complete the different components of the test.
To reliably address these issues, the post creation, and the discussion
subscription times are manually updated by different factors to ensure a
more realistic state of affairs.
Zachary Durber [Wed, 5 Nov 2014 06:11:55 +0000 (14:11 +0800)]
MDL-47893 gradebook: Fix for bulk updating single view.
Damyon Wiese [Wed, 5 Nov 2014 06:38:11 +0000 (14:38 +0800)]
Merge branch 'wip-MDL-46262-master' of git://github.com/marinaglancy/moodle
Jetha Chan [Wed, 5 Nov 2014 06:37:33 +0000 (14:37 +0800)]
MDL-48067 user_menu: allow empty customusermenuitems setting
Damyon Wiese [Wed, 5 Nov 2014 06:27:58 +0000 (14:27 +0800)]
MDL-47793 assign: trivial fix for inconsistent use of get_instance()
Damyon Wiese [Wed, 5 Nov 2014 06:25:22 +0000 (14:25 +0800)]
Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle
Damyon Wiese [Wed, 5 Nov 2014 06:18:07 +0000 (14:18 +0800)]
Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 5 Nov 2014 06:05:32 +0000 (14:05 +0800)]
Merge branch 'MDL-47902_scorm_inappropriate_default_values' of https://github.com/MorrisR2/moodle
Damyon Wiese [Wed, 5 Nov 2014 05:57:08 +0000 (13:57 +0800)]
MDL-27930 lesson: Remove custom styling from timer
Damyon Wiese [Wed, 5 Nov 2014 05:34:07 +0000 (13:34 +0800)]
Merge branch 'MDL-27930' of git://github.com/jmvedrine/moodle
Zachary Durber [Mon, 3 Nov 2014 06:13:02 +0000 (14:13 +0800)]
MDL-48031 gradebook: Fix for bulk updating users in single view.
Ankit Agarwal [Mon, 3 Nov 2014 06:06:06 +0000 (11:36 +0530)]
MDL-47922 behat: Add a behat test
Ankit Agarwal [Thu, 30 Oct 2014 06:59:07 +0000 (12:29 +0530)]
MDL-47922 tests: Enable tool monitor in various tests
Ankit Agarwal [Mon, 3 Nov 2014 06:06:25 +0000 (11:36 +0530)]
MDL-47922 tool_monitor: Add a config to disable the tool
Andrew Nicols [Wed, 5 Nov 2014 00:45:46 +0000 (08:45 +0800)]
MDL-48061 mod_forum: Tidy up reply-by-email information in emails
* Add a reminder to remove the original message; and
* Remove the reply-to address from the text.
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 00:16:05 +0000 (01:16 +0100)]
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
Helen Foster [Tue, 4 Nov 2014 20:55:26 +0000 (21:55 +0100)]
MDL-48035 Merge English strings from the en_fix language pack
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 16:52:35 +0000 (17:52 +0100)]
MDL-48021 bump: Bump all versions to planned release
This bumps all versions to planned 2.8 release
(
2014111000) version and all the dependencies to
current 2.8rc1 (
2014110400)
Dan Poltawski [Tue, 4 Nov 2014 16:50:47 +0000 (16:50 +0000)]
Merge branch 'MDL-47893-master' of git://github.com/zbdd/moodle
Dan Poltawski [Tue, 4 Nov 2014 16:30:17 +0000 (16:30 +0000)]
Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle
Jean-Michel Vedrine [Sat, 25 Oct 2014 18:35:02 +0000 (20:35 +0200)]
MDL-27930 Lesson: the count-down timer does not work
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 10:45:59 +0000 (11:45 +0100)]
Moodle release 2.8rc1
Damyon Wiese [Tue, 4 Nov 2014 08:50:25 +0000 (16:50 +0800)]
MDL-48050 Libraries - fake HTTPS detection needs the correct port
Andrew Nicols [Fri, 31 Oct 2014 00:54:02 +0000 (08:54 +0800)]
MDL-47390 mod_forum: Correct check for groups when subscribing
Andrew Nicols [Tue, 28 Oct 2014 06:25:51 +0000 (14:25 +0800)]
MDL-47390 mod_forum: Add discussion unsub to email footer
Mark Nelson [Tue, 4 Nov 2014 07:48:26 +0000 (23:48 -0800)]
MDL-47361 tool_monitor: added missing column
Also reworded a string as the fields have been renamed.
Andrew Nicols [Tue, 4 Nov 2014 07:45:38 +0000 (15:45 +0800)]
MDL-48044 mod_forum: Preload icons for discussion subscription toggles
Andrew Nicols [Tue, 4 Nov 2014 06:57:15 +0000 (14:57 +0800)]
MDL-47944 mod_forum: Improve discussion subscription icon/link
* make the link text clickable
* changes the link text when unsubscribed to the action text "Subscribe"
Damyon Wiese [Tue, 4 Nov 2014 06:34:43 +0000 (14:34 +0800)]
Merge branch 'MDL-47806' of github.com:mr-russ/moodle
Damyon Wiese [Tue, 4 Nov 2014 06:17:46 +0000 (14:17 +0800)]
Merge branch 'MDL-47810_master-fix-MDL-47758-changes' of git://github.com/dmonllao/moodle
Zachary Durber [Fri, 31 Oct 2014 07:39:34 +0000 (15:39 +0800)]
MDL-47893 gradebook: Progress bar and continues for grade saving.
When you save a grade you are notified of how many grades have
been updated and any warnings.
Damyon Wiese [Tue, 4 Nov 2014 05:47:51 +0000 (13:47 +0800)]
Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle
David Monllao [Tue, 4 Nov 2014 03:53:19 +0000 (11:53 +0800)]
MDL-47810 tool_monitor: Updating behat scenarios introduced in MDL-47758
Marina Glancy [Tue, 4 Nov 2014 02:47:09 +0000 (10:47 +0800)]
Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 01:03:11 +0000 (02:03 +0100)]
Merge branch 'MDL-47883-master-foundlangfile' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:59:23 +0000 (01:59 +0100)]
Merge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:56:59 +0000 (01:56 +0100)]
Merge branch '47969-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:55:08 +0000 (01:55 +0100)]
Merge branch '47968-28' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 3 Nov 2014 19:52:26 +0000 (08:52 +1300)]
MDL-47868 ws: verify upload areas
Petr Skoda [Mon, 3 Nov 2014 19:41:34 +0000 (08:41 +1300)]
MDL-48013 calendar: force download of user files
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:20:51 +0000 (01:20 +0100)]
Merge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 3 Nov 2014 23:03:42 +0000 (00:03 +0100)]
Merge branch '47917-28' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 3 Nov 2014 22:46:57 +0000 (11:46 +1300)]
MDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors
Frederic Massart [Thu, 30 Oct 2014 06:34:24 +0000 (14:34 +0800)]
MDL-47965 tag: Enforcing security of tag auto completion
David Monllao [Wed, 29 Oct 2014 06:00:31 +0000 (14:00 +0800)]
MDL-47924 mod_lti: Fixing missing sesskey checkings
Also fixing a missing capability checking.
Yuliya Bozhko [Mon, 27 Oct 2014 18:47:05 +0000 (07:47 +1300)]
MDL-47190 Ensure badges cannot be awarded without a role
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Frederic Massart [Tue, 28 Oct 2014 04:04:08 +0000 (12:04 +0800)]
MDL-47321 iplookup: Prevent guest users from using iplookup
Adrian Greeve [Tue, 28 Oct 2014 02:11:55 +0000 (10:11 +0800)]
MDL-47697 mod_data: Fix group id change when editing.
When a teacher edits an entry in the database module
it would change the group ID to the one that the teacher
currently had selected.
Thanks to Steve Bond for providing a patch.
Juan Leyva [Wed, 23 Jul 2014 21:42:25 +0000 (23:42 +0200)]
MDL-45303 Web Services: forum_discussions not checking groups
Juan Leyva [Thu, 23 Oct 2014 09:05:57 +0000 (11:05 +0200)]
MDL-47766 web services: get_grades exposes hidden grades to students
John Okely [Wed, 29 Oct 2014 02:50:25 +0000 (10:50 +0800)]
MDL-47921 mod_lti: Add access control to mod/lti/launch.php
Dave Cooper [Tue, 28 Oct 2014 08:40:58 +0000 (16:40 +0800)]
MDL-47050 core_wordlist: Updated wordlist to include only animals.
Dan Poltawski [Mon, 3 Nov 2014 15:20:58 +0000 (15:20 +0000)]
Merge branch 'MDL-47864_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 3 Nov 2014 15:03:51 +0000 (15:03 +0000)]
Merge branch 'MDL-47810_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 3 Nov 2014 15:01:59 +0000 (15:01 +0000)]
Merge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 3 Nov 2014 14:21:50 +0000 (14:21 +0000)]
MDL-47361 tool_monitor: exit after printing footer
Dan Poltawski [Mon, 3 Nov 2014 13:55:31 +0000 (13:55 +0000)]
Merge branch 'MDL-47361_master' of https://github.com/markn86/moodle
Conflicts:
admin/tool/monitor/edit.php
admin/tool/monitor/lang/en/tool_monitor.php
Dan Poltawski [Mon, 3 Nov 2014 12:28:33 +0000 (12:28 +0000)]
Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle
Conflicts:
mod/forum/version.php
mod/forum/db/upgrade.php
Andrew Nicols [Mon, 3 Nov 2014 01:25:23 +0000 (09:25 +0800)]
MDL-48020 mod_forum: Add missing sesskey check in AJAX subscription
Marina Glancy [Mon, 3 Nov 2014 09:21:55 +0000 (17:21 +0800)]
Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 3 Nov 2014 09:15:25 +0000 (17:15 +0800)]
Merge branch 'MDL-48010' of git://github.com/timhunt/moodle
Petr Skoda [Thu, 18 Sep 2014 02:29:21 +0000 (14:29 +1200)]
MDL-47287 prevent web access to phpunit boostrap
Marina Glancy [Mon, 3 Nov 2014 09:03:57 +0000 (17:03 +0800)]
Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle
David Monllao [Mon, 3 Nov 2014 01:32:02 +0000 (09:32 +0800)]
MDL-47810 tool_monitor: action_link when there is only 1 option
When the rule plugin is not a module you can subscribe
to it without having to select to which module instance
you want to subscribe, so there is no need to display
a drop down menu.
Andreas Grabs [Sun, 26 Oct 2014 19:37:52 +0000 (20:37 +0100)]
MDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php
Damyon Wiese [Tue, 28 Oct 2014 09:24:35 +0000 (17:24 +0800)]
MDL-47926 LTI: Fix missing sesskey checks and add content type headers to redirect
Damyon Wiese [Mon, 3 Nov 2014 06:10:43 +0000 (14:10 +0800)]
Merge branch 'wip-MDL-45538-master' of git://github.com/marinaglancy/moodle
Conflicts:
version.php
Damyon Wiese [Mon, 3 Nov 2014 05:50:38 +0000 (13:50 +0800)]
Merge branch 'MDL-26447_master' of https://github.com/crazyserver/moodle
David Monllao [Mon, 3 Nov 2014 03:01:50 +0000 (11:01 +0800)]
MDL-47983 tool_monitor: Removing only-for-admins restriction
Mark Nelson [Fri, 31 Oct 2014 01:05:44 +0000 (18:05 -0700)]
MDL-47361 tool_monitor: altered behat tests so they pass
Damyon Wiese [Mon, 3 Nov 2014 04:20:58 +0000 (12:20 +0800)]
Merge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 3 Nov 2014 03:29:42 +0000 (11:29 +0800)]
MDL-48006 Atto autosave: Never restore text that is empty.
Mark Nelson [Thu, 2 Oct 2014 23:44:39 +0000 (16:44 -0700)]
MDL-47361 tooL_monitor: string and UI changes
