18439 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b705cefa18 Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle 2016-10-17 18:50:07 +02:00
Dan Poltawski
54c1da6690 Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle 2016-10-17 12:52:26 +01:00
Dan Poltawski
a4c7a0bd95 Merge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle 2016-10-17 12:06:42 +01:00
Dan Poltawski
6578ffe4e0 Merge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle 2016-10-17 10:23:35 +01:00
Andrew Nicols
608edec5ca MDL-56208 mod_forum: Move Display period below Group 2016-10-17 11:46:36 +08:00
Jean-Philippe Gaudreau
6399ecd743 MDL-55630 mod_assign: Exclude users courses from user details
Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.
2016-10-14 09:28:18 -04:00
Marc Català
260713fc8e MDL-56300 mod_assign: Filtering students throws a javascript error 2016-10-14 09:28:20 +02:00
Rajesh Taneja
fbaf5d17d8 MDL-27072 behat: Removed wrong tag from feature 2016-10-13 19:32:08 +02:00
Rajesh Taneja
25b225a995 MDL-27072 behat: Fixed table separators 2016-10-13 19:32:07 +02:00
David Mudrák
0cc5c64608 MDL-54945 workshop: Improve the portfolio API implementation
* Use a single capability 'mod/workshop:exportsubmissions' to control
  who is able to export a submission and all associated visible
  peer-assessments.
* The export capability is by default granted to teachers and managers
  as well.
* Simplify the integration of the export button into the submission
  page. There is now a single place where the export button appears - at
  the buttom of the submission page.
* Clean up the new strings introduced for this feature.
* Rewrite the portfolio caller class so that it better mimics the
  behaviour of the submission.php page. It must not be possible to get
  access to contents otherwise not available via the UI.
* Fix phpunit tests.
* Improve behat tests so that they can run in headless browser
  (performance).

During the development, some problems were detected in the underlying
portfolio API, especially with LEAP2A format and files collisions
handling. These may be eventually fixed in the future, should there be a
demand for it.
2016-10-12 18:35:02 +02:00
Dan Poltawski
17ab49e9b1 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-12 14:53:01 +01:00
Tony Butler
88d309d947 MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page 2016-10-12 14:17:48 +01:00
Rajesh Taneja
cd5e416560
MDL-27072 behat: Removed wrong tag from feature 2016-10-12 12:57:22 +08:00
Rajesh Taneja
c76e57aace
MDL-27072 behat: Fixed table separators 2016-10-12 11:05:07 +08:00
David Mudrák
931bba6054 MDL-54945 workshop: Introduce workshop::check_group_membership() method
This is just a refactored code block present at two different places. We
will need the same logic in the portfolio caller class soit made sense
to implement it as a new method, rather than make another copy&paste.

As a side effect, the logic is now properly unit tested.
2016-10-11 20:23:55 +02:00
Dan Poltawski
287a906645 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-11 17:35:07 +01:00
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Loc Nguyen
5fd75ed889 MDL-54945 workshop: Workshop portfolio API integration
Users can export their own submission
Users can export feedback/assessment received from other users
2016-10-11 12:51:15 +02:00
Mark Nelson
16f91ae12a MDL-56299 core: fixed failing Behat tests
This also involved removing legacy Behat tests.
2016-10-11 14:39:24 +08:00
Eloy Lafuente (stronk7)
db43b23848 Merge branch 'wip-MDL-27072-master' of https://github.com/Beedell/moodle 2016-10-11 02:42:02 +02:00
Eloy Lafuente (stronk7)
dcd5c7cd1b Merge branch 'MDL-56228-master' of https://github.com/snake/moodle 2016-10-11 02:02:23 +02:00
Eloy Lafuente (stronk7)
6bf8e9b021 Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle 2016-10-11 01:21:14 +02:00
John Beedell
10c4fce520 MDL-27072 Quiz: Remove get_users_by_capability from quiz reports 2016-10-10 11:05:15 +01:00
Tony Butler
3cd718e859 MDL-56324 assignfeedback_editpdf: Get current page no from page selector
When navigating to next/previous page or jumping to a comment
2016-10-10 09:52:19 +01:00
Jun Pataleta
2d3130532c MDL-56232 mod_lti: Fix logic for disabling mod_form fields
* Disable tool "Select content" button if selected preconfigured tool
  does not support Content-Item, and if the selected option is set to
  "Automatic, based on launch URL".
* Disable tool configuration form fields if selected preconfigured tool
  does not support Content-Item, but enable these fields if the selected
  option is set to "Automatic, based on launch URL".
