mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity
79,588 Commits 37 Branches 536 Tags
Commit Graph

18177 Commits

Author SHA1 Message Date
David Mudrák
87b5c584fb MDL-55289 workshop: Fix files processing in example submissions 
While testing the issue MDL-55289 I realized that attaching files to
workshop example submissions does not work at all and throws an error.

The reason was that in MDL-50794 (996f7e82), the variables $contentopts
and $attachmentopts were replaced with the result of the methods
submission_content_options() and submission_attachment_options().
But I forgot to perform the full refactoring in exsubmission.php too.

Attached behat test should cover both issues on this branch.
 2016-07-28 09:51:16 +02:00
David Mudrák
21d49a3f93 MDL-55289 workshop: Include repository/lib.php to use its constants 
As a result of MDL-41556 (146893d6), the repository/lib.php was included
in submission.php so that its constant FILE_INTERNAL could be used in
field options. Recent development in MDL-50794 (996f7e8) moved the
options declaration to standalone methods but we forgot to check they
work in exsubmission.php too.

This patch moves the repository/lib.php inclusion to where the
library is actually needed.

Additionally it unifies how options are set for overall feedback content
and overall feedback attachment fields.
 2016-07-28 09:51:16 +02:00
Rajesh Taneja
35f7cf429c
MDL-54987 behat: Fixed feedback scenarios to display chart data 
Now chart data is not visible by default,
we need to click 'Show chart data' to view.
Also, extra space is not required between
% as it's done by chart library
 2016-07-27 11:00:54 +08:00
Eloy Lafuente (stronk7)
bdce994c5f Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle 2016-07-27 00:59:19 +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)
e90c60696a Merge branch 'wip-MDL-51735-master' of git://github.com/abgreeve/moodle 2016-07-26 20:15:13 +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
Eloy Lafuente (stronk7)
8b13e09595 Merge branch 'wip-mdl-55337' of https://github.com/rajeshtaneja/moodle 2016-07-26 13:12:07 +02:00
Rajesh Taneja
4505459083
MDL-55337 behat: Added 1 sec delay between post 
Ensure post is created at different timestamp, else
returned posts will be different and test fails.
This will happen on a fast machine.
 2016-07-26 18:59:51 +08:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
Dan Poltawski
be5837d797 Merge branch 'MDL-54987-master-fixes' of https://github.com/lameze/moodle 2016-07-26 09:55:33 +01:00
Simey Lameze
e747d65514 MDL-54987 mod_choice: Fix notices and behat failures 2016-07-26 16:24:35 +08:00
Jun Pataleta
fb77333453 MDL-50267 lang: Remove deprecated strings in 2.9 2016-07-26 16:03:32 +08:00
David Monllao
72e92d0ac2 Merge branch 'MDL-55325-master' of https://github.com/xow/moodle 2016-07-26 10:33:21 +08: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
David Monllao
db044a0997 Merge branch 'MDL-55251_m32v1' of https://github.com/sbourget/moodle 2016-07-26 05:12:00 +08:00
David Monllao
fa2e488520 Merge branch 'MDL-55254_m32v3' of https://github.com/sbourget/moodle 2016-07-26 04:27:48 +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
c41ec1f55a Merge branch 'MDL-54987-master' of git://github.com/danpoltawski/moodle 2016-07-25 15:27:23 +01:00
Dan Poltawski
ce323331f1 MDL-54987 charts: fix style issues 2016-07-25 11:21:31 +01:00
Simey Lameze
32917a9561 MDL-54987 core: final charts project polishing 2016-07-25 10:43:35 +01:00
Simey Lameze
1850e97e37 MDL-55208 mod_choice: Convert choice results chart to new library 
Part of MDL-54987 epic.
 2016-07-25 10:43:33 +01:00
Simey Lameze
7cd65bcb76 MDL-55308 mod_feedback: Convert analysis chart to the new library 
Part of MDL-54987 epic.
 2016-07-25 10:43:31 +01:00
Frederic Massart
baea27e4d3 MDL-55026 quiz_statistics: Convert charts to the new library 
Part of MDL-54987 epic.
 2016-07-25 10:43:03 +01:00
Frederic Massart
ec882623f3 MDL-55026 quiz_overview: Convert chart to the new library 
Part of MDL-54987 epic.
 2016-07-25 10:43:01 +01:00
Frederic Massart
c685dfabdc MDL-54989 scormreport_graphs: Use the new charting library 
Part of MDL-54987 epic.
 2016-07-25 10:42:52 +01:00
John Okely
4c3472a55c MDL-55325 mod_lti: Use .on('load') instead of .load() 
Necessary after MDL-50937 JQuery upgrade to 3.1
 2016-07-25 17:31:41 +08:00
Dan Poltawski
a3ee51fe44 Merge branch 'wip-MDL-54796-master-v2' of git://github.com/abgreeve/moodle 2016-07-25 10:28:27 +01:00
Stephen Bourget
530d553580 MDL-55252 mod_chat: prevent direct script access to lib files. 2016-07-25 09:42:36 +01:00
Stephen Bourget
73b1d580aa MDL-55253 mod_choice: prevent direct script access to lib files. 2016-07-25 09:40:38 +01:00
Stephen Bourget
c4b70cfc61 MDL-55255 mod_data: prevent direct script access to lib files. 2016-07-25 09:39:57 +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
89644a400d MDL-51735 mod_lesson: A lesson with no content shows a message. 
Before it would show an error.
 2016-07-25 10:48:14 +08: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
Stephen Bourget
12306a9f0f MDL-55254 mod_data: Add view permissions 2016-07-24 21:00:57 -04: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
Eloy Lafuente (stronk7)
4feed61702 Merge branch 'MDL-55220-master' of git://github.com/jleyva/moodle 2016-07-19 13:21:36 +02:00
David Monllao
fa8f88095c Merge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle 2016-07-19 08:41:29 +02:00
Stephen Bourget
05fbbb7731 MDL-55157 mod_feedback: Deprecate unused strings 2016-07-18 22:08:47 -04:00
Stephen Bourget
b28753f5bf MDL-55157 mod_feedback: Course reset should update dates 2016-07-18 22:08:00 -04:00
Eloy Lafuente (stronk7)
9e91ff52c9 Merge branch 'MDL-51410_m32v2' of https://github.com/sbourget/moodle 2016-07-19 02:31:24 +02:00
David Monllao
db26654b70 Merge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle 2016-07-19 01:48:28 +02:00
David Monllao
2f8da1e814 Merge branch 'MDL-55158_m32v3' of https://github.com/sbourget/moodle 2016-07-19 00:50:41 +02:00