Commit graph

20267 commits

Author SHA1 Message Date
David Monllao
3bcf2d2895 Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle 2017-12-18 11:34:47 +01:00
Andrew Nicols
b91696eeac Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle 2017-12-18 15:08:37 +08:00
Andrew Nicols
6cb535f081 Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle 2017-12-18 14:03:47 +08:00
Damyon Wiese
2d08e6565a Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle 2017-12-18 12:51:33 +08:00
Mihail Geshoski
a86b75608a MDL-59999 lesson: Boost grade essays page not indicating grade status
AMOS BEGIN
    CPY [graded,assign],[graded,lesson]
    CPY [notgraded,assign],[notgraded,lesson]
AMOS END
2017-12-18 09:14:11 +08:00
Tim Hunt
06b4ab81a8 MDL-61045 quiz settings: add back missing disabledIf
This got broken in Moodle 2.1 by MDL-20636.
2017-12-15 13:11:57 +00:00
Damyon Wiese
b6fdcd6071 MDL-55382 assign: Sort editpdf quick list 2017-12-15 14:57:13 +08:00
Jun Pataleta
409da21320 MDL-61042 mod_lesson: Initialise pageid variable 2017-12-15 17:36:16 +13:00
Damyon Wiese
3c016111bd MDL-53985 assign: Do not remove annotations
When an assignment submission is reverted to a draft, the timemodified on
the submission should not be modified. Changing the timemodified causes the
editpdf code to assume the pdf is stale, and forces all annotations to be removed.
2017-12-15 11:50:43 +08:00
Jun Pataleta
d766bbc5b9 MDL-58888 mod_choice: Sort choice_get_my_response() results by optionid 2017-12-15 15:55:48 +13:00
Jun Pataleta
3af40cc62e MDL-58888 mod_choice: Verify sorting when testing multiple selections
* Improve test_choice_get_my_response() to verify the sorting of the
  responses returned by choice_get_my_response().
* Fix correct usage of choice_get_my_response().
2017-12-15 15:53:11 +13:00
Jun Pataleta
07a46481fe MDL-61040 mod_choice: Save my choice button needs some space 2017-12-15 13:06:14 +13:00
Jun Pataleta
af6c39045e MDL-60938 mod_choice: Fix rendering of users for choice results 2017-12-15 12:52:16 +13:00
Mark Nelson
464ddd07d5 MDL-43466 mod_assign: improve submission help text
Thanks go to Rajneel Totaram for the report.
2017-12-13 15:38:45 +08:00
Ryan Wyllie
e236dc1446 MDL-60858 feedback: update behat tests for lang string change 2017-12-13 05:07:19 +00:00
Ryan Wyllie
85ce9b535b MDL-60858 feedback: remove ellipsis from form lang strings
Remove the trailing ellipsis from the complete_the_form and
continue_the_form lang strings.
2017-12-13 03:37:00 +00:00
Mitsuhiro Yoshida
97627d2783 MDL-60858 feedback: add button style for "Answer the questions" link. 2017-12-13 03:36:04 +00:00
Simey Lameze
3bf572411a MDL-56932 theme_boost: fix quiz max mark input height 2017-12-13 10:21:17 +08:00
Jun Pataleta
3cd76cbecc MDL-2051 mod_choice: Show info how choice results will be published 2017-12-13 14:36:03 +13:00
Simey Lameze
cadeb8d21c MDL-60061 mod_scorm: add unit tests for drag/drop 2017-12-12 15:15:09 +08:00
Simey Lameze
f808e0432a MDL-60061 mod_scorm: add support for drag/drop events
AMOS BEGIN
	CPY [openafterclose,mod_choice],[openafterclose,mod_scorm]