* Behat tests also updated to check disabling/enabling of launch url field.
2016-10-10 13:16:25 +08:00
Jake Dallimore
4c1bc2422d MDL-56228 phpunit: Force sort order in mod data generator test 2016-10-10 09:32:24 +08:00
Dan Poltawski
e4edbce35d MDL-55835 js: fix lint issues
Some caused by eslint checks being better, some just not detected
because we don't show warnings well (MDL-54930).
2016-10-07 10:03:43 +01:00
Dan Poltawski
41a9a9219a MDL-56303 quiz: lack of quiz filtering
Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.
2016-10-06 22:24:57 +02:00
Cameron Ball
2ce9628484
MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade
When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.
2016-10-05 19:21:40 +08:00
Dan Poltawski
4f11002077 Merge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle 2016-10-05 10:33:14 +01:00
Cameron Ball
26cb467b47
MDL-54802 mod_quiz: Move grade to pass error to require passing grade element
When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.

Additionaly this patch fixes a small typo in a comment.
2016-10-05 17:14:00 +08:00
David Monllao
5be1491759 Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle 2016-10-05 15:51:43 +08:00
Rajesh Taneja
86ebbed6ca
MDL-56210 behat: Test for disabled button later
With phantomjs, dom is not updated by the time
next step is executed, so suffle it to ensure
this scenario pass
2016-10-05 15:45:22 +08:00
Dan Poltawski
e43bab742d Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle 2016-10-05 08:08:11 +01:00
David Monllao
c7fc66f2ac Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle 2016-10-05 09:42:17 +08:00
Juan Leyva
30cdddb017 MDL-55129 mod_assign: Allow plugins to handle configs for external
Until now in the get_assignments WS all the settings for assignment
plugins (submission and feedback) are returned, this was bad because:

- It was returning settings for plugins that may not be enabled
- It was returning settings that would be a security risk (a third
party plugin including a password or credentials for connecting a
remote site)
- Some values was returned "raw" without further processing, for
example, maxsubmissionsizebytes returned 0 when using the plugin
default value instead a valid size
- Assignment plugins implemented an API for communication with the
external API, see for example: get_external_parameters, it didn’t make
sense had an API for the received parameters and not the returned data.
2016-10-04 20:28:38 +01:00
Eloy Lafuente (stronk7)
461e98cdd7 Merge branch 'MDL-56069' of git://github.com/timhunt/moodle 2016-10-04 16:34:50 +02:00
Dan Poltawski
917a59a1a0 Merge branch 'MDL-55728-master' of git://github.com/jleyva/moodle 2016-10-04 10:15:37 +01:00
Andrew Nicols
c8379882b8 Merge branch 'MDL-56198' of git://github.com/timhunt/moodle 2016-10-04 09:01:25 +08:00
Juan Leyva
c8743f62b4 MDL-55728 webservice: Return editor files in Web Services 2016-10-03 16:49:13 +01:00
Tim Hunt
9bee35d5ad MDL-56198 assignment: improve grading info responsiveness 2016-10-03 16:09:21 +01:00
Dan Poltawski
2d71da6851 Merge branch 'MDL-54802-master' of git://github.com/lameze/moodle 2016-10-03 14:46:43 +01:00
Dan Poltawski
5e0e9f3674 MDL-55740 mod_assign: bump version 2016-10-03 11:18:43 +01:00
Dan Poltawski
b885488c02 Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle 2016-10-03 11:16:09 +01:00
David Monllao
c41132f075 Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle 2016-10-03 14:33:24 +08:00
Rajesh Taneja
24c2dcada5
MDl-56210 behat: Ensure page is loaded, before checking button 2016-10-03 13:03:51 +08:00
Tim Hunt
67c8c9b493 MDL-56069 quiz: nav buttons don't scroll to the right question
When there is more than one question on a page, say questions 2, 3 & 4.
Then when you click the navigation button for Q4, then it should load
the next page scrolled down so that Q4 is visible. That was not working.
2016-09-30 15:05:02 +01:00
Dan Poltawski
e63d89a51d MDL-55168 assign: fix some incorrectly defined css transitions
The lint error suggests as though we were waiting 0s to do a
transiition of duration of 0s (i.e.  nothing), but thats not actually
the case.
2016-09-30 09:25:30 +01:00
Dan Poltawski
693652b78d MDL-55168 css: fix various errors detected by stylelint
Ignored properties, invalid propertiies, duplicates, invalid selectors..

Detected by stylelint rules:

http://stylelint.io/user-guide/rules/declaration-block-no-ignored-properties
http://stylelint.io/user-guide/rules/selector-type-no-unknown
http://stylelint.io/user-guide/rules/declaration-block-no-duplicate-properties
http://stylelint.io/user-guide/rules/max-line-length
http://stylelint.io/user-guide/rules/no-browser-hacks
2016-09-30 09:25:25 +01:00
Dan Poltawski
99fe296eb2 MDL-55168 css: remove 0-length units 2016-09-30 09:25:25 +01:00