moodle.git
6 years agoMerge branch 'MDL-47594_master' of git://github.com/kordan/moodle
Sam Hemelryk [Wed, 15 Oct 2014 22:04:53 +0000 (11:04 +1300)]
Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle

6 years agoMerge branch 'wip-MDL-47629-master' of https://github.com/kwiliarty/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

6 years agoMDL-45843 mod_lti: bumped ltiservice dependency versions
Sam Hemelryk [Wed, 15 Oct 2014 20:59:06 +0000 (09:59 +1300)]
MDL-45843 mod_lti: bumped ltiservice dependency versions

6 years agoMDL-45843 mod_lti: introduced support to LTI 2.0
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.

6 years agoMerge branch 'MDL-47576-master' of git://github.com/jethac/moodle
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

6 years agoMerge branch 'MDL-47560-master' of git://github.com/gurgus/moodle
Dan Poltawski [Wed, 15 Oct 2014 15:56:43 +0000 (16:56 +0100)]
Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle

6 years agoMerge branch 'MDL-47243-master' of git://github.com/xow/moodle
Dan Poltawski [Wed, 15 Oct 2014 15:14:39 +0000 (16:14 +0100)]
Merge branch 'MDL-47243-master' of git://github.com/xow/moodle

6 years agoMerge branch 'wip-MDL-47613-master' of git://github.com/marinaglancy/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

6 years agoMerge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
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

6 years agoMerge branch 'master_MDL-47431' of https://github.com/danmarsden/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

6 years agoMDL-47243 core_grades: Add behat tests for outcomes in Natural
John Okely [Mon, 13 Oct 2014 07:01:59 +0000 (15:01 +0800)]
MDL-47243 core_grades: Add behat tests for outcomes in Natural

6 years agoMDL-47243 core_grades: Allow extra credit on outcome grade items
John Okely [Thu, 9 Oct 2014 01:23:05 +0000 (09:23 +0800)]
MDL-47243 core_grades: Allow extra credit on outcome grade items

6 years agoMDL-47243 core_grades: Add weight settings to outcome edit page
John Okely [Tue, 23 Sep 2014 09:06:40 +0000 (17:06 +0800)]
MDL-47243 core_grades: Add weight settings to outcome edit page

6 years agoMDL-47243 behat: Add data generators for gradeitems scales and outcomes
John Okely [Tue, 30 Sep 2014 06:09:46 +0000 (14:09 +0800)]
MDL-47243 behat: Add data generators for gradeitems scales and outcomes

6 years agoMerge branch 'MDL-47646' of git://github.com/timhunt/moodle
Damyon Wiese [Wed, 15 Oct 2014 06:26:49 +0000 (14:26 +0800)]
Merge branch 'MDL-47646' of git://github.com/timhunt/moodle

6 years agoMerge branch 'wip-MDL-47572-master' of git://github.com/marinaglancy/moodle
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

6 years agoMerge branch 'wip-MDL-47583-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

6 years agoMDL-38732 gradereport_grader: Undefined variable in unit tests
Frederic Massart [Wed, 15 Oct 2014 04:22:10 +0000 (12:22 +0800)]
MDL-38732 gradereport_grader: Undefined variable in unit tests

6 years agoMDL-47560 Grades: Unset config when gradebook upgrade acknowledged.
Dave Cooper [Tue, 14 Oct 2014 09:08:02 +0000 (17:08 +0800)]
MDL-47560 Grades: Unset config when gradebook upgrade acknowledged.

6 years agoMerge branch 'MDL-47575-master' of git://github.com/zbdd/moodle
Damyon Wiese [Wed, 15 Oct 2014 02:19:05 +0000 (10:19 +0800)]
Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle

6 years agoMDL-47629 quiz review: display cloze feedback on top of "Check" button
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

6 years agoMerge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 14 Oct 2014 18:11:57 +0000 (19:11 +0100)]
Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-38732-master-2nd' 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

6 years agoMerge branch 'MDL-47614-master' of git://github.com/andrewnicols/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

