Dan Poltawski [Thu, 16 Oct 2014 14:14:20 +0000 (15:14 +0100)]
Merge branch 'MDL-47681-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 16 Oct 2014 14:02:24 +0000 (15:02 +0100)]
Merge branch '47631-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 16 Oct 2014 12:58:37 +0000 (13:58 +0100)]
MDL-18229 gradereport_singleview: missing MOODLE_INTERNAL
Dan Poltawski [Thu, 16 Oct 2014 12:49:44 +0000 (13:49 +0100)]
MDL-18229 grade report: coding style fixes
global definitions must be at the top of functions.
Dan Poltawski [Thu, 16 Oct 2014 12:44:48 +0000 (13:44 +0100)]
Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle
Dan Poltawski [Thu, 16 Oct 2014 10:50:38 +0000 (11:50 +0100)]
Merge branch 'MDL-47564-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 16 Oct 2014 10:45:22 +0000 (11:45 +0100)]
Merge branch 'master_MDL-44548' of https://github.com/danmarsden/moodle
Frederic Massart [Wed, 15 Oct 2014 06:31:01 +0000 (14:31 +0800)]
MDL-47681 core_grades: Ignore weights of grade items 'none' or 'text'
It can happen that some grade items with the type 'None' have a max
grade different than 0, in which case we would have set a weight for
them which is wrong as they must not have any. This patch always
ignores the grade items 'None' and 'Text' when calculating the
weights and locks the weight UI fields for those items too.
Dan Poltawski [Thu, 16 Oct 2014 10:35:19 +0000 (11:35 +0100)]
Merge branch 'MDL-47710' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 16 Oct 2014 10:12:01 +0000 (11:12 +0100)]
Merge branch 'MDL-47392-master' of git://github.com/xow/moodle
Dan Poltawski [Thu, 16 Oct 2014 10:07:27 +0000 (11:07 +0100)]
Merge branch 'MDL-47696' of https://github.com/willylee/moodle
Dan Poltawski [Thu, 16 Oct 2014 10:02:03 +0000 (11:02 +0100)]
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
Tim Hunt [Thu, 16 Oct 2014 10:00:32 +0000 (11:00 +0100)]
MDL-47710 qformat_gift: fix bahat fails due to different ids in exports
Dan Poltawski [Thu, 16 Oct 2014 09:57:06 +0000 (10:57 +0100)]
Merge branch 'MDL-47655-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 16 Oct 2014 09:52:40 +0000 (10:52 +0100)]
Merge branch 'MDL-47657-master' of git://github.com/gurgus/moodle
Dan Poltawski [Thu, 16 Oct 2014 09:43:52 +0000 (10:43 +0100)]
Merge branch 'MDL-47707-master' of git://github.com/gurgus/moodle
Dan Poltawski [Thu, 16 Oct 2014 09:39:12 +0000 (10:39 +0100)]
Merge branch 'MDL-47686-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 16 Oct 2014 09:03:08 +0000 (10:03 +0100)]
Merge branch 'MDL-47576-master-fixup' of https://github.com/jethac/moodle
Dave Cooper [Thu, 16 Oct 2014 08:50:11 +0000 (16:50 +0800)]
MDL-47707 tool_monitor: Changed navigation position of event monitor.
This issue is part of the MDL-45758 epic.
Jetha Chan [Thu, 16 Oct 2014 04:08:10 +0000 (12:08 +0800)]
MDL-47576 user_menu: theme_base fixes
John Okely [Wed, 15 Oct 2014 07:42:51 +0000 (15:42 +0800)]
MDL-47392 core_grades: Consolidate grade item weight setting location
Damyon Wiese [Thu, 16 Oct 2014 07:20:07 +0000 (15:20 +0800)]
MDL-47575 Whitespace fix.
Damyon Wiese [Thu, 16 Oct 2014 06:49:49 +0000 (14:49 +0800)]
Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle
Damyon Wiese [Thu, 16 Oct 2014 06:34:52 +0000 (14:34 +0800)]
MDL-45758 Event monitor: Improve the help string.
Damyon Wiese [Thu, 16 Oct 2014 02:33:39 +0000 (10:33 +0800)]
MDL-47655 assign: Treat 'new' status as never submitted.
This fixes the recent activity callbacks to ignore submissions with a 'new' status.
The unit tests for recent activity were modified, because they were relying on the old behaviour of 'submitted' being the default status.
AMOS BEGIN
CPY [submissionstatus_,mod_assign],[submissionstatus_new,mod_assign]
AMOS END
Damyon Wiese [Thu, 16 Oct 2014 05:20:45 +0000 (13:20 +0800)]
Merge branch 'event_monitor' of git://github.com/ankitagarwal/moodle
Zachary Durber [Wed, 15 Oct 2014 05:39:36 +0000 (13:39 +0800)]
MDL-47575 gradebook: Show weights and contribution by default.
Damyon Wiese [Thu, 16 Oct 2014 05:00:22 +0000 (13:00 +0800)]
Merge branch 'MDL-47667' of git://github.com/timhunt/moodle
Sam Hemelryk [Thu, 16 Oct 2014 01:50:56 +0000 (14:50 +1300)]
MDL-47684 mod: better validation of rating options
Sam Hemelryk [Wed, 15 Oct 2014 22:04:53 +0000 (11:04 +1300)]
Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle
Sam Hemelryk [Wed, 15 Oct 2014 21:31:20 +0000 (10:31 +1300)]
Merge branch 'wip-MDL-47629-master' of https://github.com/kwiliarty/moodle
Sam Hemelryk [Wed, 15 Oct 2014 20:59:06 +0000 (09:59 +1300)]
MDL-45843 mod_lti: bumped ltiservice dependency versions
spvickers [Wed, 3 Sep 2014 22:35:39 +0000 (23:35 +0100)]
MDL-45843 mod_lti: introduced support to LTI 2.0
This commit introduces support to the LTI module for LTI 2.0.
As well as the initial commit the following changes were made
and then squashed into the single commit for integration:
* Fixed bug in services
Fixed bug which limited characters allowed in values of template
variables (e.g. vendor ID) in service endpoints.
Changed language file to refer to tool registrations rather than
tool proxies.
* Refactored service classes
Moved classes relating to services into areas where Moodle will
autoload them
* Ran code through code checker
Removed all errors reported by the Code checker module
excluding third-party OAuth.php file.
* UI improvements
Mainly when adding an external tool to a course - fields which
should not be changed for a selected tool are either hidden or
disabled. Admin settings page now shows the Tool Registration
name against a tool rather than the launch URL, and the
registration URL replaces the GUID on the tool registrations
page.
* Updated tool proxy registration
Added check of tool proxy to ensure only offered capabilities
and services are included. Also check tool proxy when processing
a service request.
* Code review changes
Some fixes based on code review by Mark Nielsen and addition of
some PHPDocs comments.
* Updates from code/PHPdocs checks
Removed use of eval and corrected invalid PHPdocs for new
functions/classes
* Corrected namespace error and incorrect string terminator
* Updates based on forum feedback
Added dependencies and backup, restore and uninstall methods for
ltiservice subplugins.
Changed most uses of is_null to empty
* Updated custom parameters test
Updated test_split_custom_parameters to include new function
parameters.
Corrected PHPdoc entry for lti_split_custom_parameters
Fixed incorrect line separators in ltiservice.php
* Added require_capability to registrationreturn.php
* SQL and EOL updates
Moved PHP variable in SQL into a named parameter
Improved checks for end-of-line characters to include CR and LF
on their own or together
* Check for semicolon separators
Semicolon separators in custom parameters are changed to EOL
characters when upgrading to the
2014100100 version.
* Remove unused file
basiclti.js file not being used so removed.
* Adjust line lengths
Split long lines in upgrade.php
* Added savepoint to upgrade.php
savepoint omitted from earlier update to upgrade.php
* Updated namespaces and upgrade
Service and resource classes moved into .../local/...
Upgrade SQL moved into a function and unit test created
* Updated lti_tool_proxies table
Added indices and foreign keys to lti_tool_proxies table
* Fixed formatting and documentation issues
* ltiservice class moved into local
* Replaced lti_scale_used comments
Put back commented out code for lti_scale_used
* Removed redundant sesskey code
* Fixed namespace and path check
Updated ltiservice namespace for move into local
Added check for existence of $_SERVER['PATH_INFO']
* Updated upgrade code
Added indices and keys to lti_tool_settings table when upgrading
Fixed errors in upgradelib_test.php (thanks to jleyva)
Update SQL to use Moodle functions
* Use of empty with class method
PHP 5.4 does not like the use of empty with a class method so saved the
value to a variable first. PHP 5.5 seems to accept the use of a method
with empty.
* Removed redundant indices
Removed creation of indices for foreign keys on lti_tool_settings table
from install.xml and upgrade.php
* Fixes based on feedback
Minor changes and corrections based on review in JIRA
* Fixed bug in toolproxy service
Corrected bug which failed to respond properly to an invalid request
Also updated upgrade.txt file
* Improved admin navigation
Added the manage tool registrations page as a separate entry on the
admin menu (within a folder named LTI). Made this entry the current
position for the related pages.
* Updated PHPdocs with class names
Added class names with namespaces to PHPdocs to replace generic
references to "object"
* Changed object to iframe
Use of object tag in register.php changed to use an iframe tag in line
with the similar update made to view.php.
* Improved registration process
A message is now displayed if the registration page has not been loaded
in the iframe within 20 seconds. If a user is returned to Moodle
without a tool proxy being sent, the registration is moved back from
pending to configured.
* Fixes for integration
Removed comment - the template is the default path unless overridden, so
get_path and get_template should both be defined.
Added comment and intval to fix the issue with obtaining an error
reason.
Dan Poltawski [Wed, 15 Oct 2014 15:59:06 +0000 (16:59 +0100)]
Merge branch 'MDL-47576-master' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 15 Oct 2014 15:56:43 +0000 (16:56 +0100)]
Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle
Willy Lee [Wed, 15 Oct 2014 15:13:51 +0000 (08:13 -0700)]
MDL-47696 assign: allow 'not submitted' filter to get all other submission statuses
Dan Poltawski [Wed, 15 Oct 2014 15:14:39 +0000 (16:14 +0100)]
Merge branch 'MDL-47243-master' of git://github.com/xow/moodle
Damyon Wiese [Wed, 15 Oct 2014 08:59:57 +0000 (16:59 +0800)]
Merge branch 'wip-MDL-47613-master' of git://github.com/marinaglancy/moodle
Ankit Agarwal [Wed, 15 Oct 2014 06:03:09 +0000 (11:33 +0530)]
MDL-45758 tool_monitor: Update behat tests
Ankit Agarwal [Mon, 13 Oct 2014 07:16:48 +0000 (12:46 +0530)]
MDL-45758 tool_monitor: Update subscriptions management UI
Damyon Wiese [Wed, 15 Oct 2014 07:56:30 +0000 (15:56 +0800)]
MDL-47686 assign: Fix restoring from a mod_assignment backup.
This was only working for admins.
Dan Poltawski [Wed, 15 Oct 2014 07:41:23 +0000 (08:41 +0100)]
Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 15 Oct 2014 06:52:42 +0000 (14:52 +0800)]
Merge branch 'master_MDL-47431' of https://github.com/danmarsden/moodle
Dave Cooper [Wed, 15 Oct 2014 06:47:08 +0000 (14:47 +0800)]
MDL-47657 mod_glossary: Fixed wrong error message on edit timeout.
John Okely [Mon, 13 Oct 2014 07:01:59 +0000 (15:01 +0800)]
MDL-47243 core_grades: Add behat tests for outcomes in Natural
John Okely [Thu, 9 Oct 2014 01:23:05 +0000 (09:23 +0800)]
MDL-47243 core_grades: Allow extra credit on outcome grade items
John Okely [Tue, 23 Sep 2014 09:06:40 +0000 (17:06 +0800)]
MDL-47243 core_grades: Add weight settings to outcome edit page
John Okely [Tue, 30 Sep 2014 06:09:46 +0000 (14:09 +0800)]
MDL-47243 behat: Add data generators for gradeitems scales and outcomes
Damyon Wiese [Wed, 15 Oct 2014 06:26:49 +0000 (14:26 +0800)]
Merge branch 'MDL-47646' of git://github.com/timhunt/moodle
Ankit Agarwal [Mon, 13 Oct 2014 06:24:55 +0000 (11:54 +0530)]
MDL-45758 tool_monitor: Update navigation nodes
Damyon Wiese [Wed, 15 Oct 2014 05:58:32 +0000 (13:58 +0800)]
Merge branch 'wip-MDL-47572-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 15 Oct 2014 05:46:28 +0000 (13:46 +0800)]
Merge branch 'wip-MDL-47583-master' of git://github.com/marinaglancy/moodle
Frederic Massart [Wed, 15 Oct 2014 04:22:10 +0000 (12:22 +0800)]
MDL-38732 gradereport_grader: Undefined variable in unit tests
Dave Cooper [Tue, 14 Oct 2014 09:08:02 +0000 (17:08 +0800)]
MDL-47560 Grades: Unset config when gradebook upgrade acknowledged.
Damyon Wiese [Wed, 15 Oct 2014 02:19:05 +0000 (10:19 +0800)]
Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle
Ankit Agarwal [Mon, 13 Oct 2014 06:24:31 +0000 (11:54 +0530)]
MDL-45758 tool_monitor: Update navigation to add callbacks
User settings node now checks for callbacks in various admin tools
Ankit Agarwal [Wed, 8 Oct 2014 09:35:35 +0000 (15:05 +0530)]
MDL-45758 tool_monitor: Update js to get around chrome bug
Ankit Agarwal [Wed, 8 Oct 2014 07:34:58 +0000 (13:04 +0530)]
MDL-45758 tool_monitor: Peer review changes
Ankit Agarwal [Mon, 6 Oct 2014 03:34:56 +0000 (09:04 +0530)]
MDL-45758 tool_monitor: Fix lang strings for caps
Simey Lameze [Fri, 3 Oct 2014 06:37:00 +0000 (14:37 +0800)]
MDL-45758 tool_monitor: Add behat tests to subscription management
Original issue - MDL-47148
Simey Lameze [Fri, 3 Oct 2014 06:36:22 +0000 (14:36 +0800)]
MDL-45758 tool_monitor: Behat tests for rule management
Original issue - MDL-47148
Ankit Agarwal [Thu, 2 Oct 2014 06:45:04 +0000 (12:15 +0530)]
MDL-45758 tool_monitor: Add tests for the observers
Original issue - MDL-47376
Ankit Agarwal [Thu, 2 Oct 2014 06:45:51 +0000 (12:15 +0530)]
MDL-45758 tool_monitor: Add observers to handle user and module deletion
Original issue - MDL-47376
Ankit Agarwal [Fri, 26 Sep 2014 02:05:38 +0000 (07:35 +0530)]
MDL-45758 tool_monitor: Add unit tests for the universal observer
Original issue - MDL-46132
Ankit Agarwal [Fri, 26 Sep 2014 02:05:05 +0000 (07:35 +0530)]
MDL-45758 tool_monitor: Add a universal event observer
This observer does the following task:-
1) It monitors all events and stores relevant data in a temporary table
2) It doesn't write the events straight away, it buffers them, so there is only one db write per request
3) It calculates and sees if there are subscriptions related to those events who need to be notified
4) If there are such cases, it schedules a adhoc task for the same
Original issue - MDL-46132
Ankit Agarwal [Fri, 26 Sep 2014 02:01:22 +0000 (07:31 +0530)]
MDL-45758 tool_monitor: Add a adhock task to send notifications
Original issue - MDL-46132
Ankit Agarwal [Wed, 1 Oct 2014 08:20:25 +0000 (13:50 +0530)]
MDL-45758 tool_monitor: Modifiy manager classes to return instances
Original issue - MDL-46132
Ankit Agarwal [Fri, 26 Sep 2014 02:00:05 +0000 (07:30 +0530)]
MDL-45758 tool_monitor: Add a new message provider
Original issue - MDL-46132
Simey Lameze [Tue, 30 Sep 2014 02:51:33 +0000 (10:51 +0800)]
MDL-45758 tool_monitor: add missing alt on manage icons
Original issue - MDL-47460
Mark Nelson [Fri, 19 Sep 2014 07:37:54 +0000 (00:37 -0700)]
MDL-45758 tool_monitor: added help icon for rules
Original issue - MDL-47152
Mark Nelson [Sat, 20 Sep 2014 02:51:11 +0000 (19:51 -0700)]
MDL-45758 tool_monitor: added help icon for subscriptions
Original issue - MDL-47152
Mark Nelson [Fri, 19 Sep 2014 07:17:58 +0000 (00:17 -0700)]
MDL-45758 tool_monitor: added help icon renderer
Original issue - MDL-47152
Mark Nelson [Fri, 19 Sep 2014 07:37:35 +0000 (00:37 -0700)]
MDL-45758 core: edited get_formatted_help_string
Edited the api to accept string parameters
Original issue - MDL-47152
Mark Nelson [Sat, 20 Sep 2014 02:43:46 +0000 (19:43 -0700)]
MDL-45758 tool_monitor: fixed typo
Original issue - MDL-47152
Ankit Agarwal [Sat, 13 Sep 2014 04:54:23 +0000 (10:24 +0530)]
MDL-45758 tool_monitor: Add unit tests for the course deleted observer
Original issue - MDL-46510
Ankit Agarwal [Sat, 13 Sep 2014 04:53:28 +0000 (10:23 +0530)]
MDL-45758 tool_monitor: Add a course delete observer
Original issue - MDL-46510
Ankit Agarwal [Tue, 9 Sep 2014 04:22:51 +0000 (09:52 +0530)]
MDL-45758 tool_monitor: Add a UI page to manage subscriptions
Original issue - MDL-46111
Ankit Agarwal [Tue, 9 Sep 2014 04:21:37 +0000 (09:51 +0530)]
MDL-45758 tool_monitor: Update subscription manager class
Update the class to support the subs renderable
Original issue - MDL-461111
Ankit Agarwal [Tue, 9 Sep 2014 04:20:36 +0000 (09:50 +0530)]
MDL-45758 tool_monitor: Add renderables for the subscription page
Original issue - MDL-46111
Ankit Agarwal [Tue, 9 Sep 2014 04:20:18 +0000 (09:50 +0530)]
MDL-45758 tool_monitor: Add a renderer for the subscription page
Original issue - MDL-46111
Ankit Agarwal [Thu, 17 Jul 2014 09:37:26 +0000 (17:37 +0800)]
MDL-45758 tool_monitor: Create a subscription instance class
Original issue - MDL-46241
Ankit Agarwal [Wed, 16 Jul 2014 02:23:24 +0000 (10:23 +0800)]
MDL-45758 tool_monitor: Handle rule managment
Original issue - MDL-46130
Ankit Agarwal [Tue, 15 Jul 2014 06:06:19 +0000 (14:06 +0800)]
MDL-45758 tool_monitor: Display a rule managment interface
Original issue - MDL-46110
Ankit Agarwal [Tue, 15 Jul 2014 06:05:42 +0000 (14:05 +0800)]
MDL-45758 tool_monitor: Create rendering code for manage rules page
Original issue - MDL-46110
Ankit Agarwal [Thu, 10 Jul 2014 06:49:00 +0000 (14:49 +0800)]
MDL-45758 tool_monitor: Add support for editing/creating a rule
Original issue - MDL-45938
Ankit Agarwal [Thu, 10 Jul 2014 06:48:37 +0000 (14:48 +0800)]
MDL-45758 tool_monitor: YUI module to handle event selection dropdown
Original issue - MDL-45938
Simey Lameze [Fri, 4 Jul 2014 02:28:27 +0000 (10:28 +0800)]
MDL-45758 tool_monitor: Initial version of rule form.
Original issue - MDL-45938
Ankit Agarwal [Mon, 7 Jul 2014 06:07:55 +0000 (14:07 +0800)]
MDL-45758 tool_monitor: Polish the code for rule manager and unit tests
Original issue - MDL-45918
Simey Lameze [Mon, 30 Jun 2014 04:08:45 +0000 (12:08 +0800)]
MDL-45758 tool_monitor: Rule manager class and data generators
This issue introduces rule manager class, data generators and unit tests
associated with them.
Original issue - MDL-45918
Ankit Agarwal [Wed, 25 Jun 2014 07:18:55 +0000 (15:18 +0800)]
MDL-45758 tool_monitor: Add a subscription manager class
Original issue - MDL-45919
Ankit Agarwal [Mon, 30 Jun 2014 05:09:18 +0000 (13:09 +0800)]
MDL-45758 tool_monitor: Build the navigation tree for the tool
Original issue - MDL-46131
Ankit Agarwal [Mon, 30 Jun 2014 05:08:38 +0000 (13:08 +0800)]
MDL-45758 navigation: updates to navigation
This patch does the following:-
Start using proper key for course report node
Allow admin tools to hook into course navigation
Original issue - MDL-46131
Ankit Agarwal [Mon, 30 Jun 2014 09:44:38 +0000 (17:44 +0800)]
MDL-45758 tool_monitor: Implement a rule instance class
Original issue - MDL-45939
Ankit Agarwal [Tue, 1 Jul 2014 09:15:55 +0000 (17:15 +0800)]
MDL-45758 tool_monitor: Implement a class to generate list of events
Original issue - MDL-46109
Ankit Agarwal [Thu, 19 Jun 2014 08:41:35 +0000 (16:41 +0800)]
MDL-45758 tool_monitor: Adding xml file defining the db tables
Original issue - MDL-45916
Ankit Agarwal [Thu, 19 Jun 2014 07:16:45 +0000 (15:16 +0800)]
MDL-45758 tool_monitor: Add basic file structure of the report
Original issue - MDL-45916
Kevin Wiliarty [Sat, 11 Oct 2014 12:49:55 +0000 (08:49 -0400)]
MDL-47629 quiz review: display cloze feedback on top of "Check" button
Dan Poltawski [Tue, 14 Oct 2014 18:11:57 +0000 (19:11 +0100)]
Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 14 Oct 2014 18:00:28 +0000 (19:00 +0100)]
Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 14 Oct 2014 17:47:30 +0000 (18:47 +0100)]
Merge branch 'MDL-47614-master' of git://github.com/andrewnicols/moodle
