Commit graph

19437 commits

Author SHA1 Message Date
Dan Poltawski
cf3fbf8a0e Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle 2014-10-20 17:49:02 +01:00
Dan Poltawski
6366cc0774 Merge branch 'MDL-47711' of git://github.com/timhunt/moodle 2014-10-20 17:28:50 +01:00
Dan Poltawski
11c6debb0a Merge branch 'MDL-47588' of git://github.com/timhunt/moodle 2014-10-20 14:30:46 +01:00
Tim Hunt
d69a6ad965 MDL-47711 behat: make it easier to copy the init.php command. 2014-10-20 12:11:28 +01:00
Tim Hunt
a92105fd3f MDL-47588 behat: fix switching back to the main window in Chrome
This fix is mostly based on what Colin Chambers found out. This commit
is a simplification of his work.

The problem is that the Chrome / Selenium 2 integration cannot swich to
a window with a blank name. The work-around applied here is, when we
switch away from an unnamed window, we set a name on it. Then we can use
that name to switch back.
2014-10-20 12:10:14 +01:00
Marina Glancy
2d2661e3d7 Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle 2014-10-20 17:08:20 +08:00
Marina Glancy
f75f2ecdf4 Merge branch 'MDL-47489-master' of git://github.com/FMCorz/moodle 2014-10-20 15:19:57 +08: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
Frederic Massart
8427dc3a23 MDL-47489 core_grades: Adjust weights of extra credit items for Simple 2014-10-20 13:52:18 +08:00
Frederic Massart
e8ac04c191 MDL-47489 core_grades: Adjust weights of extra credit items for Mean 2014-10-20 13:52:17 +08:00
Mark Nelson
e924e1b33a MDL-47736 editor_atto: only save/restore draft when necessary 2014-10-19 22:14:15 -07:00
Marina Glancy
c57681ed49 Merge branch 'MDL-47737-master' of git://github.com/FMCorz/moodle 2014-10-20 12:43:52 +08:00
Damyon Wiese
47d6e6a7d3 MDL-47503 Grades: Completely remove aggregationsubcats
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
2014-10-20 12:03:18 +08:00
Frederic Massart
86974893c8 MDL-47489 core_grades: Adjust weights of extra credit items for Natural 2014-10-20 11:50:43 +08:00
Frederic Massart
74d0ca1543 MDL-47739 form: Calendar widget causes unintentional focus and scroll 2014-10-20 10:55:49 +08:00
Sam Hemelryk
5c28d15985 MDL-46518 navigation: site glossaries now expand properly 2014-10-20 11:18:36 +13:00
Sam Hemelryk
30aca4a74b MDL-46499 navigation: better enrolled course limit
We now user $CFG->navcourselimit to limit the number of
courses shown in the navigation when browsing another users
full profile. Previously it showed all courses which caused
some slowdown.
2014-10-20 10:58:40 +13:00
Sam Hemelryk
ed7605f481 MDL-47752 grading: fixed bugs with the modgrade element 2014-10-20 10:32:13 +13:00
Mark Nelson
c62ba9b8ca MDL-47735 core: prevented iteration of 'groupmembersonly'
The course module variable 'groupmembersonly' was removed in 2.8.
2014-10-17 18:23:35 -07:00
Frederic Massart
53cca2274e MDL-47737 editor_atto: Prevent false negative when saving draft on IE9 2014-10-17 20:48:43 +08:00
Frederic Massart
5aafc6f425 MDL-47733 editor_atto: Do not prompt error when draft is empty 2014-10-17 18:19:11 +08:00
Andrew Nicols
3fa0daa90f MDL-47664 phpunit: Do not use sequence number changes for Oracle
When resetting a sequence number, we call change_database_structure()
which in turns clears the MUC cache for databasemeta. This cache contains
information about the table, columns, etc.

After the cache is cleared, it must be re-filled, and it was discovered
that the get_columns() code which fills this cache can take a particularly
long time. Given that this is called for every table in Moodle, this can
add up to a significant period, and this is done on a per-testsuite basis.

On my SSD install this was taking approximately 40 seconds on each re-fill
of the cache.
2014-10-17 13:28:46 +08:00
Dan Poltawski
f931c9245e Merge branch 'MDL-47681-master' of git://github.com/FMCorz/moodle 2014-10-16 15:14:20 +01:00
Dan Poltawski
d65eefdbf1 Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle 2014-10-16 13:44:48 +01:00
Frederic Massart
f8c8f980c7 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.
2014-10-16 18:42:27 +08:00
Damyon Wiese
ba0d27735a MDL-47704 Grades: Fix for set_usedinaggregation
Used in aggregation was not resetting previously set values
when recalculating an aggregation. This meant that items no longer
in the aggregation, were displayed with stale weights in the user report.
2014-10-16 17:14:02 +08:00
Damyon Wiese
b8bd29da41 Merge branch 'event_monitor' of git://github.com/ankitagarwal/moodle 2014-10-16 13:20:45 +08:00
Sam Hemelryk
2fdb4c6b00 Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle 2014-10-16 11:04:53 +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
560b04b408 Merge branch 'MDL-47243-master' of git://github.com/xow/moodle 2014-10-15 16:14:39 +01:00
Damyon Wiese
87ea3e7e37 Merge branch 'master_MDL-47431' of https://github.com/danmarsden/moodle 2014-10-15 14:52:42 +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
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
Marina Glancy
bf8542ce3a MDL-30358 forms: strict validation is too strict 2014-10-15 11:57:01 +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
75cae53b7b MDL-45758 tool_monitor: Peer review changes 2014-10-15 07:41:06 +05:30
Mark Nelson
27b6839fe2 MDL-45758 core: edited get_formatted_help_string
Edited the api to accept string parameters

Original issue - MDL-47152
2014-10-15 07:41:05 +05:30
Ankit Agarwal
eccf301acf 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
2014-10-15 07:41:04 +05:30
Ankit Agarwal
92b40de9de MDL-45758 tool_monitor: Add basic file structure of the report
Original issue - MDL-45916
2014-10-15 07:41:03 +05:30
Dan Poltawski
4f639ec86b Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle 2014-10-14 19:11:57 +01:00
Dan Poltawski
1b07195b28 Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle 2014-10-14 19:00:28 +01:00
Dan Poltawski
3be2f6ac0b Merge branch 'MDL-47649' of git://github.com/timhunt/moodle 2014-10-14 13:14:19 +01:00
Helen Foster
a1b152f5db MDL-47140 atto: improved wording of error message 2014-10-14 12:20:58 +01:00
Marina Glancy
acab649e06 Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle 2014-10-14 18:34:14 +08:00
Tim Hunt
a866538b9b MDL-47649 csvlib: must not leave files open
I added a destructor to csv_import_reader ensure the file is closed.

I also ensured that the gradeimport_csv unit tests did not hold onto a
reference to the csv_import_reader object while the phpunit framework
tries to tidy up moodledata.

Finally, to stop CiBoT complaining, I fixed up the PHP4-style
declarations in the CSV import class.
2014-10-14 10:36:25 +01:00
Frederic Massart
00fd3c1aad MDL-47189 my: Fix the addition of default blocks to my/ page
Fixing the upgrade script so that they attach the new blocks
to the right my_pages entry. An upgrade script has also been
added to fix the existing bad data.
2014-10-14 16:03:12 +08:00
Jetha Chan
f89a85f81c MDL-47576 user_menu: improved dropdown styles, added JS-less styles 2014-10-14 14:59:42 +08:00