16139 Commits

Author SHA1 Message Date
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
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
Willy Lee
8f16523082 MDL-47696 assign: allow 'not submitted' filter to get all other submission statuses 2014-10-15 08:16:37 -07:00
Damyon Wiese
b065b569af Merge branch 'wip-MDL-47613-master' of git://github.com/marinaglancy/moodle 2014-10-15 16:59:57 +08:00
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
Dave Cooper
d0d59df939 MDL-47657 mod_glossary: Fixed wrong error message on edit timeout. 2014-10-15 14:48:18 +08:00
Tim Hunt
84b45a24a1 MDL-47603 quiz edit: qbank popup preview icon needs new window
Also, ensure that clicking the + icon adds the question on the right
page.

Bit of this fix are a bit hacky, but we have to deal with the fact there
is not a good general solution to MDL-47604.
2014-10-10 13:40:16 +01:00
Tim Hunt
8ac5c115e0 MDL-43089 quiz editing: don't pop up qbank on initial page load. 2014-10-10 11:00:12 +01:00
Marina Glancy
d8773d64fc MDL-47613 wiki: allow searching several words
Thanks to Sandeep B for suggested solution
2014-10-10 16:35:13 +08:00
Dan Marsden
2d9a4a5f93 MDL-44548 mod_scorm: force an external sync to check for updated files.
also remove some globals no longer needed (not used in function or in required files.
2014-10-10 15:10:08 +13:00
Tim Hunt
aec2a725a8 MDL-43089 quiz editing: fix some qbank popup JS issues. 2014-10-09 17:22:22 +01:00
Tim Hunt
ad6a1455a4 MDL-43089 quiz editing: fix RTL
As part of this, I tweaked the LTR style a bit, in a way that is both an
improvement (I hope) and also to reduce the amount of RTL-specific code
required. (Thanks to Fred for spotting some of the problems.)

Also, I changed one course style in boostrapbase, where the RTL rule was
different from the LTR rule.

Finally, I saw some repeated RTL rules in the quiz styles.css, and so
eliminated the the duplicate rules.
2014-10-09 16:34:38 +01:00
Dan Poltawski
15ba6a0ded Merge branch 'MDL-47556' of git://github.com/timhunt/moodle 2014-10-09 10:54:19 +01:00
Dan Poltawski
66689366a0 Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/grade.less
	theme/bootstrapbase/style/moodle.css
2014-10-08 15:49:58 +01:00
Dan Poltawski
ea594eb10e Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle 2014-10-08 14:43:13 +01:00
Damyon Wiese
6b58a6a445 Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2014-10-08 21:14:39 +08:00
Dan Poltawski
8b2d52b88d Merge branch 'MDL-47389-master' of git://github.com/jleyva/moodle 2014-10-08 11:08:29 +01:00
Damyon Wiese
e5d5bfdc4f Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle 2014-10-08 16:46:12 +08:00
Dan Poltawski
006c84f3e7 Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle 2014-10-08 08:39:31 +01:00
Marina Glancy
9f1088d482 MDL-47543 core_grades: behat changes, also MDL-47541 2014-10-08 15:03:37 +08:00
Jean-Michel Vedrine
ce3cfc8f92 MDL-38540 Lesson: import images in question answers 2014-10-08 06:07:02 +02:00
Dan Poltawski
c5d4fd7ddf MDL-38106 lesson: fix tests introduced in MDL-32870 2014-10-08 11:51:21 +08:00
Mark Nelson
ba8024665d MDL-40697 mod_*: fixed unit tests so they pass 2014-10-07 19:08:35 -07:00
Damyon Wiese
0d474cb2b4 Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle 2014-10-08 09:53:53 +08:00
Sam Hemelryk
ba2f9a9695 Merge branch 'MDL-47132' of git://github.com/timhunt/moodle 2014-10-08 12:01:42 +13:00
Sam Hemelryk
e90a0396e1 MDL-3714 mod_forum: pre-integration clean up 2014-10-08 09:39:44 +13:00
Sam Hemelryk
82d9aebc7d Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle 2014-10-08 09:39:01 +13:00
Marina Glancy
850ac50a87 Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle 2014-10-07 17:16:56 +08:00
Marina Glancy
8dfd73e04a Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle 2014-10-07 10:25:29 +08:00
Sam Hemelryk
002ee6faab Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle 2014-10-07 15:16:54 +13:00
Marina Glancy
4e45c0319c MDL-31936 workshop: version bump 2014-10-07 10:15:54 +08:00
Marina Glancy
ae66542027 Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle 2014-10-07 10:08:48 +08:00
Andrew Nicols
91223df61b MDL-3714 mod_forum: Add an inbound message handler
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 09:58:36 +08:00
Tim Hunt
24cfc09881 MDL-47556 quiz: autosave should default to on for new installs 2014-10-06 23:17:25 +01:00
David Mudrák
16d364b560 MDL-31936 workshop: Improve unit tests for the course reset support 2014-10-06 23:32:32 +02:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9 Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle 2014-10-06 16:01:26 +01:00
Tim Hunt
4d1fcfdf8a MDL-47547 quiz editing: minor fixes following MDL-47547
* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.
2014-10-06 15:44:21 +01:00
Dan Poltawski
106486c7ad MDL-38106 lesson: don't require intro when upgraded 2014-10-06 14:54:53 +01:00
Dan Poltawski
816d082241 MDL-43089 question: fix shifter build issues 2014-10-06 13:53:26 +01:00
Dan Poltawski
2eb24eb85a Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle 2014-10-06 12:11:33 +01:00
Gregory Faller
452beca98d MDL-46712: Center EditPDF window on browser resize / zoom 2014-10-06 14:44:51 +08:00
Andrew Nicols
f67b5c995e MDL-47183: viewhiddenactivities should use the module context
Thanks to Paulo Matos for the forum part of this change.
2014-10-06 12:21:49 +08:00
Sam Hemelryk
7b08f6e888 Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2 2014-10-06 11:15:44 +13:00
Dan Poltawski
5b17d81dce MDL-38106 lesson: behat now sets introduction 2014-10-05 14:12:59 +01:00
Jean-Michel Vedrine
0abc18cf4d MDL-32870 Lesson: No HTML editor for questions answers and responses 2014-10-04 15:13:01 +02:00
Juan Leyva
7ea6ada343 MDL-47389 forum: Return discussions count in get_forums_by_courses ws 2014-10-03 16:39:02 +02:00
Juan Leyva
da1be050bc MDL-47084 forum: New moodle_url method make_webservice_pluginfile_url 2014-10-03 16:34:48 +02:00
Juan Leyva
694bf0c74b MDL-47084 forum: Return user picture URL in get_posts WS 2014-10-03 16:34:48 +02:00