mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
84,892 Commits 36 Branches 519 Tags
Commit Graph

1813 Commits

Author SHA1 Message Date
Marina Glancy
412a56027b MDL-58919 mod_assign: fix check for existing setting 2017-06-22 16:09:55 +02:00
Jake Dallimore
c6b32acdb1 MDL-58919 mod_assign: fix allowing accepted file types to be empty 2017-06-21 17:15:21 +08:00
Dan Poltawski
22ef8f1f9b Merge branch 'MDL-58919-master' of git://github.com/Dave-B/moodle 2017-06-20 14:24:59 +01:00
Eloy Lafuente (stronk7)
84e3c97bb0 MDL-46322 database: alias sort fields to avoid ambiguous naming 2017-06-14 12:32:01 +01:00
Jake Dallimore
235df202c4 Merge branch 'MDL-51691-master' of https://github.com/jebarviabb/moodle 2017-06-14 12:30:43 +01:00
Dan Poltawski
dd4208e6ec Merge branch 'mdl46322-master' of https://github.com/AndresMelo/moodle 2017-06-14 12:30:37 +01: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
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
Jun Pataleta
4b64128f5b Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle 2017-06-06 14:47:52 +08: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
Jun Pataleta
aec421153e Merge branch 'MDL-58933' of git://github.com/stronk7/moodle 2017-05-22 14:12:36 +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
Andres
373d7d3f28 MDL-46322 mod_assign: Only list enrolled graders as potential markers 2017-05-18 21:58:24 -05:00
Andres Melo
3ffd13827e MDL-46322 mod_assign: Only list enrolled graders as potential markers 2017-05-17 16:12:54 -05:00
Henning Bostelmann
b2e76ba7d8 MDL-57957 mod_assign: show feedback file in absence of grade item 2017-05-16 11:58:05 +01:00
Dan Poltawski
4010466614 Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle 2017-05-15 10:46:00 +01:00
Jake Dallimore
e84fefdb09 Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle 2017-05-11 11:41:48 +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
Cameron Ball
56d1ddd775
MDL-58777 mod_assign: Explicitly sort records and set event priority 
The assign update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
 2017-05-10 13:41:18 +08:00
Andrew Nicols
865e2bc7dc Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle 2017-05-10 11:48:40 +08:00
Dan Poltawski
cd501e12c6 Merge branch 'MDL-58853' of git://github.com/stronk7/moodle 2017-05-09 09:17:47 +01:00
Cameron Ball
15fbd9057e
MDL-58841 mod_assign: Style "view all" link on grading summary 2017-05-09 15:04:55 +08:00
Ryan Wyllie
9e452e35d0 MDL-58822 backup: backup and restore user override events 2017-05-09 05:48:40 +00:00
Jun Pataleta
b5c24c99a0 MDL-58780 mod_assign: Remove AS keyword in table alias 
* The AS keyword is not recognised by Oracle for table aliases.
This is okay with other databases, but optional, so better to
remove it.
 2017-05-09 11:58:00 +08:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release 
version = 2017051500 release version
requires= 2017050500 current rc1 version
 2017-05-09 02:58:28 +02:00
Andrew Nicols
fbc15bb977 Merge branch 'MDL-55371-master' of git://github.com/jleyva/moodle 2017-05-05 09:57:40 +08:00
Juan Leyva
396395b8d3 MDL-55371 mod_assign: Do not return empty users in get_participant WS 
The WS was returning null users making the WS to fail.
 2017-05-04 10:09:35 +02:00
Andrew Nicols
2e3c23b25f Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle 2017-05-04 11:42:38 +08:00
Andrew Nicols
b1517237ad Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle 2017-05-04 08:49:48 +08:00
Cameron Ball
26aedd4abf
MDL-58514 mod_assign: Apply consistent logic for overrides 
Previously the assign submission page was using "lenient" logic
for overrides when more than one group override applied to a user
(i.e., use the earliest "open" date and the latest "due" date)
when really it should be using the sortorder as per the assign
grading table.
 2017-05-03 16:59:22 +08:00
Damyon Wiese
c593a0b001 MDL-58535 assign: Always pass file serving options. 
This allows the mobile app to pass offline=1 in urls to files to force export/download of the source file
for controlled links.
 2017-05-01 16:15:35 +08:00
Jun Pataleta
e85579693b Merge branch 'MDL-58632-master' of https://github.com/xow/moodle 2017-05-01 14:26:37 +08:00
Andrew Nicols
847d88bb4c MDL-58573 mod_assign: Whitespace fix 2017-04-28 11:58:14 +08:00
Andrew Nicols
8374422402 Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle 2017-04-28 11:46:02 +08:00
Jun Pataleta
a43e85d5e4 MDL-58573 mod_assign: Upgrade code for default gradingduedate 
* Set default grading due date one week from the due date if:
  - there is no grading due date set; and
  - the assignment's due date is not older than 3 weeks from the
    current date.
 2017-04-28 10:28:35 +08:00
Cameron Ball
30aa540fe7
MDL-58578 mod_assign: Correctly update user override priority 
Since we now sort priority in ASC order, the top priority should be 0.
 2017-04-27 15:15:12 +08:00
John Okely
d1076e3ef5 MDL-58632 assignsubmission_file: Don't allow any extension 2017-04-26 09:34:44 +08:00
Juan Leyva
3b07da4a6d MDL-58707 mod_assign: Fix param type for returned field 
The ‘description’ field is populated via a get_string call, this means
that it may content html.
The component used for translation is also fixed in this commit.
 2017-04-25 14:41:24 +02:00
Ryan Wyllie
fa16d7fb8c MDL-58349 mod_assign: text wrap for comment search while grading 2017-04-21 04:58:14 +00:00
David Monllao
626b05c09c Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle 2017-04-20 15:17:59 +08:00
David Monllao
ba1ad89e7d Merge branch 'MDL-58278-master' of git://github.com/damyon/moodle 2017-04-20 14:05:39 +08:00
Andrew Nicols
6f9f15d1ad MDL-58515 2017-04-20 13:47:21 +08:00
Andrew Nicols
9517ea662d Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle 2017-04-20 13:03:34 +08:00
Damyon Wiese
f2a6b9cac9 MDL-58278 mod_assign: Ignore send notify with mw 
When marking workflow is on and the grade is not released we never send notifications anyway.
Instead of preventing the grading form from submitting (validation error) we silently ignore it.
 2017-04-20 11:43:34 +08:00
Andrew Nicols
442908a100 Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle 2017-04-19 11:53:40 +08:00