moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84030 commits 37 branches 540 tags 1.3 GiB
Commit graph

1758 commits

Author SHA1 Message Date
Dan Poltawski
daa571af9f Merge branch 'MDL-55944' of https://github.com/mr-russ/moodle 2016-09-19 11:25:12 +01:00
Andrew Nicols
8bdd97a35a MDL-54872 mod_assign: Allocate Unique IDs before tests 2016-09-14 09:20:33 +08:00
Russell Smith
74ee9d29d2 MDL-55944 testing: Reduce sleep usage. 
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
 2016-09-14 09:49:30 +10:00
David Monllao
c46432ad6c Merge branch 'MDL-54872-master' of git://github.com/andrewnicols/moodle 2016-09-13 10:05:26 +08:00
Andrew Nicols
eb4c466162 MDL-54872 assign: Order blindly marked assignments more blindly 2016-09-12 09:29:45 +08:00
Adrian Greeve
a14cde804e MDL-55505 mod_assign: Editing previous attempt works correctly. 
Editing a previous attempt keeps the current feedback and grades
as it should and does not override them.
 2016-09-08 20:31:05 +08:00
Eloy Lafuente (stronk7)
a6a787c011 Merge branch 'MDL-55236' of https://github.com/bostelm/moodle 2016-09-06 20:30:49 +02:00
Henning Bostelmann
e5e89cacfb MDL-55236 mod_assign: Allow subplugins to backup files 2016-09-05 11:39:12 +02:00
Dan Poltawski
e5c5f5d3ff Merge branch 'MDL-54113-master' of git://github.com/andrewnicols/moodle 2016-09-05 07:53:26 +01:00
David Monllao
bb75b82e21 Merge branch 'MDL-54873-master' of git://github.com/andrewnicols/moodle 2016-08-30 12:52:38 +08:00
Andrew Nicols
5e171c6986 MDL-54873 assign: Seed recordid to print_recent_activity 2016-08-30 11:57:57 +08:00
Andrew Nicols
c06ce32d85 MDL-54873 assign: Add recordid fetching participants 
get_submission_info_for_participants is primarily used by externallib.php
 2016-08-30 11:46:21 +08:00
Andrew Nicols
cf29b1e08d MDL-54873 assign: Fetch mapping id for blind marking in cron 2016-08-30 11:46:20 +08:00
Andrew Nicols
4ed4be4988 MDL-54873 assign: Fetch mapping id for blind marking grading 
This change modifies the grading table to pre-seed record ids where they
already exist.

Where they do not exist, they are still fetched.
 2016-08-30 11:46:20 +08:00
David Monllao
bc1ac4a89d Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle 2016-08-29 11:18:58 +08:00
David Monllao
80e31fdeaa Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle 2016-08-29 10:26:51 +08:00
Marina Glancy
92c9be1978 MDL-55708 mod_assign: display formatted acitvity names 2016-08-25 09:53:29 +08:00
Damyon Wiese
43b0df2601 MDL-55668 assign: Don't link to user profile if blind marking is enabled 2016-08-24 11:21:31 +01:00
Andrew Nicols
f42288ea62 MDL-54113 assign: Open files in new window 
Open files in a new window when viewing to ensure that the form change
checker does not warn about the page reloading.
 2016-08-24 11:33:09 +08:00
Andrew Nicols
098aad4f72 Merge branch 'MDL-55520-master' of git://github.com/damyon/moodle 2016-08-15 10:58:39 +08:00
Damyon Wiese
a95014f5b4 MDL-55520 assign: Behat test for rescaling max grades bug 
Verify the max grade is not silently changed back to 100 when you visit
and save the assignment settings form.
 2016-08-11 15:13:31 +08:00
