Commit graph

19469 commits

Author SHA1 Message Date
Dan Poltawski
dd4208e6ec Merge branch 'mdl46322-master' of https://github.com/AndresMelo/moodle 2017-06-14 12:30:37 +01:00
Marina Glancy
118d569863 MDL-40408 mod_data: skip metadata fields during import 2017-06-14 11:31:30 +08:00
Marina Glancy
c3c97e2ee2 MDL-58523 mod_feedback: deleting response should reset completion 2017-06-13 14:35:08 +08:00
Josh Ebarvia
9916cef9c4 MDL-51691 assignsubmission_feedback: Fix delete comments 2017-06-13 08:39:53 +09:30
Jake Dallimore
8430250a2f MDL-59042 upgrade: fix for non existent table in core upgrade.
Moved upgrade step to the assign mod where table is known to exist.
2017-06-12 15:03:31 +08:00
Jun Pataleta
9332accdc5 MDL-59171 mod_lti: Set mod_lti_view_lti's type to 'read' 2017-06-12 08:33:49 +08:00
Juan Leyva
63130e328d MDL-59133 mod_lesson: Return page record in get_user_attempt WS 2017-06-09 12:07:16 +01:00
David Balch
053c55a76c MDL-58919 assignsubmission_file: Wider accepted file types input field 2017-06-09 09:23:27 +01:00
David Balch
797a70c0ec MDL-58919 assignsubmission_file: Add accepted file types default.
New setting "defaultacceptedfiletypes" to define default accepted file
types in File submissions.
2017-06-09 09:23:27 +01:00
Jake Dallimore
67ed6d415e MDL-59042 assign: Group override edit no longer resets event priority
Fixed a bug in which $fromform->sortorder wasn't set before passing
$formdata to assign_update_events, resulting in the existing event
priority being incorrectly nulled and breaking the effective override.
2017-06-09 15:23:46 +08:00
Tim Lock
72b8806abc MDL-55979 quiz: Fix error moving question from last page
When moving the last question from the last page to the last slot of the previous page would show the error in the error
log but move successfully.
2017-06-09 08:33:38 +09:30
Juan Leyva
7c3c0fa323 MDL-59132 mod_feedback: Fix anonymous responses numbering
This was done correctly by the web scrip but not by the WS.
2017-06-08 11:14:45 +01:00
Damyon Wiese
4c8deb9cfa MDL-59032 scorm: Don't show action events to teachers 2017-06-06 15:57:23 +08:00
Jun Pataleta
4b64128f5b Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle 2017-06-06 14:47:52 +08:00
Jake Dallimore
98acb48366 Merge branch 'MDL-58900-master' of git://github.com/lameze/moodle 2017-06-06 11:37:16 +08:00
Mark Nielsen
965c700dad MDL-59091 behat: Fix gherkinlint errors
Just whitespace problems.
2017-06-02 09:31:40 -07:00
Dan Poltawski
50c277a5d8 MDL-57139 js: built 2017-06-01 14:54:40 +01:00
Dan Poltawski
f8587005cb MDL-57139 survey: fix promise return 2017-06-01 14:54:39 +01:00
Dan Poltawski
1fea12b0eb MDL-57139 mod_lti: ensure promise best practices 2017-06-01 10:27:59 +01:00
Dan Poltawski
d85d7831d0 MDL-57139 assign: ensure promise best practices 2017-06-01 10:27:58 +01:00
Simey Lameze
dc0deaf04d MDL-58900 mod_assign: fix incorrect overrides ordering 2017-05-31 10:50:28 +08:00
Eloy Lafuente (stronk7)
32a627d7cf Merge branch 'MDL-49988_fix_wiki_preview' of https://github.com/DMaterka/moodle 2017-05-31 00:30:08 +02:00
Dan Poltawski
31245d8746 Merge branch 'MDL-50266-master' of git://github.com/ankitagarwal/moodle 2017-05-30 10:38:14 +01:00
Arto Nieminen
81d7b77d6f MDL-44905 mod_scorm: Skip view page on a Single activity course
Allow 'Student skip content structure page: Always' option with 'Single
activity' course format, and redirect 'Exit activity' back to site home
if user has no report access.
2017-05-29 20:32:40 +03:00
David Monllao
13a1e8b50c Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle 2017-05-22 15:13:58 +08:00
Jake Dallimore
da2959fe9c Merge branch 'MDL-56617-course-cbm-grade-to-pass' of https://github.com/lucaboesch/moodle 2017-05-22 14:31:37 +08:00
Jun Pataleta
aec421153e Merge branch 'MDL-58933' of git://github.com/stronk7/moodle 2017-05-22 14:12:36 +08:00
David Monllao
52ab8b2c16 Merge branch 'MDL-58986_master' of git://github.com/markn86/moodle 2017-05-22 12:21:11 +08:00
David Monllao
a5906ac944 Merge branch 'MDL-57957' of https://github.com/bostelm/moodle 2017-05-22 10:41:46 +08:00
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +02:00
Luca Bösch
16302f85ec MDL-56617 mod_quiz: No grade to pass check if CBM used
When certainty-based marking is used, grades can 'exceed' the maximum grade
(because they are multiplied by factors). Therefore, in such cases, don't show
no warning.
2017-05-19 12:30:38 +02:00
Grzegorz Ziółek
2e241fea56 MDL-56973 wiki: New page title readonly after changing course language 2017-05-19 11:12:55 +02:00
Andres
373d7d3f28 MDL-46322 mod_assign: Only list enrolled graders as potential markers 2017-05-18 21:58:24 -05:00
Mark Nelson
f3dc7a171a MDL-58986 mod_quiz: add CSS classes to buttons on comment page 2017-05-18 16:49:25 +08:00
Ankit Agarwal
fce1d7deb8 MDL-50266 mod_forum: Remove strings deprecated in 3.0 2017-05-18 11:17:13 +05:30
Ankit Agarwal
aa951785e0 MDL-50266 lesson: Remove strings deprecated in 3.0 2017-05-18 08:34:33 +05:30
Andres Melo
3ffd13827e MDL-46322 mod_assign: Only list enrolled graders as potential markers 2017-05-17 16:12:54 -05:00
Jake Dallimore
1f36a0796f Merge branch 'MDL-58947-master' of https://github.com/sammarshallou/moodle 2017-05-17 09:15:09 +08:00
Daniel Materka
5058a4d199 MDL-49988 wiki: fix broken page layout if html contains line breaks 2017-05-16 19:23:00 +01:00
Henning Bostelmann
b2e76ba7d8 MDL-57957 mod_assign: show feedback file in absence of grade item 2017-05-16 11:58:05 +01:00
Jake Dallimore
9f13573c43 Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle 2017-05-16 09:57:05 +08:00
sam marshall
ec5ec9bce5 MDL-58947 Search: Label URLs not correctly calculated 2017-05-15 17:45:45 +01:00
Dan Poltawski
ca4f5a68bc Merge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle 2017-05-15 11:14:19 +01:00
Dan Poltawski
4010466614 Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle 2017-05-15 10:46:00 +01:00
Luca Bösch
46470ad02c MDL-58852 choice: Use multilang for choice options in charts 2017-05-14 21:31:10 +02:00
Jake Dallimore
e84fefdb09 Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle 2017-05-11 11:41:48 +08:00
Dan Poltawski
e838654b4e Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-10 12:01:08 +01:00
Helen Foster
0d86195e8d MDL-58877 lang: Merge English strings from the en_fix language pack
Significant string changes:

* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
  error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
  in core_backup - switch fix
2017-05-10 12:24:36 +02:00
David Monllao
a5ea94d85f Merge branch 'MDL-58843-master-exchandler' of git://github.com/mudrd8mz/moodle 2017-05-10 14:05:51 +08:00
Cameron Ball
9eb5a0417c
MDL-58777 mod_assign: Remove unnecessary upgrade step
This upgrade step was setting the priority field for assign events
in the events table. This is redundant since we queue a task to
refresh all events.

This patch also removes a redundant refresh_events task that is
queued from assign.
2017-05-10 13:41:18 +08:00