70514 Commits

Author SHA1 Message Date
Dan Poltawski
42da111dbe Merge branch 'MDL-47707-master' of git://github.com/gurgus/moodle 2014-10-16 10:43:52 +01:00
Dan Poltawski
bb48e33fda Merge branch 'MDL-47686-master' of git://github.com/damyon/moodle 2014-10-16 10:39:12 +01:00
Dan Poltawski
387cb9586e Merge branch 'MDL-47576-master-fixup' of https://github.com/jethac/moodle 2014-10-16 10:03:08 +01:00
Dave Cooper
b0001c15f2 MDL-47707 tool_monitor: Changed navigation position of event monitor.
This issue is part of the MDL-45758 epic.
2014-10-16 16:50:11 +08:00
Jetha Chan
8ef43cfde6 MDL-47576 user_menu: theme_base fixes 2014-10-16 16:18:38 +08:00
John Okely
044a298e6f MDL-47392 core_grades: Consolidate grade item weight setting location 2014-10-16 15:21:53 +08:00
Damyon Wiese
973840f7d5 MDL-47575 Whitespace fix. 2014-10-16 15:20:07 +08:00
Damyon Wiese
3fa81fabc3 Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle 2014-10-16 14:49:49 +08:00
Damyon Wiese
bd71cb83df MDL-45758 Event monitor: Improve the help string. 2014-10-16 14:34:52 +08:00
Damyon Wiese
9e035dae1b 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
2014-10-16 13:56:07 +08:00
Damyon Wiese
b8bd29da41 Merge branch 'event_monitor' of git://github.com/ankitagarwal/moodle 2014-10-16 13:20:45 +08:00
Zachary Durber
6deb0344c5 MDL-47575 gradebook: Show weights and contribution by default. 2014-10-16 13:11:47 +08:00
Damyon Wiese
8ae6df3798 Merge branch 'MDL-47667' of git://github.com/timhunt/moodle 2014-10-16 13:00:22 +08:00
Adrian Greeve
b9cafe3b40 MDL-46599 gradebook: Added a time exported column to grade export via csv.
This will be useful for checking if a csv import is trying to overwrite
new grade updates.
2014-10-16 10:31:10 +08:00
Simey Lameze
a5240a82a6 MDL-46599 gradebook: Add force import option on CSV file and direct importing 2014-10-16 10:22:45 +08:00
Simey Lameze
ce8f9c9b87 MDL-46599 gradebook: Add last exported date column on ODS and XLS export formats 2014-10-16 10:22:20 +08:00
Sam Hemelryk
8028df293a MDL-47684 mod: better validation of rating options 2014-10-16 14:50:56 +13:00
Sam Hemelryk
2fdb4c6b00 Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle 2014-10-16 11:04:53 +13:00
Sam Hemelryk
edfeca582e Merge branch 'wip-MDL-47629-master' of https://github.com/kwiliarty/moodle 2014-10-16 10:31:20 +13:00
Sam Hemelryk
b1b2999206 MDL-45843 mod_lti: bumped ltiservice dependency versions 2014-10-16 09:59:06 +13:00
spvickers
e3f69b58a2 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.
2014-10-16 09:33:33 +13:00
Dan Poltawski
529e38d141 Merge branch 'MDL-47576-master' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-10-15 16:59:06 +01:00
Dan Poltawski
33ccfc1f13 Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle 2014-10-15 16:56:43 +01:00
Willy Lee
8f16523082 MDL-47696 assign: allow 'not submitted' filter to get all other submission statuses 2014-10-15 08:16:37 -07:00
Dan Poltawski
560b04b408 Merge branch 'MDL-47243-master' of git://github.com/xow/moodle 2014-10-15 16:14:39 +01:00
Damyon Wiese
b065b569af Merge branch 'wip-MDL-47613-master' of git://github.com/marinaglancy/moodle 2014-10-15 16:59:57 +08:00
Ankit Agarwal
d6e0e275dd MDL-45758 tool_monitor: Update behat tests 2014-10-15 13:59:19 +05:30
Ankit Agarwal
ffe9ed541c MDL-45758 tool_monitor: Update subscriptions management UI 2014-10-15 13:59:18 +05:30
Damyon Wiese
127b3915df MDL-47686 assign: Fix restoring from a mod_assignment backup.
This was only working for admins.
2014-10-15 15:56:30 +08:00
Dan Poltawski
22caa080f9 Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle 2014-10-15 08:41:23 +01:00
Damyon Wiese
87ea3e7e37 Merge branch 'master_MDL-47431' of https://github.com/danmarsden/moodle 2014-10-15 14:52:42 +08:00
Dave Cooper
d0d59df939 MDL-47657 mod_glossary: Fixed wrong error message on edit timeout. 2014-10-15 14:48:18 +08:00
John Okely
3087835ae3 MDL-47243 core_grades: Add behat tests for outcomes in Natural 2014-10-15 14:33:31 +08:00
John Okely
5e18456631 MDL-47243 core_grades: Allow extra credit on outcome grade items 2014-10-15 14:33:31 +08:00
John Okely
c53708d9c0 MDL-47243 core_grades: Add weight settings to outcome edit page 2014-10-15 14:33:31 +08:00
John Okely
cfa91962d1 MDL-47243 behat: Add data generators for gradeitems scales and outcomes 2014-10-15 14:33:26 +08:00
Damyon Wiese
1a847ddaf8 Merge branch 'MDL-47646' of git://github.com/timhunt/moodle 2014-10-15 14:26:49 +08:00
Ankit Agarwal
067e9599ac MDL-45758 tool_monitor: Update navigation nodes 2014-10-15 11:33:31 +05:30
Damyon Wiese
b51c2c4f8c Merge branch 'wip-MDL-47572-master' of git://github.com/marinaglancy/moodle 2014-10-15 13:58:32 +08:00
Damyon Wiese
5d70f2303a Merge branch 'wip-MDL-47583-master' of git://github.com/marinaglancy/moodle 2014-10-15 13:46:28 +08:00
Frederic Massart
e813b7286e MDL-38732 gradereport_grader: Undefined variable in unit tests 2014-10-15 12:22:35 +08:00
Dave Cooper
c8eb1fae64 MDL-47560 Grades: Unset config when gradebook upgrade acknowledged. 2014-10-15 11:00:57 +08:00
Damyon Wiese
e9e3c0dcfd Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle 2014-10-15 10:19:05 +08:00
Ankit Agarwal
b9ba26b222 MDL-45758 tool_monitor: Update navigation to add callbacks
User settings node now checks for callbacks in various admin tools
2014-10-15 07:41:06 +05:30
Ankit Agarwal
e8a925a60e MDL-45758 tool_monitor: Update js to get around chrome bug 2014-10-15 07:41:06 +05:30
Ankit Agarwal
75cae53b7b MDL-45758 tool_monitor: Peer review changes 2014-10-15 07:41:06 +05:30
Ankit Agarwal
758793d889 MDL-45758 tool_monitor: Fix lang strings for caps 2014-10-15 07:41:06 +05:30
Simey Lameze
77098e6dc1 MDL-45758 tool_monitor: Add behat tests to subscription management
Original issue - MDL-47148
2014-10-15 07:41:06 +05:30
Simey Lameze
9031b34da3 MDL-45758 tool_monitor: Behat tests for rule management
Original issue - MDL-47148
2014-10-15 07:41:06 +05:30
Ankit Agarwal
2161de73d8 MDL-45758 tool_monitor: Add tests for the observers
Original issue - MDL-47376
2014-10-15 07:41:06 +05:30