Commit graph

96027 commits

Author SHA1 Message Date
Jake Dallimore
3ab419ad5a Merge branch 'MDL-67137-master' of git://github.com/andrewnicols/moodle 2019-11-11 14:56:52 +08:00
Andrew Nicols
1c997df371 Merge branch 'MDL-66958' of git://github.com/Chocolate-lightning/moodle_forum-project 2019-11-11 11:26:08 +08:00
Mathew May
8827e573db MDL-66958 core_grade: Add hasgrade to all external fetch webservices 2019-11-11 11:25:17 +08:00
Mathew May
63cd8d45db MDL-66958 core_grade: Add grade status abstract
Also implement the new abstract in Forum
2019-11-11 11:25:17 +08:00
Mathew May
8b04be120b MDL-66958 core_grade: Only save scale on form change 2019-11-11 11:25:17 +08:00
Mathew May
08f11b07b4 MDL-66958 core_grade: Only save point on form change 2019-11-11 11:25:17 +08:00
Mathew May
e659dc651e MDL-66958 gradingform_guide: Only save on form change 2019-11-11 11:25:17 +08:00
Mathew May
9769ba08b3 MDL-66958 gradingform_rubric: Only save on form change 2019-11-11 11:25:17 +08:00
David Monllaó
a461d36010 MDL-67187 analytics: Fix broken text comparison 2019-11-11 11:00:28 +08:00
Andrew Nicols
13965d30fe Merge branch 'MDL-66447' of https://github.com/Chocolate-lightning/moodle_forum-project 2019-11-11 10:55:46 +08:00
Michael Hawkins
a25f9cc357 MDL-66447 forumreport_summary: Added event logging 2019-11-11 10:49:09 +08:00
Mathew May
f418c08c31 MDL-66958 core_grade: Add comparison js for grade saves 2019-11-11 10:44:09 +08:00
Mathew May
80dcc83400 MDL-66958 core_grade: Correct documentation in normalise js 2019-11-11 09:57:53 +08:00
Adrian Greeve
65d053ec0d Merge branch 'MDL-67129-master-2' of git://github.com/bmbrands/moodle 2019-11-11 08:07:03 +08:00
Eloy Lafuente (stronk7)
9367922f09 MDL-66405 filter_h5p: fix trailing-lines gherkinlint problem 2019-11-11 00:58:03 +01:00
Eloy Lafuente (stronk7)
a1e0f47fe9 Merge branch 'MDL-66405-master' of git://github.com/aanabit/moodle 2019-11-11 00:33:16 +01:00
Sara Arjona
c9f0abc25a Merge branch 'MDL-67184-master' of git://github.com/cescobedo/moodle 2019-11-10 21:48:48 +01:00
cescobedo
64e97710a3 MDL-67184 filter_displayh5p: Move upper than urltolink & activityname 2019-11-10 21:40:25 +01:00
Sara Arjona
f529720e07 Merge branch 'MDL-67196' of https://github.com/stronk7/moodle 2019-11-09 20:06:11 +01:00
Sara Arjona
1cb3493ab1 Merge branch 'MDL-67156-master' of git://github.com/vmdef/moodle 2019-11-09 19:53:27 +01:00
Sara Arjona
5e7d8b42ce Merge branch 'MDL-67158-master' of git://github.com/mihailges/moodle 2019-11-09 19:23:39 +01:00
Mihail Geshoski
d68be5b209 MDL-67158 core_h5p: Unit test fixes 2019-11-10 01:37:44 +08:00
Eloy Lafuente (stronk7)
8585294d5c Merge branch 'MDL-67098-master' of git://github.com/junpataleta/moodle 2019-11-09 16:14:45 +01:00
Eloy Lafuente (stronk7)
acfbb4bf44 Merge branch 'MDL-67146-master-enfix-2' of git://github.com/mudrd8mz/moodle 2019-11-09 16:11:39 +01:00
Sara Arjona
b80c1e015a Merge branch 'MDL-67061-master' of https://github.com/aanabit/moodle 2019-11-09 13:22:03 +01:00
Amaia Anabitarte
2c679b6ea8 MDL-67061 core_h5p: Behat tests for H5P content-types admin settings 2019-11-09 11:11:07 +01:00
Bas Brands
c43f99ca47 MDL-67061 core_h5p: List installed contenttypes/libraries 2019-11-09 11:11:07 +01:00
Sara Arjona
76b6e6ca08 Merge branch 'MDL-67174' of https://github.com/paulholden/moodle 2019-11-09 08:59:41 +01:00
Sara Arjona
3b381bd2da Merge branch 'MDL-67173-master' of git://github.com/cescobedo/moodle 2019-11-09 08:55:47 +01:00
Sara Arjona
75bf9a3ab8 Merge branch 'MDL-67167-master' of git://github.com/jleyva/moodle 2019-11-09 08:50:15 +01:00
David Mudrák
cf36114501 MDL-67146 lang: Update behat scenario files with the new string wording 2019-11-09 06:36:25 +01:00
Helen Foster
fda41f4588 MDL-67146 lang: Import fixed English strings (en_fix)
Significant string changes:

* configallowemojipicker,core_admin - including emoji picker button in
  Atto
* viewconversation,mod_forum - 'conversation' changed to 'discussion'
2019-11-09 06:35:22 +01:00
Eloy Lafuente (stronk7)
544f8625ba MDL-67196 behat: Increase allowed max report size 2019-11-09 01:11:14 +01:00
Víctor Déniz Falcón
47627abe9d MDL-67156 core_h5p: change DIRECTORY_SEPARATOR by slashes
In Windows, the value of DIRECTORY_SEPARATOR is "\", causing failures in
the tests when compared to the path strings that use "/".
2019-11-08 22:18:11 +00:00
Amaia Anabitarte
ba70ec2666 MDL-66405 filter_h5p: Behat tests for H5P filter 2019-11-08 17:08:58 +01:00
Amaia Anabitarte
7d8af94f86 MDL-66405 atto_h5p: Behat tests for H5P atto button 2019-11-08 17:08:57 +01:00
Amaia Anabitarte
0d97e6103f MDL-66405 core_h5p: New behat steps and selectors for H5P tools 2019-11-08 17:08:57 +01:00
Sara Arjona
f9db5892ec weekly release 3.8dev+ 2019-11-08 15:39:36 +01:00
Sara Arjona
7347347e84 NOBUG: Fixed SVG browser compatibility 2019-11-08 15:39:33 +01:00
Sara Arjona
71528112b9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-11-08 15:39:33 +01:00
Andrew Nicols
fc0ded848c MDL-67058 h5p: Correct PHPUNIT_LONGTEST usage 2019-11-08 15:48:58 +08:00
Andrew Nicols
fd9333ca93 MDL-67058 h5p: Content fetch should use save_h5p API 2019-11-08 15:48:58 +08:00
Jun Pataleta
6846ba70a2 MDL-67098 forumreport_summary: Drop temp table at the end of processing 2019-11-08 15:28:23 +08:00
Andrew Nicols
ab8f1c3b8c MDL-67058 h5p: System user has permission 2019-11-08 15:20:17 +08:00
Jun Pataleta
2e809ec27c Merge branch 'MDL-66893-master-3' of https://github.com/ryanwyllie/moodle 2019-11-08 11:59:44 +08:00
Andrew Nicols
8948ebb7ac Merge branch 'MDL-66297-master' of git://github.com/mickhawkins/moodle 2019-11-08 11:17:38 +08:00
Michael Hawkins
d3ae8d42ea MDL-66297 mod_forum: Added word/char count column headings to export 2019-11-08 11:13:37 +08:00
Michael Hawkins
64da1d093a MDL-66297 forumreport_summary: Added filter data to forum export links
From/to date filter timestamps, as well as discussion IDs of any
filtered groups.
2019-11-08 11:13:36 +08:00
Michael Hawkins
2e7a16b954 MDL-66297 mod_forum: Prepared export to handle URL filters
Added the ability for discussion IDs and from/to timestamps to be
passed in via URL (to match filters available in the summary report,
which will link to the export). Also fixed a bug where "all users"
would fail as an optional array param.
2019-11-08 11:13:36 +08:00
Shamim Rezaie
1743d4a3e9 MDL-66297 forumreport_summary: add export links to the report 2019-11-08 11:13:36 +08:00