6 years agoon-demand release 2.8beta+
Dan Poltawski [Tue, 14 Oct 2014 17:00:47 +0000 (18:00 +0100)]
on-demand release 2.8beta+

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Tue, 14 Oct 2014 17:00:44 +0000 (18:00 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-46235/MDL-46971 mysql_compress_rows: fix typo
Dan Poltawski [Tue, 14 Oct 2014 14:11:05 +0000 (15:11 +0100)]
MDL-46235/MDL-46971 mysql_compress_rows: fix typo

6 years agoMerge branch 'wip-MDL-47617-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 14 Oct 2014 12:17:36 +0000 (13:17 +0100)]
Merge branch 'wip-MDL-47617-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'MDL-47649' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Oct 2014 12:14:19 +0000 (13:14 +0100)]
Merge branch 'MDL-47649' of git://github.com/timhunt/moodle

6 years agoMDL-47140 atto: improved wording of error message
Helen Foster [Tue, 14 Oct 2014 11:20:39 +0000 (12:20 +0100)]
MDL-47140 atto: improved wording of error message

6 years agoMerge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 14 Oct 2014 10:34:14 +0000 (18:34 +0800)]
Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle

6 years agoMDL-47649 csvlib: must not leave files open
Tim Hunt [Mon, 13 Oct 2014 15:32:48 +0000 (16:32 +0100)]
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.

6 years agoMDL-47189 my: Update test to check that existing blocks remain after add
Frederic Massart [Mon, 6 Oct 2014 08:37:54 +0000 (16:37 +0800)]
MDL-47189 my: Update test to check that existing blocks remain after add

Specifically checking for strings in the blocks because the tests
passed when looking for the string anywhere.

6 years agoMDL-47189 my: Fix the addition of default blocks to my/ page
Frederic Massart [Mon, 6 Oct 2014 10:57:17 +0000 (18:57 +0800)]
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.

6 years agoMDL-47614 gradereport: Apply a background colour
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-47614 gradereport: Apply a background colour

Apply the page background colour to the table for all bootstrap base
themes.

Whis will ensure that the table does not stand out strangely on a non-white
background.

6 years agoMerge branch '46151-28' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 14 Oct 2014 07:34:25 +0000 (15:34 +0800)]
Merge branch '46151-28' of git://github.com/samhemelryk/moodle

6 years agoMDL-47576 user_menu: improved dropdown styles, added JS-less styles
Jetha Chan [Fri, 10 Oct 2014 09:17:54 +0000 (17:17 +0800)]
MDL-47576 user_menu: improved dropdown styles, added JS-less styles

6 years agoMDL-47575 gradebook: Show weights and contribution by default.
Zachary Durber [Fri, 10 Oct 2014 06:55:37 +0000 (14:55 +0800)]
MDL-47575 gradebook: Show weights and contribution by default.

6 years agoMDL-38732 gradereport_grader: Handle simultaneous graders
Frederic Massart [Tue, 7 Oct 2014 07:56:20 +0000 (15:56 +0800)]
MDL-38732 gradereport_grader: Handle simultaneous graders

6 years agoMDL-47617 behat: Fixed behat sorting failure
Adrian Greeve [Tue, 14 Oct 2014 03:30:01 +0000 (11:30 +0800)]
MDL-47617 behat: Fixed behat sorting failure

Postgres and MySQL treat values that are null differently
when sorting. MySQL will sort null values above fields with
values and Postgres will be vice versa. I removed the checks
against the Admin User.

Oracle treats lower case values different to upper case values
and so I have modified the test so that all Names start with
an Uppercase letter.

6 years agoMDL-46151 cachestore_memcache: now checks extension version for support
Sam Hemelryk [Sun, 20 Jul 2014 20:48:14 +0000 (08:48 +1200)]
MDL-46151 cachestore_memcache: now checks extension version for support

6 years agoAutomatically generated installer lang files
AMOS bot [Mon, 13 Oct 2014 16:05:32 +0000 (00:05 +0800)]
Automatically generated installer lang files

6 years agoMDL-47646 CURL redirect unit test: handle broken servers
Tim Hunt [Mon, 13 Oct 2014 14:00:46 +0000 (15:00 +0100)]
MDL-47646 CURL redirect unit test: handle broken servers

