mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 14:02:46 +02:00
Code Issues Projects Releases Wiki Activity
97,198 Commits 36 Branches 527 Tags
Commit Graph

21883 Commits

Author SHA1 Message Date
Adrian Greeve
c3044a19b9 Merge branch 'MDL-67215-master' of git://github.com/peterRd/moodle 2019-11-13 10:18:59 +08:00
Andrew Nicols
fe795b59e4 MDL-67116 form: Require grade in multi-grade-item activities 
AMOS BEGIN
  CPY [rating,rating],[grade_rating_name,rating]
AMOS END
 2019-11-13 10:14:37 +08:00
Eloy Lafuente (stronk7)
d5be859063 MDL-67199 versions: bump all versions and requires near release 
version = 2019111800 release version
requires= 2019111200 current beta (week7roll1) version
 2019-11-12 17:57:08 +01:00
Mathew May
07d8669dbf MDL-66906 mod_forum: Show learners their grades in a Modal 2019-11-12 16:17:04 +08:00
Simey Lameze
254fc008a7 MDL-66360 forum: rename sendstudentnotifications_forum to forum_grade_notify 2019-11-12 10:15:41 +08:00
Peter
5c137f610b MDL-67215 core: Revert update from lib upgrade 2019-11-12 09:55:18 +08:00
Andrew Nicols
9359533972 MDL-66360 forum: Fix unit tests in integration 2019-11-11 17:38:02 +08:00
Andrew Nicols
c2dc453f07 MDL-66360 forum: Add missing var from merge conflict 2019-11-11 17:27:35 +08:00
Simey Lameze
c189319e9c MDL-66360 mod_forum: fix cibot issues 2019-11-11 16:08:08 +08:00
Simey Lameze
d543b01b1f MDL-66360 mod_forum: change notifyuser parameter order 2019-11-11 16:08:07 +08:00
Simey Lameze
6143a75136 MDL-66360 grade: fix unit tests failures and errors 2019-11-11 15:39:28 +08:00
Simey Lameze
66216aa052 MDL-66360 mod_forum: remove debug code from template 2019-11-11 15:37:19 +08:00
Shamim Rezaie
c67a54e619 MDL-66360 mod_forum: Notify the student when the marker choose to notify 2019-11-11 15:37:19 +08:00
Shamim Rezaie
b6bf1e8e2a MDL-66360 mod_forum: display notification option pre-set to default 2019-11-11 15:16:19 +08:00
Shamim Rezaie
aa73424c66 MDL-66360 mod_forum: Save the sendstudentnotifications setting 2019-11-11 15:12:33 +08:00
Shamim Rezaie
de3e28635e MDL-66360 mod_forum: phpdoc fixes 2019-11-11 15:12:33 +08:00
Shamim Rezaie
77580567a3 MDL-66360 mod_forum: added settings for send notifications default val 
AMOS BEGIN
 CPY [sendstudentnotifications, mod_assign],[sendstudentnotifications, mod_forum]
 CPY [sendstudentnotifications_help, mod_assign],[sendstudentnotifications_help, mod_forum]
AMOS END
 2019-11-11 15:12:33 +08:00
Andrew Nicols
1c997df371 Merge branch 'MDL-66958' of git://github.com/Chocolate-lightning/moodle_forum-project 2019-11-11 11:26:08 +08:00
Mathew May
63cd8d45db MDL-66958 core_grade: Add grade status abstract 
Also implement the new abstract in Forum
 2019-11-11 11:25:17 +08:00
Andrew Nicols
13965d30fe Merge branch 'MDL-66447' of https://github.com/Chocolate-lightning/moodle_forum-project 2019-11-11 10:55:46 +08:00
Michael Hawkins
a25f9cc357 MDL-66447 forumreport_summary: Added event logging 2019-11-11 10:49:09 +08:00
Mathew May
f418c08c31 MDL-66958 core_grade: Add comparison js for grade saves 2019-11-11 10:44:09 +08:00
Eloy Lafuente (stronk7)
8585294d5c Merge branch 'MDL-67098-master' of git://github.com/junpataleta/moodle 2019-11-09 16:14:45 +01:00
Helen Foster
fda41f4588 MDL-67146 lang: Import fixed English strings (en_fix) 
Significant string changes:

* configallowemojipicker,core_admin - including emoji picker button in
  Atto
