16014 Commits

Author SHA1 Message Date
Colin Chambers
a69f81f0d3 MDL-47368 Edit quiz: page should not reload so often
The approach is that we have a new JavaScript function
M.mod_quiz.resource_toolbox.reorganise_edit_page which, after a ajax
action, fixes up everything like page breaks, page and question numbers,
that might now be wrong.

We call that function instead of reloading the page.

Also, there are a lot more Behat tests to verify this works correctly.

AMOS BEGIN
 MOV [joinpages,mod_quiz],[removepagebreak,mod_quiz]
 MOV [splitpages,mod_quiz],[addpagebreak,mod_quiz]
AMOS END
2014-10-28 11:32:42 +00:00
Sam Hemelryk
1e97569713 Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle 2014-10-24 11:48:20 +02:00
Dan Poltawski
a5f9fc6be3 Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle 2014-10-24 11:48:19 +02:00
Damyon Wiese
8112670d62 MDL-47815 assign: Fix random unit test fails
This test was failing when it was run really slowly (looking at you oracle).
2014-10-24 11:48:18 +02:00
Marina Glancy
2a9bc5909d Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle 2014-10-24 11:48:11 +02:00
Marina Glancy
c3b545a92a Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:09 +02:00
Adrian Greeve
780ff300a8 MDL-43245 mod_lesson: Add string for essay grading permission. 2014-10-24 11:48:04 +02:00
Jean-Michel Vedrine
5fc6a9e77b MDL-43245 Lesson: non editing teacher cannot grade lesson essay 2014-10-24 11:48:00 +02:00
Marina Glancy
d4a9e66130 MDL-47812 mod_lti: execute upgrade script for all DBs 2014-10-24 14:00:30 +08:00
Andrew Nicols
555837c5d4 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.
2014-10-23 08:43:29 +08:00
Gareth J Barnard
a024eaa5fc MDL-47795 SCORM: SCORM report not a report. 2014-10-21 15:37:31 +01:00
Sam Hemelryk
28f1bd0106 Merge branch 'MDL-47695' of git://github.com/timhunt/moodle 2014-10-21 14:42:36 +13:00
Dan Poltawski
96b1223387 Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle 2014-10-20 18:28:44 +01:00
Dan Poltawski
6c75bcb5d6 Merge branch 'MDL-47651' of git://github.com/timhunt/moodle 2014-10-20 17:44:33 +01:00
Dan Poltawski
670b0d0283 Merge branch 'MDL-47691' of git://github.com/timhunt/moodle 2014-10-20 17:24:22 +01:00
Dan Poltawski
22c4db3ede Merge branch 'MDL-47673' of git://github.com/timhunt/moodle 2014-10-20 17:20:26 +01:00
Tim Hunt
97ef7ea2ce 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.
2014-10-20 15:30:35 +01:00
Tim Hunt
1c2e05c060 MDL-47691 quiz: only warn re overdue attempts if a Q has been answered
If a quiz is set to have a grace period when time has expired, we only
email studnets to warn them about their overdue attempt if they have put
in an answer to at least one question that is worth some marks.
2014-10-20 12:11:10 +01:00
Tim Hunt
0233e2a973 MDL-47673 quiz generator: default grade 100 & fix review options
The review option defaults need to be like what you get from the editing
form, no what is stored in the database, or they don't work!
2014-10-20 12:11:01 +01:00
Tim Hunt
a40eaaa28f MDL-47651 quiz responses: allow for qtypes without responses 2014-10-20 12:10:43 +01:00
Adrian Greeve
c42d18183a MDL-47675 phpunit: Update unit tests to pass on MSSQL
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.

This patch includes the garbage collection for the unit tests
that require it.
2014-10-20 14:26:11 +08:00
Mark Nelson
4afd26a618 MDL-47735 mod_forum: added 'My profile' -> 'Forum posts' behat test 2014-10-19 18:44:22 -07:00
Jean-Michel Vedrine
28928667a0 MDL-38172 Lesson: Additional Info not displayed at end of lesson 2014-10-17 17:04:57 +02:00
Dan Poltawski
bef6e88b5d Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle 2014-10-17 09:34:39 +01:00
Dan Poltawski
e435f174d3 Revert "MDL-44548 mod_scorm: force an external sync to check for updated files."
This reverts commit 2d9a4a5f93169207a166d6d7a7426652e2bf83a1.
2014-10-17 09:30:38 +01:00
Damyon Wiese
7c2977bc5b MDL-45843 LTI: Fixes for sloppy form handling 2014-10-17 16:24:26 +08:00
Damyon Wiese
821ce4d63b MDL-47655 assign: Fix unit tests triggering debugging
Test was triggering notifications - so needs to use a message sink.
2014-10-17 09:45:02 +08:00
Dan Poltawski
afb5161f37 Merge branch 'master_MDL-44548' of https://github.com/danmarsden/moodle 2014-10-16 11:45:22 +01:00
Dan Poltawski
50c4e8e8b6 Merge branch 'MDL-47696' of https://github.com/willylee/moodle 2014-10-16 11:07:27 +01:00
Dan Poltawski
5708376927 Merge branch 'MDL-47655-master' of git://github.com/damyon/moodle 2014-10-16 10:57:06 +01:00
Dan Poltawski
62b5979cb1 Merge branch 'MDL-47657-master' of git://github.com/gurgus/moodle 2014-10-16 10:52:40 +01:00
Dan Poltawski
bb48e33fda Merge branch 'MDL-47686-master' of git://github.com/damyon/moodle 2014-10-16 10:39:12 +01: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
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