2245 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
1b22fec64f Merge branch 'MDL-65026-master' of git://github.com/jleyva/moodle 2019-09-18 00:49:21 +02:00
Juan Leyva
dfd4881589 MDL-65026 course: Fix modules intro formatting in WS
The Web Service seems to be doing excessive text cleaning.
2019-09-16 13:04:26 +02:00
Juan Leyva
0b9f2215d0 MDL-66113 assign: Apply user overrides in get_submission_status WS 2019-09-16 12:05:55 +02:00
Andrew Nicols
158df6275e Merge branch 'MDL-66537-master' of git://github.com/peterRd/moodle 2019-09-10 12:18:16 +08:00
Peter
44ad3e5171 MDL-66537 assign: Force rotate buttons to keep positioning in RTL langs 2019-09-10 10:23:13 +08:00
Will O'Brien
163750f3e5 MDL-66488 mod_assign: make submission comments textarea expandable
Allow submission comments textarea on assignment "View all submissions"
page to expand both ways, rather than just vertically.
2019-09-06 23:15:52 +01:00
Andrew Nicols
eb70a00163 Merge branch 'MDL-66137-38_mod_assign_marking_workflow_incorrect_grade_display' of https://github.com/tomdickman/moodle 2019-09-04 13:44:49 +08:00
Tom Dickman
028c5ed5f9 MDL-66137 mod_assign: fixed marking workflow incorrect grade display
Aligned logic between quick grading changes and set marking workflow state changes to accurately
finalise or remove final grade from the gradebook, depending on the marking workflow state if
being used.
2019-09-04 14:29:30 +10:00
Eloy Lafuente (stronk7)
563888202e Merge branch 'MDL-66575-master' of https://github.com/snake/moodle 2019-09-01 16:52:34 +02:00
Jake Dallimore
d2c09e8ffd MDL-66575 mod_assign: fix first day of current month behat edge case
What we really want to test in this behat test is the 2 extremes:
the user who started a long time ago and doesn't have access any more
and the user who started recently, who does have access. To fix all
problems with datetime clashes, it's probably better to just use
'yesterday' for the current student's enrolment start time.
2019-09-02 13:11:49 +08:00
Helen Foster
7ee90659ee MDL-66504 lang: Import fixed English strings (en_fix)
Significant string changes:

- configgeneralfiles,core_backup - includes explanation of implications
  of settings
- mobilenotificationsdisabledwarning,tool_mobile - location corrected
- statsreport14,core - 'views/posts' corrected to 'posts/views'
- err_nousers,core_completion - explanation of who completion
- information is displayed for errorcourselisting,block_community - note
  about sunsetting moodle.net
