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
71,528 Commits 36 Branches 527 Tags
Commit Graph

1080 Commits

Author SHA1 Message Date
Dan Poltawski
dda9997250 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-12-15 16:10:15 +00:00
Dan Poltawski
3a299d82e0 Merge branch 'MDL-45324' of git://github.com/jonof/moodle 2014-12-15 14:59:34 +00:00
Dan Poltawski
78677d5ec7 Merge branch 'MDL-47475-master' of git://github.com/andrewnicols/moodle 2014-12-15 12:20:41 +00:00
David Monllao
edf938687f Merge branch 'MDL-48235-assign-reopen-until-pass' of git://github.com/mpetrowi/moodle 2014-12-15 17:30:40 +08:00
Andrew Nicols
9b65a08095 MDL-47475 mod_assign: Copy files to other group members for editpdf 2014-12-15 08:50:31 +08:00
David Monllao
2dda9417dd MDL-38128 mod_assign: Counts and groups unit tests 2014-12-12 15:10:23 +08:00
David Monllao
bc006a666c MDL-38128 mod_assign: Fixing count teams and submissions with status 
We should restrict the groups to the activity active group. Also
improving performance caching get_submission_group() results.
 2014-12-12 13:14:53 +08:00
David Monllao
184f3b6814 MDL-38128 mod_assign: Adding group selector to grading summary page 
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
 2014-12-12 13:14:53 +08:00
Jonathon Fowler
70cfc878b9 MDL-45324 assign: notify when workflow is Off, or if state is Released 
When marking workflow is enabled, students will be notified only when
the workflow state transitions to 'Released'. Until that happens,
sending of messages will be held and the 'Notify students' grading
form option will be locked.

Additionally, the batch set marking workflow state facility gains
the 'Notify students' option.

Credit to Steve Upton and David Balch for the basis of this patch.
 2014-12-10 22:29:08 +10:00
Sam Hemelryk
d5265ac28e Merge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign 2014-12-09 15:38:40 +13:00
Gregory Faller
b288570463 MDL-46172 mod/assign: Stop suspended users getting assign group emails 2014-12-06 08:24:08 +10:30
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
Matt Petro
e77bacab4f MDL-48235 mod_assign: Fix reopen until pass behavior 2014-12-02 14:01:22 -05:00
Damyon Wiese
3e116130b0 Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle" 
This reverts commit 861a0fd92a9a8ae3f970707a8e39a4ba96fbdaba.

This reverts commit f376c2ffd7d8304bafff851ead3ed10dee34c805, reversing
changes made to abe9be7240d7bda36bd3831b3638795466987745.
 2014-11-28 15:07:31 +08:00
David Monllao
861a0fd92a MDL-38128 mod_assign: Changes in grading summary page using team submissions 
If there is an active group and (groupmode != NOGROUPS)
the displayed info is related with that single group.
 2014-11-27 18:08:43 +08:00
Ashley Holman
e629bd3ff3 MDL-46356 assign: remove unnecessary get_area_files call 2014-11-25 14:27:17 +00:00
Dan Poltawski
f376c2ffd7 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-11-25 11:07:50 +00:00
David Monllao
ec802d8ef6 MDL-38128 mod_assign: Adding group selector to grading summary page 
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
 2014-11-25 10:44:36 +08:00
Sam Hemelryk
9e921abaff Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle 2014-11-25 09:42:46 +13:00
Dan Poltawski
e1a826e205 Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle 2014-11-24 11:53:53 +00:00
Sam Hemelryk
11b5e41b0c NOBUG: fixed commit message typo 2014-11-20 16:47:33 +13:00
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00
Brian Barnes
25fd8e0778 MDL-48265 feedback: Added alt text to ghostscript test image 2014-11-18 17:09:05 +13:00
Sam Hemelryk
6067a4c87c Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle 2014-11-18 10:57:29 +13:00
Frederic Massart
ab14ab741e MDL-48180 mod_assign: By default do not count 'new' submissions 2014-11-17 15:14:37 +08:00
Sam Hemelryk
57fa596e0f Merge branch 'MDL-43628' of https://github.com/scyrma/moodle 2014-11-17 11:44:57 +13:00
Dan Poltawski
3194ca4b02 Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle 2014-11-11 19:05:45 +00:00
Mathieu Petit-Clair
fb61433086 MDL-43628 assign: make submissionagreement usable on multilingual sites 2014-11-10 16:53:03 -05:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Damyon Wiese
3d4de122f2 Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle 2014-11-07 16:08:20 +08:00
Simey Lameze
8c674e80ec MDL-46986 mod_assign: Change the asserting to false 2014-11-07 15:54:14 +08:00
Marina Glancy
2f1d0ea663 Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle 2014-11-07 11:54:13 +08:00
Simey Lameze
274962a1e7 MDL-46986 mod_assign: Remove duplicate column identifier 2014-11-07 09:19:18 +08:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Damyon Wiese
225fa27fc2 MDL-47793 assign: trivial fix for inconsistent use of get_instance() 2014-11-05 14:27:58 +08:00
Damyon Wiese
43db479d51 Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle 2014-11-05 14:25:22 +08:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Damyon Wiese
a0f8db77bb MDL-47975 assign: Stop gap fix for random time fails. 2014-10-31 12:52:24 +08:00
Michael Aherne
48242bf33f MDL-47793 assign: Reset reveal identities 2014-10-29 11:18:06 +00:00
Damyon Wiese
e562a1b25b Merge branch 'MDL-46219' of https://github.com/dkns/moodle 2014-10-29 15:37:47 +08:00
Dan Poltawski
cb1bc5eb6b Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle 2014-10-24 15:37:26 +01:00
Frederic Massart
20942dd702 MDL-47397 assignfeedback_editpdf: Copy stamps to other students in team 
During a team submission the stamps were attached to the user that
was graded and not to the other users. This could lead to errors when
generating the PDF for each user.
 2014-10-24 15:09:06 +01:00
Frederic Massart
47ff1cd93b MDL-47397 assignfeedback_editpdf: Tests use reliable way to annotate PDF 
The drag and drop step did not work, so we moved to using the stamps
to annotate the PDF. They do not rely on drag&drop and produce the same
effects.
 2014-10-24 15:09:06 +01:00
Dan Poltawski
a5f9fc6be3 Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle 2014-10-24 11:48:19 +02:00
Damyon Wiese
8112670d62 MDL-47815 assign: Fix random unit test fails 
This test was failing when it was run really slowly (looking at you oracle).
 2014-10-24 11:48:18 +02:00
Syxton
35e7ad6a60 MDL-47777 assign: max files hard coded to setting 
The current file submission is hard coded to a maximum of 20 files
possible.  While the user can choose a number less than 20, the maximum
is still set in code.  This converts the hard coded 20 to a site setting
defaulting to 20.
 2014-10-22 08:24:30 -04:00
Adrian Greeve
c42d18183a MDL-47675 phpunit: Update unit tests to pass on MSSQL 
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.

This patch includes the garbage collection for the unit tests
that require it.
 2014-10-20 14:26:11 +08:00
Damyon Wiese
821ce4d63b MDL-47655 assign: Fix unit tests triggering debugging 
Test was triggering notifications - so needs to use a message sink.
 2014-10-17 09:45:02 +08:00
Dan Poltawski
50c4e8e8b6 Merge branch 'MDL-47696' of https://github.com/willylee/moodle 2014-10-16 11:07:27 +01:00
Dan Poltawski
5708376927 Merge branch 'MDL-47655-master' of git://github.com/damyon/moodle 2014-10-16 10:57:06 +01:00