Commit graph

4993 commits

Author SHA1 Message Date
David Monllao
aa30dc8860 MDL-59256 analytics: Respect activities specific access conditions 2017-11-07 08:14:53 +01:00
Andrew Nicols
03561ea899 Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle 2017-11-07 13:49:47 +08:00
Ryan Wyllie
6688ae2ba2 MDL-60062 calendar: prevent drag and drop of override events 2017-11-07 05:47:18 +00:00
Damyon Wiese
65c52e05d1 MDL-58699 mod_quiz: Require javascript for popup
If any of the access rules require the attempt to open in a new window, assume we
require javascript to attempt the quiz. This makes it harder to bypass the javascript
pseudo security restrictions.
2017-11-07 12:48:21 +08:00
Ryan Wyllie
478b1d194f MDL-60062 calendar: remove validate_event_timestart callback 2017-11-07 01:25:33 +00:00
Ryan Wyllie
9aac9f7074 MDL-60062 quiz: add support for drag drop of calendar events 2017-11-07 01:25:32 +00:00
Jun Pataleta
a56833d49d Merge branch 'MDL-60611' of git://github.com/stronk7/moodle 2017-11-07 10:14:24 +13:00
Eloy Lafuente (stronk7)
801a372dad MDL-60611 phpunit: switch to namespaced phunit classes 2017-11-02 23:45:34 +01:00
Damyon Wiese
5dbd051502 Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle 2017-11-02 14:39:32 +08:00
Jake Dallimore
9daa5874a0 Merge branch 'MDL-60607' of git://github.com/timhunt/moodle 2017-10-31 12:57:36 +08:00
Tim Hunt
ade8dd5d08 MDL-60607 quiz reports: catch separate groups & user has no group case 2017-10-30 17:57:30 +00:00
Tim Hunt
eefa2c88e0 MDL-60607 quiz reports: move duplicate code to superclass method 2017-10-30 13:43:36 +00:00
Tim Hunt
dae0ccfc45 MDL-59606 quiz responses: fix edge cases in the report
This patch conbines valuable contributions from Kashmira Nagwekar and
Luca Bösch. Many thanks to them. However, the final form of the fix,
and hence the blame, falls to me -- Tim.

There were several issues here:

* The load_questions_usages_by_activity method in
  question/engine/datalib.php was incorrectly treating the case
  when no data was returned. (Looks like a historic copy-pase from
  other methods that fetch one item by unique id, which therefore
  must exist.)

* The report was not correctly handling the display when the 'Which
  tries' was set to 'with, and without, attempts'.

* It was possible to select the 'All tries' option when also saying
  'Users without attempts'. This combination makes not sense, so
  a disabledIf rule was added to the form.
2017-10-27 16:57:01 +01:00
David Monllao
ef9f60a635 MDL-59950 analytics: Use cognitive depth and social breadth constants 2017-10-27 10:48:42 +02:00
Andrew Nicols
4cc469b2cc Merge branch 'MDL-60162' of git://github.com/timhunt/moodle 2017-10-26 14:04:45 +08:00
Andrew Nicols
4d4b8ae6bf Merge branch 'MDL-60535-questionbank-button-styled' of https://github.com/lucaboesch/moodle 2017-10-26 13:17:56 +08:00
Tim Hunt
c282157fc3 MDL-60162 quiz reports: refactor duplicated code into the base class
This is needed to fix the unit test in the last commit.
2017-10-24 18:06:46 +01:00
Tim Hunt
ff456b59ea MDL-60162 quiz reports: too many rows fetched on download
This happened if one user had multiple enrolments in a course, and was
quite inefficient.
2017-10-24 18:06:44 +01:00
Luca Bösch
57f4e9608d MDL-60535 quiz: question bank button styled 2017-10-24 16:08:17 +01:00
Luca Bösch
1003e7e57e MDL-60571 quiz: Manual grading Save and go to next page button styled 2017-10-24 12:11:51 +01:00
Eloy Lafuente (stronk7)
6b7194a7cf Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle 2017-10-19 22:30:08 +02:00
Andrew Nicols
f10721d6b9 MDL-60072 mod: Fix bad event naming 2017-10-16 14:47:09 +08:00
Marina Glancy
33683bc80c MDL-60281 general: function each() is deprecated in PHP7.2 2017-10-16 09:37:20 +08:00
Eloy Lafuente (stronk7)
0a073e9d42 Merge branch 'MDL-60300' of https://github.com/NeillM/moodle 2017-10-11 01:39:55 +02:00
Andrew Nicols
7da1dd651a Merge branch 'MDL-60317' of git://github.com/timhunt/moodle 2017-10-09 14:05:57 +08:00
Neill Magill
078484f2e2 MDL-60300 Quiz: Offline update time not set correctly 2017-10-06 13:43:42 +01:00
Jake Dallimore
32c369818c Merge branch 'MDL-57228' of git://github.com/timhunt/moodle 2017-10-04 13:42:51 +08:00
Tim Hunt
32250b8836 MDL-60317 quiz reports: fix regression caused by MDL-57511 2017-10-02 18:22:58 +01:00
Andrew Nicols
39195b6aed Merge branch 'MDL-58790' of git://github.com/timhunt/moodle 2017-10-02 15:39:26 +08:00
Tim Hunt
5cbb7bf887 MDL-58790 quiz editing: translate hard-coded new heading string 2017-09-26 11:17:27 +01:00
Carson Tam
43f122d32c MDL-59931 mod_quiz: Fixing incorrect pagination count. 2017-09-25 12:46:52 -07:00
Shamim Rezaie
f061709e62 MDL-57228 quiz editing: unit test for the move case 2017-09-25 12:54:05 +01:00
Tim Hunt
6c73dd9593 MDL-57228 quiz: fix editing when there are one-question sections
Fix based on a patch by Joost van der Borg <j.van.der.borg@ssr.nl>.
2017-09-25 12:16:12 +01:00
Dan Poltawski
743c937dae Merge branch 'MDL-59459_Increase_file_indexing_coverage' of https://github.com/mattporritt/moodle 2017-09-11 14:01:40 +01:00
Helen Foster
7698619bc6 MDL-59983 lang: Merge English strings from the en_fix language pack
Significant string changes:

* mobileappenabled, setuplink and setuplink_desc in tool_mobile -
  improved wording
* getmoodleonyourmobile and custommenuitems_desc in tool_mobile -
  improved wording
2017-09-05 11:01:09 +02:00
Matt Porritt
4e921569d0 MDL-59459 Golbal Search: Increase file indexing coverage
Increase the scope of the files that are detected and
indexed by Moodle's Global Search. This includes intro
and content areas of search areas. The use case here is
in a description for an activity there is a file added
that contains more information about the activity.
It would an advantage to be able to search this content
as well. It would also allow search engine plugins to be
able to index non text files such as images.
2017-09-02 10:28:17 +10:00
David Monllao
edee629d1a MDL-59030 analytics: Expand community of inquiry mods public API 2017-08-29 06:19:37 +02:00
Mark Nelson
b94814fa91 MDL-59204 analytics: added corresponding name '_help' strings
Strings are intentionally left blank as they will be done later by
AMOS.
2017-08-18 18:02:38 +08:00
Mark Nelson
7e00aa725a MDL-59204 analytics: changed get_name so that it returns a lang_string
This was done for indicators, targets and time splitting methods so that we
can get the string identifier and component in order to display a help_icon.

The functions were also made abstract, removing the default implementation.
Indicators, targets and time splitting methods should define this function.
2017-08-18 18:02:38 +08:00
Mark Nelson
952cbce293 MDL-59204 mod_*: removed redundant activity name from string index
Also fixed references to incorrect strings.
2017-08-15 16:55:28 +08:00
Andrew Nicols
77c5325f81 Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle 2017-08-01 13:39:38 +08:00
Ankit Agarwal
0d14fcbc60 MDL-9367 restore: Roll only configuration dates
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
2017-08-01 10:46:37 +05:30
David Monllao
7190f330b4 Merge branch 'MDL-59602_coursenav' of https://github.com/mrmark/moodle 2017-07-31 13:21:09 +02:00
Ankit Agarwal
0b3326b50e MDL-58196 availability: Add appropriate dependencies in mform 2017-07-31 11:56:11 +05:30
David Monllao
413f19bc49 MDL-59211 analytics: Make cibot happy
Part of MDL-57791 epic.
2017-07-24 08:36:49 +02:00
David Monllao
9ad87761ef MDL-59117 quiz: Move quiz indicators to the correct location
Part of MDL-57791 epic.
2017-07-24 08:36:21 +02:00
Ankit Agarwal
5846c72c4d MDL-59117 core_analytics: Move all indicators to respective modules
Part of MDL-57791 epic.
2017-07-24 08:36:21 +02:00
Mark Nielsen
197e2bca5b MDL-59602 behat: make use of new course nav steps 2017-07-21 13:50:47 -07:00
Andrew Nicols
5ee30c0fb4 Merge branch 'mdl55979-master' of https://github.com/tlock/moodle 2017-07-17 12:29:00 +08:00
Dan Poltawski
e5ca70ba1d MDL-59287 upgrade.txt: avoid misleading versions 2017-07-11 11:30:43 +01:00