2019-09-01 12:31:15 +02:00
Adrian Greeve
f69543d741 Merge branch 'MDL-66558-master' of https://github.com/snake/moodle 2019-08-30 10:41:45 +08:00
Jake Dallimore
cb14d4d811 MDL-66558 core_course: fix edge case in relative dates behat feature 2019-08-30 10:19:42 +08:00
Eloy Lafuente (stronk7)
e15f301404 Merge branch 'master_MDL-65116' of https://github.com/yao9394/moodle 2019-08-28 16:39:49 +02:00
John Yao
62f1640df2 MDL-65116 mod_assign : Assignment due date does not update for groups.
This commit fixes the assignment due date not showing correctly according to groups selected by users who can view grades
2019-08-23 13:08:53 +10:00
Adrian Greeve
6f35cc69a0 Merge branch 'MDL-66369-master' of git://github.com/aanabit/moodle 2019-08-21 13:53:15 +08:00
Jun Pataleta
089d387a31 Merge branch 'MDL-66148-master' of https://github.com/ryanwyllie/moodle 2019-08-20 17:07:59 +08:00
Jun Pataleta
d9c910a76f Merge branch 'MDL-64437-master' of git://github.com/mihailges/moodle 2019-08-20 14:19:34 +08:00
Adrian Greeve
52070868a8 Merge branch 'MDL-65886-MOODLE-master' of https://github.com/kristian-94/moodle 2019-08-19 14:13:45 +08:00
Mihail Geshoski
5efafb8d2d MDL-64437 assignment: Fix element overlaping in low screen resolution 2019-08-19 13:31:01 +08:00
Kristian Ringer
8aaa2b5de7 MDL-65886 assign: Reset numfiles to 0 when removing a file submission 2019-08-16 15:04:42 +10:00
Amaia Anabitarte
c0375ba73f MDL-66369 libraries: Remove [modname]_scale_used functions
These functions were only used by the deprecated function
which was deprecated in 3.1, and removed in 3.6.
2019-08-16 11:56:17 +08:00
Jun Pataleta
7da3ab8359 Merge branch 'MDL-65925-grade-page-broken-for-deleted-submission-master' of https://github.com/ilya-catalyst/moodle 2019-08-14 15:28:14 +08:00
Ryan Wyllie
c872ec0cbd MDL-66148 mod_assign: update override page for relative dates mode 2019-08-14 10:40:55 +08:00
Jun Pataleta
1648b5ac6e Merge branch 'MDL-66147-master' of https://github.com/snake/moodle 2019-08-13 16:34:34 +08:00
Jake Dallimore
9ce55a8668 MDL-66147 mod_assign: behat test covering relative due date field
Tests that each student has a fixed amount of time, relative to their
course start date, in which to submit the assignment, and that teachers
are shown the dates relative to each student when grading.
2019-08-13 15:09:13 +08:00
Jake Dallimore
d0cff2367a MDL-66147 mod_assign: external get_participant supports relative dates 2019-08-13 15:09:13 +08:00
Jake Dallimore
c0bb682756 MDL-66147 mod_assign: grading table duedate column updates
Couple of changes:
- The duedate, cutoffdate and allowsubmissionsfromdate are now always
shown for relative dates courses.
- When relative dates mode is enabled, calculate and apply the enrolment
start offset to the due date in SQL. No changes to col_duedate needed.
Sorting is supported.
2019-08-13 15:09:13 +08:00
Jake Dallimore
9bf91ea832 MDL-66147 mod_assign: grading table status col shows relative dates
The 'Status' column is sorted using 'status ASC/DESC, userid ASC',
where status does not contain the due date. Overdue assignments
have additional information displayed, but this is unrelated to
the sort, meaning we don't need to change anything with sorting.
2019-08-13 15:09:13 +08:00
Jake Dallimore
9e719b81d4 MDL-66147 mod_assign: submissions overview page shows time interval
Use get_time_interval_string() on the teacher only page, to show how
long after the course start the assignment is due for each user.
2019-08-13 15:09:11 +08:00
Jun Pataleta
29c5579db9 Merge branch 'MDL-62034-master' of git://github.com/andrewnicols/moodle 2019-08-13 14:20:42 +08:00
Andrew Nicols
24d2a49e21 MDL-62034 assign: Add hint for user tour reset 2019-08-13 14:12:29 +08:00
Jake Dallimore
db381d5c87 MDL-66147 mod_assign: Change assign to return calculated instance data
Changes include:
- Added a private method calculate_properties(), which calculates
per-user instance properties and stores them in an instance var.
- get_instance() now takes a userid param, and calls the
calculate_properties() method, allowing per-user instances to be
returned.
- Added a public method get_default_instance(), which returns the
non-augmented instance data (no per-user properties), so we can
still get back the raw instance data when needed.
- The get_course method has been changed to make sure we always have an
object property, not a string - which happened in some cases (when
commenting on the assign submission page, for example).
2019-08-12 09:35:51 +08:00
Ilya Tregubov
64ce596f8c MDL-65925 assign: Grade page broken if submission was deleted. 2019-08-12 09:28:50 +10:00
cescobedo
0504254f1d MDL-59524 general: Remove strings deprecated in 3.4 2019-08-12 00:13:08 +02:00
Andrew Nicols
7be52eb255 MDL-65679 assignfeedback_editpdf: Adjust z-indexes for editpdf 2019-08-09 08:34:29 +08:00
Mihail Geshoski
bda31461db MDL-65679 assign: Collapsing comments
The comments should appear above everything else when expanded, and expanding/collapsing comments
should not affect the position of anything else in the page.

All credit goes to Damyon Wiese.
2019-08-02 07:39:27 +08:00
Adrian Greeve
647c6da2b8 Merge branch 'MDL-66174-master' of git://github.com/peterRd/moodle 2019-07-29 14:38:35 +08:00
Adrian Greeve
70f1d11338 Merge branch 'MDL-66136-master' of git://github.com/mihailges/moodle 2019-07-22 10:40:30 +08:00
Mihail Geshoski
b7e4229187 MDL-66136 assign: Verify presence of resources in online text submission 2019-07-22 07:55:54 +08:00
Mihail Geshoski
911d164dcb MDL-66136 assignfeedback_comments: Extend testcase 2019-07-22 07:55:54 +08:00
Ryan Wyllie
195ea4480b MDL-62497 javascript: build AMD modules with new transpiler 2019-07-19 14:12:49 +08:00
Peter
9573f50ad1 MDL-66174 mod_assign: Remove the strict widths on the annotation menu 2019-07-18 12:55:40 +08:00
Eloy Lafuente (stronk7)
23e357f1a0 Merge branch 'MDL-65908-master' of git://github.com/peterRd/moodle 2019-07-17 01:04:33 +02:00
Peter
e35cc9fea9 MDL-65908 mod_assign: Remove scroll repositioning.
Absolute positioned elements do not require repositioning on scroll as long as
their immediate parent is relatively positioned.
2019-07-15 08:35:58 +08:00
Peter
e349db4b4a MDL-65908 assign: Overflow and positioning updates
Draw all annotation within the drawing canvas instead of the region
2019-07-12 09:56:31 +08:00
Peter
2269b06cbc MDL-65908 assign: Revert overflow scroll fix
Revert "MDL-65484 assign: Scrolling overflow CSS"

This reverts commit 5bda066caa88bace064bdf6a2ab471c56e07f4c4.
2019-07-12 09:56:31 +08:00
John Yao
96e444665e MDL-65517 block_timeline: Hide completed course modules in Timeline
When some activities are manually completed by students, some are still showing in students' timeline.
This commit fix that for module assign,chat,choice,feedback,lesson,quiz,scorm and workshop.
2019-07-12 09:16:40 +10:00
Eloy Lafuente (stronk7)
d0df20d88b Merge branch 'MDL-64811_group_submission_warning' of git://github.com/davosmith/moodle 2019-07-09 17:57:37 +02:00
Davo Smith
07aafc9f80 MDL-64811 mod_assign: add webservice return type change to upgrade.txt 2019-07-09 09:01:44 +01:00