6 years agoMerge branch 'MDL-47603' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 13 Oct 2014 12:33:56 +0000 (13:33 +0100)]
Merge branch 'MDL-47603' of git://github.com/timhunt/moodle

6 years agoMDL-47463 core_grades: Behat checks the contribution of single item scales
Frederic Massart [Mon, 13 Oct 2014 07:52:13 +0000 (15:52 +0800)]
MDL-47463 core_grades: Behat checks the contribution of single item scales

6 years agoMerge branch 'wip-MDL-46819-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 13 Oct 2014 10:02:59 +0000 (11:02 +0100)]
Merge branch 'wip-MDL-46819-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'wip-MDL-46546-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 13 Oct 2014 09:57:17 +0000 (10:57 +0100)]
Merge branch 'wip-MDL-46546-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'MDL-47140-master' of git://github.com/gurgus/moodle
Dan Poltawski [Mon, 13 Oct 2014 08:54:02 +0000 (09:54 +0100)]
Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle

6 years agoMDL-47463 core_grades: Behat checks the contribution of scales
Frederic Massart [Mon, 13 Oct 2014 07:51:55 +0000 (15:51 +0800)]
MDL-47463 core_grades: Behat checks the contribution of scales

6 years agoMDL-47463 core_grades: Handle course contribution of scales
Frederic Massart [Mon, 13 Oct 2014 07:06:45 +0000 (15:06 +0800)]
MDL-47463 core_grades: Handle course contribution of scales

6 years agoMDL-47140 editor_atto: Improved error handling
Dave Cooper [Tue, 7 Oct 2014 07:34:25 +0000 (15:34 +0800)]
MDL-47140 editor_atto: Improved error handling

6 years agoMDL-46546 core_grades: Notice display for bad import.
Adrian Greeve [Mon, 13 Oct 2014 02:36:38 +0000 (10:36 +0800)]
MDL-46546 core_grades: Notice display for bad import.

If the initial import of csv data is bad, a notification
will be displayed to the user.

6 years agoMDL-46819 core_grades: Negative weights are changed to 0
Adrian Greeve [Thu, 9 Oct 2014 08:33:53 +0000 (16:33 +0800)]
MDL-46819 core_grades: Negative weights are changed to 0

Negative weights in the natural aggregation are not currently permitted.
Any figure below zero is changed to a zero.

6 years agoMDL-47603 quiz edit: qbank popup preview icon needs new window
Tim Hunt [Fri, 10 Oct 2014 12:40:16 +0000 (13:40 +0100)]
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.

6 years agoMoodle release 2.8beta v2.8.0-beta
Dan Poltawski [Fri, 10 Oct 2014 11:09:18 +0000 (12:09 +0100)]
Moodle release 2.8beta

jabber bot fighting edition.

6 years agoNOBUG: Fixed file access permissions
Dan Poltawski [Fri, 10 Oct 2014 11:09:18 +0000 (12:09 +0100)]
NOBUG: Fixed file access permissions

