Commit graph

20598 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
55c0301d33 Merge branch 'MDL-63146-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE 2019-03-14 01:22:19 +01:00
Andrew Nicols
5d4597cda7 MDL-64971 access: Ensure that the capability exists when fetching 2019-03-06 10:16:54 +08:00
Eloy Lafuente (stronk7)
3717e40450 MDL-64943 behat: fix some remaining uses of old strings 2019-03-05 17:02:28 +01:00
Eloy Lafuente (stronk7)
f7e4dacd1e Merge branch 'MDL-64943-35-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_35_STABLE 2019-03-05 11:09:42 +01:00
Jun Pataleta
c80db2680f Merge branch 'MDL-62465-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2019-03-05 15:29:55 +08:00
Damyon Wiese
438cf695bf MDL-62465 assign: Remove behat step
We don't need to open the menu to choose the "Grade" item, we can just click the button.
2019-03-05 14:49:51 +08:00
Adrian Greeve
3eab97cc34 Merge branch 'MDL-64678-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2019-03-05 13:54:09 +08:00
Shamim Rezaie
4480118b5d MDL-63146 mod_quiz: Add userid param to mod_quiz calendar callbacks 2019-03-05 14:23:47 +11:00
Andrew Nicols
0b9e9bf89d MDL-64652 mod_data: Break LEFT JOINs to multiple INNER 2019-03-05 10:17:36 +08:00
Andrew Nicols
ed5a080034 MDL-64652 glossary: Break LEFT JOINs to multiple INNER 2019-03-05 10:17:36 +08:00
Andrew Nicols
419275478b MDL-64652 forum: Use an inner join when fetching ratings 2019-03-05 10:17:36 +08:00
Andrew Nicols
6b9cce6b98 MDL-64652 mod_forum: Performance improvement for provider
There are possibly some further improvements that can be made to:
- export_discussion_data
- export_all_posts
2019-03-05 10:17:10 +08:00
Damyon Wiese
95209cb64a MDL-64678 assign: More ios touch
Only disable touch scrolling when the touch event is within the drawing region of the canvas.
2019-03-05 08:49:49 +08:00
David Mudrák
d5cdc97b2f MDL-64943 lang: Fix regressions in Behat caused by reworded strings 2019-02-28 18:07:03 +01:00
Helen Foster
bc2a000664 MDL-64943 lang: Import fixed English strings (en_fix)
Significant string changes:

* importgroups_help,core_group - Correcting optional fieldnames
  (removing picture, hidepicture and adding groupidnumber, groupingname
  and enablemessaging)

* penaltyforeachincorrecttry_help,core_question - additional paragraph
  about scoring logic

* resultdownloadready,tool_dataprivacy - wording corrected (no need to
  go to a download page)

* auth_dbfielduser,auth_db - varchar data type requirement
2019-02-28 18:02:44 +01:00
Juan Leyva
651f5c494b MDL-64444 mod_assign: Use correct permissions for viewing grades
Some WebServices does not use the correct permissions.
Now we are using assign own API (require_view_grades()) instead.

Note this patch is different from the 36_STABLE and master ones
because there isn't context freezing here. Just we decided to
apply the changes for consistent perm evaluation in all branches.
2019-02-28 01:25:13 +01:00
Eloy Lafuente (stronk7)
d14925e818 Merge branch 'MDL-63417-35' of git://github.com/mihailges/moodle into MOODLE_35_STABLE 2019-02-26 23:19:25 +01:00
Sara Arjona
a5dfb4cb3b Merge branch 'MDL-43428-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE 2019-02-26 14:09:15 +01:00
Shamim Rezaie
f4713ca7ec MDL-43428 accessrule_timelimit: timeclose can be ealier than timelimit 2019-02-26 14:45:37 +11:00
Adrian Greeve
ce0a325481 Merge branch 'MDL-64640-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2019-02-25 10:29:35 +01:00
John Beedell
a37d6ab8ff MDL-64729 mod_glossary: glossary_get_entries_search case sensitivity 2019-02-21 12:35:45 +01:00
Adrian Greeve
96803a9db7 Merge branch 'MDL-64856_m35v1' of git://github.com/sbourget/moodle into MOODLE_35_STABLE 2019-02-20 18:06:16 +01:00
Eloy Lafuente (stronk7)
903be41022 Merge branch 'MDL-63134-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE 2019-02-20 00:01:11 +01:00
Eloy Lafuente (stronk7)
2e80ca02f3 Merge branch 'MDL-64540-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2019-02-19 15:42:11 +01:00
David Monllaó
c96968b7e9 Merge branch 'MDL-45151-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2019-02-19 06:40:33 +01:00
Damyon Wiese
e995a79f7b MDL-64540 assign: Backport of MDL-60008
This patch combines the following changes:

* Basically we should produce a combined PDF from all the files that it was possible to convert.
* If any one submission input file fails conversion, it should just be omitted in the result.
* When not all files are available in the online pdf, display a warning to graders
that some files must be downloaded.
* Better support for information messages from the conversion process.
* Remove the z-index values from the expand / collapse panels. They cause errors when mixed with dialogues.
* The edit pdf menus are all broken on small screen sizes. They consume 100% of the page with for no reason.
* The heights of the buttons to hide/show panels are arbitrarily big. There is not need to set them specifically.
2019-02-19 10:23:50 +08:00
Stephen Bourget
4440ca8121 MDL-64856 mod_glossary: Always show the settings cog on the view page. 2019-02-14 12:47:01 -05:00
Jun Pataleta
af3214adae Merge branch 'MDL-63892-35-rework' of git://github.com/mickhawkins/moodle into MOODLE_35_STABLE 2019-02-13 21:00:46 +08:00
Michael Hawkins
a3f16eb4ea MDL-63892 mod_forum: Behat update for post order 2019-02-13 16:47:46 +08:00
Andrew Nicols
c35399cc17 Merge branch 'MDL-63892-35-rework' of git://github.com/mickhawkins/moodle into MOODLE_35_STABLE 2019-02-13 10:19:56 +08:00
David Monllaó
799e4e2fbf Merge branch 'MDL-64730-lti-adv-0score-35' of https://github.com/CengageEng/moodle into MOODLE_35_STABLE 2019-02-12 12:33:38 +01:00
Eloy Lafuente (stronk7)
008121e57f Merge branch 'MDL-64238-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2019-02-11 23:57:18 +01:00
Peter
67bc6c6ebb MDL-64238 mod_quiz: Check enrollment on calendar_action generator
* Updated unit tests to account for participants
2019-02-12 06:26:23 +08:00
Peter
649ffed15d MDL-64238 mod_lesson: Check enrollment calendar_action generator
* Updated unit tests to account for participants
2019-02-12 06:26:23 +08:00
Sara Arjona
571b22a693 Merge branch 'MDL-48338-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2019-02-11 10:41:31 +01:00
Shamim Rezaie
b8ddf80ca6 MDL-63134 mod_chat: Check if the module is visible to the user 2019-02-11 16:10:41 +11:00
Shamim Rezaie
d2abeb3b3c MDL-63134 mod_chat: Add userid param to mod_chat calendar callbacks 2019-02-11 16:10:41 +11:00
Anthony Ales
4e9c2677e5 MDL-48338 forum: Missing #unread in discussion post url
When a user user selects the unread messages link from the forum
discussion page, the link does not include '#unread' in the url.
This patch appends '#unread' to the url by changing the appropriate
value in the reference link assigned to $out within the function
forum_cm_info_view() of the 'lib.php'file.

A similar change is on the forum index.
2019-02-07 15:17:21 +08:00
Eloy Lafuente (stronk7)
cf775cb602 Merge branch 'MDL-63148-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2019-02-06 13:28:40 +01:00
Mihail Geshoski
9fb8d55550 MDL-63417 lesson: Re-apply class variable to the question response 2019-02-06 15:02:34 +08:00
Jun Pataleta
9f19bb9dfb Merge branch 'MDL-61405-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2019-02-06 13:12:16 +08:00
Damyon Wiese
06e372a3c8 MDL-61405 assign: Multiple pdfs are expected
In the same page it is normal (expected) to have multiple links to different annotated pdfs.

In the grading page, we also abort pending ajax progress when the current user is changed.
2019-02-06 09:38:08 +08:00
Sara Arjona
3144a87a57 Merge branch 'MDL-62893_35' of https://github.com/mfabriczy/moodle into MOODLE_35_STABLE 2019-02-05 20:06:58 +01:00
Marcus Fabriczy
68bc7c4658 MDL-62893 mod: Grade visibility bug in the Outline/Complete reports
Grades that have been hidden will appear in the outline/complete
report - even if the user is a student.

The modules that have been fixed are:
* mod_assign
* mod_data
* mod_forum
* mod_glossary
* mod_lesson
* mod_scorm
* mod_workshop
2019-02-05 20:12:14 +10:30
Eloy Lafuente (stronk7)
9400329867 Merge branch 'MDL-63975-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2019-02-04 13:22:03 +01:00
Damyon Wiese
db3008e2fa MDL-45151 assign: Add anonymous flag to events if blindmarking 2019-02-01 09:14:12 +08:00
Damyon Wiese
5944f26805 MDL-63975 assign: Fix error when there is no grader 2019-01-31 13:09:30 +08:00
Eloy Lafuente (stronk7)
ad2ee11aae Merge branch 'MDL-62514-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2019-01-30 23:01:27 +01:00
Claude Vervoort
be5dd33e4d MDL-64730 LTI Adv: do not ignore 0 score 2019-01-30 16:15:23 -05:00
Sara Arjona
a16553fc55 Merge branch 'MDL-47247-35' of git://github.com/mihailges/moodle into MOODLE_35_STABLE 2019-01-30 14:03:27 +01:00