AMOS END
2017-12-12 15:15:09 +08:00
Damyon Wiese
302104af4b Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle 2017-12-12 11:39:20 +08:00
Jun Pataleta
9244faa3a4 Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle 2017-12-12 16:26:34 +13:00
Damyon Wiese
57fe6616a8 Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle 2017-12-12 10:40:15 +08:00
Damyon Wiese
39377f8083 Merge branch 'MDL-44667-master' of https://github.com/snake/moodle 2017-12-12 10:26:08 +08:00
Mathew May
aa6b85d2b7 MDL-57431 mod_quiz: Quiz editing help icon fix 2017-12-12 09:56:05 +08:00
Zig Tan
6901981962 MDL-42676 mod_assign: Display message fix when using grade override
Logic fix in mod_assign locallib.php to correctly set the submissionlockedstatus,
and added associated unit test in test_grade_submission_override()
2017-12-12 09:01:35 +08:00
Mihail Geshoski
2034f57fe1 MDL-52538 lesson: Grade info displayed while ongoing score disabled 2017-12-12 08:54:51 +08:00
Simey Lameze
97f4556a94 MDL-60750 mod_quiz: only apply form css rules on clean theme 2017-12-11 16:56:06 +08:00
Damyon Wiese
67c0e18ca2 Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle 2017-12-11 14:54:46 +08:00
Simey Lameze
5c1ea9aea5 MDL-60057 mod_lesson: add unit tests for callbacks 2017-12-11 14:45:04 +08:00
Simey Lameze
f077e0af7e MDL-60057 mod_lesson: add calendar drag and drop callbacks
AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
	CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
	CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END
2017-12-11 14:29:16 +08:00
Simey Lameze
61ac58a887 MDL-60060 mod_data: add unit tests for callbacks 2017-12-11 14:05:00 +08:00
Simey Lameze
5e401a2a51 MDL-60060 mod_data: add calendar drag and drop callbacks 2017-12-11 14:05:00 +08:00
Marcus Fabriczy
e7ec2f901b MDL-59709 mod_assign: Export to portfolio button not working
Changed the button to a text link
2017-12-10 13:47:47 +10:30
Luca Bösch
41d335f31a MDL-60920 quiz: removed legacy "edit questions" button 2017-12-08 14:13:05 +01:00
Andrew Nicols
e3b699eab7 Merge branch 'MDL-59159' of git://github.com/stronk7/moodle 2017-12-06 19:53:36 +13:00
Jun Pataleta
f013112752 Merge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:33 +13:00
Jake Dallimore
3112c22004 MDL-44667 database: fix incorrect usages of $DB->get_field
Some places were passing 5 params, meaning the strictness param was
lost. This fixes those usages.
2017-12-04 16:53:51 +08:00
Damyon Wiese
713a2cbb25 Merge branch 'MDL-60219-master' of https://github.com/abias/moodle 2017-12-04 16:28:16 +08:00
Marina Glancy
05cd2ff627 MDL-34161 mod_lti: backup and restore of submissions 2017-12-04 15:05:00 +08:00
Marina Glancy
6489a3d455 MDL-34161 mod_lti: backup/restore of lti types
Only course tools are backed up, site tools and registrations
can be matched by id if they are restored to the same site only.

For predefined course tools the secret is backed up encrypted
and can be restored on the same site only.
2017-12-04 15:04:56 +08:00
Tim Lock
edbcee25c1 MDL-34161 mod_lti: Added Behat tests 2017-12-04 15:03:44 +08:00
Gregory Faller
387a3a208a MDL-34161 mod_lti: Add support for restoring site tool 2017-12-04 15:03:44 +08:00
Eloy Lafuente (stronk7)
7ec475e2d7 MDL-59159 upgrade: remove unused functions/settings from upgradelib
All these functions were used only by deleted upgrade steps
so it's safe to proceed with straight deletion, considering
them internal. Deletion has been documented in corresponding
upgrade.txt files:

- mod_feedback_upgrade_delete_duplicate_values()
- mod_feedback_upgrade_courseid()

These have been kept because they continue being used:

- @ install: make_competence_scale()
- @ restore: upgrade_course_letter_boundary()
2017-12-04 01:42:01 +01:00
Eloy Lafuente (stronk7)
e4eba4c346 MDL-59159 upgrade: clean < 3.1.0 upgrade steps
LTS (3.5) requires previous LTS (3.1)

This just deletes all the upgrade steps previous to 3.1.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2016052300 (v3.1.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
2017-12-04 01:18:57 +01:00
Jun Pataleta
c1cd2924ec Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle 2017-12-04 12:50:06 +13:00
Ann Adamcik
4b4280f3e8 MDL-58697: Only get group submission if enabled 2017-12-01 12:56:15 -07:00
Alexander Bias
ee73ec3d3c MDL-60219 lti: Replace pagelayout frametop with incourse 2017-11-29 09:54:42 +01:00
Jun Pataleta
a0de91e9a0 Merge branch 'MDL-50861-master' of git://github.com/junpataleta/moodle 2017-11-29 10:51:22 +13:00