6 years agoNOBUG: Fixed SVG browser compatibility
Dan Poltawski [Fri, 10 Oct 2014 11:09:15 +0000 (12:09 +0100)]
NOBUG: Fixed SVG browser compatibility

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 10 Oct 2014 11:09:14 +0000 (12:09 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-43089 quiz editing: don't pop up qbank on initial page load.
Tim Hunt [Fri, 10 Oct 2014 10:00:12 +0000 (11:00 +0100)]
MDL-43089 quiz editing: don't pop up qbank on initial page load.

6 years agoMDL-47613 wiki: allow searching several words
Marina Glancy [Fri, 10 Oct 2014 06:15:19 +0000 (14:15 +0800)]
MDL-47613 wiki: allow searching several words

Thanks to Sandeep B for suggested solution

6 years agoMerge branch 'wip-MDL-46576-master-upgrade-fix' of https://github.com/abgreeve/moodle
Dan Poltawski [Fri, 10 Oct 2014 08:20:30 +0000 (09:20 +0100)]
Merge branch 'wip-MDL-46576-master-upgrade-fix' of https://github.com/abgreeve/moodle

6 years agoMDL-46576 core_grades: Fix upgrade to natural weight.
Adrian Greeve [Fri, 10 Oct 2014 07:30:12 +0000 (15:30 +0800)]
MDL-46576 core_grades: Fix upgrade to natural weight.

When upgrading from 'Sum of grades' to natural aggregation the
weights were no automatically assigned and the grade totals were
wrong. This has now been rectified.

6 years agoMDL-40351 course overview block: improved strings
Helen Foster [Fri, 10 Oct 2014 07:30:06 +0000 (08:30 +0100)]
MDL-40351 course overview block: improved strings

6 years agoMDL-46658 gradereport_grader: Remove max-width for RTL
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-46658 gradereport_grader: Remove max-width for RTL

For some reason, Safari behaves incorrectly when dealing with RTL content
where the table has a max-width of 100%.

This issue is a part of the MDL-25544 Epic.

6 years agoMDL-46658 gradereport_grader: Fix minor RTL style issues
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-46658 gradereport_grader: Fix minor RTL style issues

This issue is a part of the MDL-25544 Epic.

6 years agoMDL-46658 gradereport_grader: Style the ajax editing error
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-46658 gradereport_grader: Style the ajax editing error

This issue is a part of the MDL-25544 Epic.

6 years agoMDL-47431 advanced grading: correct use of frankenstyle names for consistency
Dan Marsden [Fri, 10 Oct 2014 01:57:29 +0000 (14:57 +1300)]
MDL-47431 advanced grading: correct use of frankenstyle names for consistency

6 years agoMDL-47353 gradereport_grader: Only respect fixed headers
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-47353 gradereport_grader: Only respect fixed headers

Even if the navbar is in a static header, it should only be respected if it
is fixed still.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.

6 years agoMDL-43089 quiz editing: fix some qbank popup JS issues.
Tim Hunt [Thu, 9 Oct 2014 16:22:22 +0000 (17:22 +0100)]
MDL-43089 quiz editing: fix some qbank popup JS issues.

6 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 Oct 2014 16:05:27 +0000 (00:05 +0800)]
Automatically generated installer lang files

6 years agoMDL-43089 quiz editing: fix RTL
Tim Hunt [Thu, 9 Oct 2014 15:34:38 +0000 (16:34 +0100)]
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.

6 years agoMerge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Thu, 9 Oct 2014 11:16:43 +0000 (12:16 +0100)]
Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle

6 years agoMDL-46481 backup: Ensure one-click backup is not displayed on restore
Frederic Massart [Thu, 9 Oct 2014 10:45:32 +0000 (18:45 +0800)]
MDL-46481 backup: Ensure one-click backup is not displayed on restore

6 years agoMerge branch 'MDL-47556' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 9 Oct 2014 09:54:19 +0000 (10:54 +0100)]
Merge branch 'MDL-47556' of git://github.com/timhunt/moodle

6 years agoMDL-47594 core_accesslib: removed three useless lines of code
Kordan [Thu, 9 Oct 2014 09:04:36 +0000 (11:04 +0200)]
MDL-47594 core_accesslib: removed three useless lines of code

6 years agoMDL-36014 cohorts: fix error in SQL query
Marina Glancy [Thu, 9 Oct 2014 07:33:49 +0000 (15:33 +0800)]
MDL-36014 cohorts: fix error in SQL query

6 years agoMerge branch 'MDL-47509' of https://github.com/stronk7/moodle
Dan Poltawski [Thu, 9 Oct 2014 06:13:18 +0000 (07:13 +0100)]
Merge branch 'MDL-47509' of https://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 9 Oct 2014 06:05:09 +0000 (07:05 +0100)]
Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle

6 years agoMDL-46921 User: Add @core_user to new behat test.
Damyon Wiese [Thu, 9 Oct 2014 03:19:47 +0000 (11:19 +0800)]
MDL-46921 User: Add @core_user to new behat test.

6 years agoMDL-47583 atto_managefiles: correctly decode filename
Marina Glancy [Thu, 9 Oct 2014 02:58:44 +0000 (10:58 +0800)]
MDL-47583 atto_managefiles: correctly decode filename

