19184 Commits

Author SHA1 Message Date
Andrew Nicols
d4be750a7c Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle 2017-04-18 08:41:59 +08:00
Ruslan Kabalin
fc9bc65863 MDL-58539 assignfeedback_editpdf: Fix group assignment fatal error.
This makes sure that $grade->attemptnumber is not NULL before using its
value.
2017-04-17 17:00:47 +02:00
Dan Poltawski
9556d5ec52 Merge branch 'MDL-46929' of https://github.com/stronk7/moodle 2017-04-17 10:53:42 +01:00
Eloy Lafuente (stronk7)
43bb3b77a5 MDL-46929 mod_forum: behat fixes
- Keep old scenarios being non-javascript.
- Move the tags stuff to recently added scenario.
- Change some "my" by "your" to avoid problems detecting results
  while keeping previous tests (based on "subject") working.
2017-04-17 11:44:00 +02:00
Dan Poltawski
6a346ab440 Merge branch 'MDL-58507_master' of git://github.com/markn86/moodle 2017-04-17 10:42:48 +01:00
Andrew Nicols
e4a090c105 Merge branch 'MDL-58501_master' of git://github.com/markn86/moodle 2017-04-13 13:21:42 +08:00
Andrew Nicols
20026ab3c1 Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle 2017-04-13 12:10:45 +08:00
Andrew Nicols
270d5c1cc5 Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle 2017-04-13 10:00:58 +08:00
Andrew Nicols
28b966a5f9 Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle 2017-04-13 08:44:15 +08:00
Mark Nelson
59391e80ad MDL-58501 mod_*: improved docs for new calendar callbacks 2017-04-12 17:43:52 +08:00
Mark Nelson
063b7ee647 MDL-58507 core: link functions with final deprecation issue 2017-04-12 12:38:51 +08:00
Jun Pataleta
8168bfd3e4 Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle 2017-04-12 10:06:13 +08:00
Andrew Nicols
0c0f3fdc1e MDL-58576 mod_forum: Fix behat failures after string change 2017-04-12 09:32:05 +08:00
Eloy Lafuente (stronk7)
ad02561c15 Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle 2017-04-11 16:47:29 +02:00
Andrew Hancox
32a96916a6 MDL-46929 mod_forum: Improve behat tests 2017-04-11 13:34:22 +01:00
Juan Leyva
7f700290b2 MDL-58453 mod_feedback: Add missing security checks
Some checks done in mod/feedback/show_nonrespondents.php were missing.
- Check for anonymous feedback
- Check for real courses (not site home)
2017-04-11 09:42:27 +01:00
Andrew Hancox
e9c46768b5 MDL-46929 mod_forum: Fix for edge cases when searching 2017-04-11 08:30:09 +01:00
Marina Glancy
151113f93a MDL-46929 mod_forum: performance improvement for tags backup/restore 2017-04-11 08:30:09 +01:00
Marina Glancy
34c8585d83 MDL-46929 mod_forum: small fixes for post tagging 2017-04-11 08:30:09 +01:00
Andrew Hancox
d2ba493cfe MDL-46929 mod_forum: Implement tagging 2017-04-11 08:30:09 +01:00
Jake Dallimore
84fb93a77e Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle 2017-04-11 10:49:07 +08:00
Andrew Nicols
f669ad5ca7 Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle 2017-04-11 09:46:04 +08:00
Andrew Nicols
23605e9fbc Merge branch 'MDL-58504_master' of git://github.com/markn86/moodle 2017-04-11 08:57:30 +08:00
David Monllao
eda9dbcfe0 Merge branch 'patch-24' of https://github.com/sk-unikent/moodle 2017-04-10 16:59:13 +02:00
David Monllao
fff1b3c464 Merge branch 'wip-MDL-55950-master' of git://github.com/marinaglancy/moodle 2017-04-10 16:05:07 +02:00
David Monllao
ad6478225b Merge branch 'MDL-57858-master' of git://github.com/pavelsokolov/moodle 2017-04-10 14:14:59 +02:00
David Monllao
d096ebe0e4 MDL-56370 mod_feedback: Note about undeprecation 2017-04-10 13:15:15 +02:00
David Monllao
af938cf46e Merge branch 'wip-MDL-56370-master' of git://github.com/marinaglancy/moodle 2017-04-10 13:13:20 +02:00
David Monllao
7841e9f337 Merge branch 'MDL-58104-m' of git://github.com/pavelsokolov/moodle 2017-04-10 09:51:32 +02:00
Damyon Wiese
f3432e038e MDL-58552 quiz: keep quiz css in quiz
The selectors introduced by MDL-48771 need to be qualified to prevent them
breaking random pages (like the course page).
2017-04-10 13:51:02 +08:00
Andrew Nicols
04e45e8e25 Merge branch 'master' of https://github.com/tniessen/moodle 2017-04-10 13:16:29 +08:00
John Okely
61527865a1 MDL-39913 assignsubmission_file: Add validation 2017-04-10 12:07:58 +08:00
Damyon Wiese
1a10c79f67 MDL-58356 icons: Revert file type icons 2017-04-10 11:36:51 +08:00
Andrew Nicols
b140b13c25 Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle 2017-04-10 11:23:37 +08:00
Jake Dallimore
94a26699b1 Merge branch 'MDL-57813-master' of git://github.com/jleyva/moodle 2017-04-10 10:25:23 +08:00
Marina Glancy
85b969f130 MDL-56370 mod_feedback: behat for repeat completion 2017-04-07 16:04:06 +08:00
Marina Glancy
d6f77a435f MDL-56370 mod_feedback: allow to restore values from last attempt 2017-04-07 16:04:06 +08:00
Marina Glancy
d0b4c8a787 MDL-55950 mod_feedback: correct link to response in the email 2017-04-07 16:03:42 +08:00
John Okely
62e87ae4b8 MDL-39913 assign: Add help on filetype submissions 2017-04-07 16:02:00 +08:00
Jonathon Fowler
4044cad5ea MDL-39913 assignsubmission_file: add file types restriction
Testing for uploading a non-permitted file won't work as things stand
currently because the filemanager throws an exception that Behat
catches, which causes a fail.
2017-04-07 16:02:00 +08:00
Andrew Nicols
e6a4780452 MDL-58297 core: Update to use new hashing functions 2017-04-07 10:40:23 +08:00
David Monllao
6099f29beb MDL-55611 mod_quiz: Adapt behat test to myoverview 2017-04-06 18:59:12 +02:00
Juan Leyva
94478c083d MDL-57813 mod_feedback: New WS mod_feedback_get_last_completed 2017-04-06 09:40:26 +02:00
Mark Nelson
01f96180ff MDL-58504 mod_*: fixed PHPDoc return type for *_provide_event_action 2017-04-06 15:00:02 +08:00
David Monllao
a10461e034 Merge branch 'MDL-58369-master' of git://github.com/damyon/moodle 2017-04-06 08:59:21 +02:00
Marina Glancy
63709b0e16 MDL-23919 mod_data: fix bug when completion is reset 2017-04-06 08:54:00 +08:00
Andrew Nicols
00aa58eb5f Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle 2017-04-05 15:49:49 +08:00
Juan Leyva
dbc404de71 MDL-58399 webservice: Add missing upgrade.txt information
We should indicate the API changes for developers.
2017-04-05 09:41:15 +02:00
Juan Leyva
682aea9b84 MDL-58453 mod_feedback: Refactor get_non_respondents WS
We should return more information like if the user started or not the
feedback and the total number of non respondents (to be able to
paginate).
2017-04-05 09:28:29 +02:00
Juan Leyva
007b7cad82 MDL-57813 mod_feedback: Create exporter and required API changes 2017-04-05 09:07:43 +02:00