* viewconversation,mod_forum - 'conversation' changed to 'discussion'
 2019-11-09 06:35:22 +01:00
Sara Arjona
7347347e84 NOBUG: Fixed SVG browser compatibility 2019-11-08 15:39:33 +01:00
Jun Pataleta
6846ba70a2 MDL-67098 forumreport_summary: Drop temp table at the end of processing 2019-11-08 15:28:23 +08:00
Jun Pataleta
2e809ec27c Merge branch 'MDL-66893-master-3' of https://github.com/ryanwyllie/moodle 2019-11-08 11:59:44 +08:00
Michael Hawkins
d3ae8d42ea MDL-66297 mod_forum: Added word/char count column headings to export 2019-11-08 11:13:37 +08:00
Michael Hawkins
64da1d093a MDL-66297 forumreport_summary: Added filter data to forum export links 
From/to date filter timestamps, as well as discussion IDs of any
filtered groups.
 2019-11-08 11:13:36 +08:00
Michael Hawkins
2e7a16b954 MDL-66297 mod_forum: Prepared export to handle URL filters 
Added the ability for discussion IDs and from/to timestamps to be
passed in via URL (to match filters available in the summary report,
which will link to the export). Also fixed a bug where "all users"
would fail as an optional array param.
 2019-11-08 11:13:36 +08:00
Shamim Rezaie
1743d4a3e9 MDL-66297 forumreport_summary: add export links to the report 2019-11-08 11:13:36 +08:00
Shamim Rezaie
84ed2320dd MDL-66297 mod_forum: The export form can take params from URL 2019-11-08 11:13:36 +08:00
Michael Hawkins
209cfe64fb MDL-67122 forumreport_summary: Fix template context eg and line length 
The template context needed updating now it populates a single select
and the summary_table constructor params should be broken over 2 lines
 2019-11-08 00:15:48 +08:00
Michael Hawkins
30fc34761b MDL-67122 forumreport_summary: Apply filters to report download 2019-11-07 23:42:34 +08:00
Ryan Wyllie
2667acf121 MDL-66893 mod_forum: move grade button into region main 2019-11-07 14:53:38 +08:00
Ryan Wyllie
69848e719b MDL-66893 mod_forum: add nested v2 support to grader 2019-11-07 14:53:38 +08:00
Ryan Wyllie
8404c2b101 MDL-66893 mod_forum: update grader search 2019-11-07 14:53:38 +08:00
Ryan Wyllie
8a09616bc2 MDL-66893 mod_forum: add grader status to grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
def5f14939 MDL-66893 mod_forum: update user picker in grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
035bd996cb MDL-66893 mod_forum: show expand conversation in nested view 2019-11-07 14:53:37 +08:00
Ryan Wyllie
d9fedf3dc8 MDL-66893 mod_forum: update user content region in grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
4c98e56c96 MDL-66893 mod_forum: update navigation bar in grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
46d51c8ca9 MDL-66893 mod_forum: update grading panel UI in grader 2019-11-07 14:53:37 +08:00
Jun Pataleta
ae05752048 Merge branch 'MDL-66372' of https://github.com/Chocolate-lightning/moodle_forum-project 2019-11-07 13:22:32 +08:00
Michael Hawkins
cf8393be4b MDL-66372 forumreport_summary: Tidy up per page and bulk ops handling 2019-11-07 12:58:02 +08:00
Michael Hawkins
20b064beb0 MDL-66372 forumreport_summary: Added ability to select pagination size 
This also includes some refactoring of the bulk actions menu, so both
elements are correctly position within the page, as well as fixing the
alignment of the bulk dropdown with the download dropdown.
 2019-11-07 12:58:02 +08:00
Michael Hawkins
d418bda8c7 MDL-66372 forumreport_summary: Improved generate with filters override 
Previously this override simply appended any GET params from the
action it was overriding to the final action URL, now it can handle
overriding param values, so that they are updated or added as needed
 2019-11-07 12:58:02 +08:00
Michael Hawkins
0d8cd4af31 MDL-66372 forumreport_summary: Report template cleanup 2019-11-07 12:58:02 +08:00
Andrew Nicols
5730749f5d Merge branch 'MDL-66359-master' of git://github.com/Chocolate-lightning/moodle_forum-project 2019-11-07 10:48:33 +08:00
Mathew May
546bf3c68e MDL-66359 mod_forum: Restrict grader by groups 2019-11-07 10:47:45 +08:00