6 years agoMDL-47583 tinymce_managefiles: correctly decode filename
Marina Glancy [Thu, 9 Oct 2014 02:54:46 +0000 (10:54 +0800)]
MDL-47583 tinymce_managefiles: correctly decode filename

6 years agoMerge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Thu, 9 Oct 2014 02:44:04 +0000 (15:44 +1300)]
Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle

6 years agoMDL-46284 tool_messageinbound: Fail with warning if handler disabled
Andrew Nicols [Wed, 8 Oct 2014 09:19:22 +0000 (17:19 +0800)]
MDL-46284 tool_messageinbound: Fail with warning if handler disabled

If a handler is disabled, the user should be informed of this issue.

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

6 years agoMerge branch 'wip-MDL-46921-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Thu, 9 Oct 2014 01:57:58 +0000 (09:57 +0800)]
Merge branch 'wip-MDL-46921-master' of git://github.com/abgreeve/moodle

6 years agoMDL-46921 lib: behat tests for alternate name sorting.
Adrian Greeve [Mon, 29 Sep 2014 06:48:45 +0000 (14:48 +0800)]
MDL-46921 lib: behat tests for alternate name sorting.

6 years agoMDL-46921 lib: Sorting on additional fields, admin, enrolment pages.
Adrian Greeve [Mon, 8 Sep 2014 08:21:53 +0000 (16:21 +0800)]
MDL-46921 lib: Sorting on additional fields, admin, enrolment pages.

6 years agoMDL-46921 lib: Update get_all_user_name_fields() plus unit tests.
Adrian Greeve [Tue, 9 Sep 2014 06:52:01 +0000 (14:52 +0800)]
MDL-46921 lib: Update get_all_user_name_fields() plus unit tests.

6 years agoMDL-46921 lib: Add sorting on additional name fields
Adrian Greeve [Mon, 8 Sep 2014 06:14:17 +0000 (14:14 +0800)]
MDL-46921 lib: Add sorting on additional name fields

A thank you to Yishe Choden for creating a patch for this issue.

6 years agoMerge branch 'MDL-46984_master' of https://github.com/markn86/moodle
Sam Hemelryk [Wed, 8 Oct 2014 20:16:40 +0000 (09:16 +1300)]
Merge branch 'MDL-46984_master' of https://github.com/markn86/moodle

6 years agoMerge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 8 Oct 2014 19:51:40 +0000 (08:51 +1300)]
Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:49:58 +0000 (15:49 +0100)]
Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:33:46 +0000 (15:33 +0100)]
Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'MDL-47536' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)]
Merge branch 'MDL-47536' of git://github.com/stronk7/moodle

6 years agoMerge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 8 Oct 2014 14:00:20 +0000 (22:00 +0800)]
Merge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-47084-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 8 Oct 2014 13:43:13 +0000 (14:43 +0100)]
Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
Damyon Wiese [Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)]
Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)]
Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle

6 years agoMDL-47497 qformats gift and xml: basic test of export.
Tim Hunt [Wed, 1 Oct 2014 15:59:56 +0000 (16:59 +0100)]
MDL-47497 qformats gift and xml: basic test of export.

Really, this is just to test the new behat setps, as much as anything.

Note that the details of what is written to the export files is tested in
the unit tests.

6 years agoMDL-47497 behat: steps for basic download testing.
Tim Hunt [Wed, 1 Oct 2014 15:39:06 +0000 (16:39 +0100)]
MDL-47497 behat: steps for basic download testing.

These steps were created by sam marshall and Jes Ackland-Snow at the Open
University. I just altered them to make them a bit more generic, and
submitted them to Moodle core, at the point when I wanted to reuse them
in another plugin.

This commit introduces two new steps:

Then following "XXX" should download "YY" bytes
Then following "XXX" should download between "YY" and "ZZ" bytes

At the moment, this only works for links with href attributes.

6 years agoMDL-47297 libraries: upgrade note about Google API update
Marina Glancy [Wed, 8 Oct 2014 11:22:14 +0000 (19:22 +0800)]
MDL-47297 libraries: upgrade note about Google API update