mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 15:02:41 +02:00
Code Issues Projects Releases Wiki Activity
88,771 Commits 36 Branches 528 Tags
Commit Graph

1955 Commits

Author SHA1 Message Date
Jake Dallimore
4af7042e6e Merge branch 'MDL-59691-master' of https://github.com/lucisgit/moodle 2018-04-11 16:01:03 +08:00
Eloy Lafuente (stronk7)
bd0391d284 Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle 2018-04-10 15:53:37 +02:00
Tony Butler
60e9f9083e MDL-59691 assignfeedback_editpdf: Allow comment placement to all edges 
Plus a couple of extra usability improvements:
- Collapse comment during move to allow precise placement
- Change cursor style to indicate that dragging is possible
 2018-04-09 16:55:36 +01:00
Tony Butler
ad7c719de4 MDL-59691 assignfeedback_editpdf: Allow comments to collapse to top-left 
Forcing them to collapse to the bottom-left corner seems less natural
and effectively changes the location of existing comments from pre-3.3
 2018-04-09 16:55:36 +01:00
Zig Tan
5687cd044d MDL-60726 assign: Fix assign submission confirmation alignment 2018-04-04 16:35:15 +08:00
Mark Nelson
376a79c242 MDL-36941 core: added events for notifications 2018-03-23 12:30:27 +08:00
Andrew Nicols
b57cd16dcf Merge branch 'wip-MDL-61344' of https://github.com/ndunand/moodle 2018-02-13 09:03:50 +08:00
Nicolas Dunand
a0b2b76613 MDL-61344 mod_assign: Show additional files when adding submission 2018-02-12 07:40:57 +01:00
Jun Pataleta
5c7351a263 MDL-61168 mod_assign: Truncate only the online text submission 2018-02-02 09:20:57 +08:00
Eloy Lafuente (stronk7)
447cf62409 Merge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle 2018-01-22 19:57:33 +01:00
Zig Tan
1a9e8542c5 MDL-58006 assign: Reset blindmarking assignments to hidden 
Fix to reset blindmarking assigments to hidden as part of Course reset with behat test
 2018-01-22 11:35:52 +08:00
Kevin Wiliarty
a0b9bf4998 MDL-61175 mod_assign: roll grade-by reminder on restore 2018-01-18 08:36:34 -05:00
Eloy Lafuente (stronk7)
b678f3309d Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle 2018-01-17 10:55:23 +01:00
Juan Leyva
ddeabbc53a MDL-58711 mod_assign: Fix draft and submission counting 2018-01-17 09:49:46 +01:00
Eloy Lafuente (stronk7)
87f6dfdedc Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle 2018-01-17 02:27:22 +01:00
David Monllao
e3d292301e Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle 2018-01-15 10:05:05 +01:00
Juan Leyva
ff626f7bb1 MDL-58711 mod_assign: Handle groups in get_submission_status 2018-01-11 15:03:08 +01:00
Eloy Lafuente (stronk7)
7110a3eed6 Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle 2018-01-08 10:05:39 +01:00
Andrew Nicols
b3f7f6d096 Merge branch 'MDL-57786-master' of git://github.com/zig-moodle/moodle 2018-01-08 15:16:06 +08:00
Andrew Nicols
0b4304b6e3 Merge branch 'MDL-53985-master' of git://github.com/damyon/moodle 2018-01-08 12:39:19 +08:00
Helen Foster
700522badd MDL-61046 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* pluginname_desc, enrol_category - improved explanation
* pathtopythondesc, core_admin - mentioning Python version
* configdeleteunconfirmed, core_admin - setting applies to more than
  just email-based self-registration
 2018-01-04 11:30:54 +01:00
Zig Tan
e5d9af8c56 MDL-57786 mod_assign: Fix word count for online text submissions 2018-01-02 13:10:37 +08:00
Zig Tan
6976c8e1b5 MDL-56945 assign: Add 'View all submissions' link to PDF feedback/grader 2017-12-29 09:47:40 +08:00
David Monllao
ffd392a17b Merge branch 'MDL-58983-master' of git://github.com/damyon/moodle 2017-12-27 17:54:56 +01:00
Jun Pataleta
3e882c418b Merge branch 'MDL-59709_master' of https://github.com/marcusfabriczy/moodle 2017-12-19 13:21:35 +13:00
Eloy Lafuente (stronk7)
e20a041100 Merge branch 'MDL-59200-master' of git://github.com/damyon/moodle 2017-12-19 01:08:15 +01:00
Eloy Lafuente (stronk7)
fc0c84c04b MDL-43466 mod_assign: fix corresponding behat tests 2017-12-19 00:11:54 +01:00
Eloy Lafuente (stronk7)
22c6affdef Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle 2017-12-19 00:11:52 +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
Damyon Wiese
b6fdcd6071 MDL-55382 assign: Sort editpdf quick list 2017-12-15 14:57:13 +08: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
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
Jun Pataleta
9244faa3a4 Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle 2017-12-12 16:26:34 +13:00
Damyon Wiese
39377f8083 Merge branch 'MDL-44667-master' of https://github.com/snake/moodle 2017-12-12 10:26:08 +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
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
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
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
Ann Adamcik
4b4280f3e8 MDL-58697: Only get group submission if enabled 2017-12-01 12:56:15 -07:00
Damyon Wiese
bf0a154217 MDL-58983 assign: Hide grade button if no cap 
If the current user cannot grade students, don't show them the button.
 2017-11-28 15:47:30 +08:00
Damyon Wiese
e427ae67c2 MDL-59200 assign: add feedback when grade locked 
We are including a hidden field when the grade is locked in the gradebook for a student. This field fails validation, so
the form cannot be submitted.
 2017-11-28 14:36:30 +08:00
Damyon Wiese
d87a31d878 Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle 
Conflicts:
	mod/assign/styles.css
 2017-11-28 13:18:03 +08:00
Luca Bösch
409758c035 MDL-53004 assignment: Separate label and pulldown in grading (Clean) 2017-11-23 16:42:26 +01:00
Damyon Wiese
9a73d11cfd MDL-59766 assign: Allow teachers to disable annotations 
If teachers do not want to use the pdf annotation features, they should be able to disable it for a single assignment.

AMOS BEGIN
    CPY [default,assignfeedback_comments],[default,assignfeedback_editpdf]
    CPY [default_help,assignfeedback_comments],[default_help,assignfeedback_editpdf]
AMOS END
 2017-11-23 10:46:39 +08:00
Damyon Wiese
e76e6bc8bd MDL-60249 assign: resize quickgrade textareas 
The Bootstrap CSS reset prevents horizontal resizing of textareas. We want to allow it in the quickgrading ui.
 2017-11-17 14:55:28 +08:00
Eloy Lafuente (stronk7)
6499085f36 MDL-60784 upgrade: add 3.4.0 separation line to all upgrade scripts 2017-11-12 18:43:30 +01:00
Eloy Lafuente (stronk7)
ba854606e6 MDL-60764 versions: bump all versions and requires near release 
version = 2017111300 release version
requires= 2017110800 current rc2 version
 2017-11-10 02:52:53 +01:00
Jake Dallimore
5243e93661 Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle 2017-11-07 16:03:43 +08:00
David Monllao
aa30dc8860 MDL-59256 analytics: Respect activities specific access conditions 2017-11-07 08:14:53 +01:00
Ryan Wyllie
6688ae2ba2 MDL-60062 calendar: prevent drag and drop of override events 2017-11-07 05:47:18 +00:00