Dan Poltawski
372dd3711e Merge branch 'MDL-55225-master' of git://github.com/dpalou/moodle 2016-08-09 09:21:07 +01:00
Eloy Lafuente (stronk7)
8c7840df32 Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle 2016-08-03 00:29:45 +02:00
Eloy Lafuente (stronk7)
dffeff0a4b Merge branch 'MDL-55322-master' of https://github.com/snake/moodle 2016-08-03 00:12:10 +02:00
Eloy Lafuente (stronk7)
5fe1db394b Merge branch 'MDL-54745_master' of https://github.com/snake/moodle 2016-08-02 23:13:25 +02:00
Dan Poltawski
4638a26eca MDL-55376 assign: trailing whitespace 2016-08-01 16:07:43 +01:00
Dan Poltawski
b9fe2f38d4 Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle 2016-08-01 16:07:00 +01:00
Dan Poltawski
307e63cb00 Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle 2016-08-01 13:50:37 +01:00
Jake Dallimore
0cced3ced3 MDL-54745 mod_assign: Remove leftover changegradewarning string and js 2016-08-01 12:48:25 +08:00
Jake Dallimore
243ddbcf50 MDL-55322 assignfeedback_editpdf: Prevent scroll when moving comments 
Prevent the default scroll behaviour when using gestures to move
comments on the mobile site.
 2016-08-01 09:43:03 +08:00
Cameron Ball
867b413181
MDL-55376 mod_assign: Fix bug stopping admin from editing submissions 2016-07-29 19:05:22 +08:00
Damyon Wiese
fca211bf05 MDL-55374 mod_assign: Force utf-8 for DOMDocument 
This prevents charset issues on some sites.
 2016-07-29 10:43:25 +08:00
Juan Leyva
145900708c MDL-54941 webservice: Refactor file handling in WS 
This commit reduces boilerplate code.
It also forces WS returning files to always return the following
fields: filename, filepath, mimetype, filesize, timemodified and
fileurl.
 2016-07-28 12:07:04 +02:00
Dani Palou
38b1f8fd99 MDL-55225 assign: Format assignment submission text in WS 2016-07-27 13:30:47 +02:00
Eloy Lafuente (stronk7)
ddf1d5c692 Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle 2016-07-27 00:19:40 +02:00
Eloy Lafuente (stronk7)
7b146b5005 Merge branch 'MDL-55245-master' of https://github.com/lucisgit/moodle 2016-07-26 23:44:54 +02:00
Eloy Lafuente (stronk7)
17b2cd6839 MDL-55046 assign: document the new return values 2016-07-26 19:45:18 +02:00
Eloy Lafuente (stronk7)
e23faa4c81 Merge branch 'MDL-55046-master' of git://github.com/dpalou/moodle 2016-07-26 19:40:52 +02:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated. 
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
 2016-07-26 10:11:30 +08:00
Dan Poltawski
12811fcc34 Merge branch 'MDL-55284-master' of git://github.com/damyon/moodle 2016-07-25 15:53:41 +01:00
Dan Poltawski
3a0bc0fdc4 MDL-55244 js: build changes 
There should be no changes to minified code
 2016-07-25 07:58:05 +01:00
Dan Poltawski
bc8b6dc652 MDL-55244 js: fix various lint warnings in yui 
* Incorrect brace style
* Empty functions
* Multiple var statemnts
 2016-07-25 07:53:05 +01:00
Dan Poltawski
5bb4f444de MDL-55244 js: fix problems with eslint --fix 
eslint --fix '**/yui/src/**/*.js'
 2016-07-25 07:53:05 +01:00
Adrian Greeve
b559497393 MDL-54796 forms: Editor restore event created. 
The editor restore event is currently being subscribed
to by the change checkers to refresh their savedstate.
 2016-07-25 10:42:58 +08:00
Tony Butler
b37b6cd8ef MDL-55245 assignfeedback_editpdf: Enable text in comments to be selected 
Only move comment boxes if 'select' tool is selected, enabling users to
drag-select text within comments using the 'comment' tool.
 2016-07-22 16:39:48 +01:00
David Monllao
0bd8383a8b MDL-55278 search: Updating references to area namespace 2016-07-21 18:38:18 +02:00
Damyon Wiese
771f8df153 MDL-55284 assign: Add missing webservice param 'onlyids' 
Mod assign list_participants webservice is supposed to accept a param to limit the
returned data to only show user ids and not the full user details. It is missing
and so the full user records are fetched every time. This has a major impact on the
performance of the new assignment grading interface.
 2016-07-20 15:18:01 +08:00
David Monllao
f60a16ad9d Merge branch 'MDL-55162-master' of git://github.com/jleyva/moodle 
Conflicts:
	mod/assign/externallib.php
 2016-07-18 20:35:50 +02:00