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

79598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
b9fe2f38d4 Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle 2016-08-01 16:07:00 +01:00
Dan Poltawski
65a427cc64 Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle 2016-08-01 14:25:38 +01:00
Dan Poltawski
066e31fd74 Merge branch 'MDL-55323-master' of git://github.com/junpataleta/moodle 2016-08-01 13:58:20 +01:00
Dan Poltawski
307e63cb00 Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle 2016-08-01 13:50:37 +01:00
Dan Poltawski
a5cb07477c Merge branch 'MDL-55352-master' of git://github.com/lameze/moodle 2016-08-01 09:30:33 +01:00
Andrew Nicols
1a1771b944 Merge branch 'MDL-53152-master' of git://github.com/junpataleta/moodle 2016-08-01 15:04:17 +08:00
Jun Pataleta
259bf04f8a MDL-53152 theme: Add parentheses to variable calculations 2016-08-01 13:40:38 +08:00
Simey Lameze
c5a90a4a5d MDL-55367 report_log: Prevent invalid time to be passed to Charts API 2016-08-01 12:57:57 +08:00
Andrew Nicols
5ee6125591 Merge branch 'MDL-55266-master' of git://github.com/jleyva/moodle 2016-08-01 10:49:15 +08:00
Andrew Nicols
f00d967b43 Merge branch 'MDL-50286_m32v3' of https://github.com/sbourget/moodle 2016-08-01 09:54:06 +08:00
Stephen Bourget
3dee255163 MDL-50286 report_log: Allow filtering by event origin. 2016-07-31 21:45:27 -04:00
Andrew Nicols
78c19679d6 Merge branch 'MDL-55289-master-exsubmission' of git://github.com/mudrd8mz/moodle 2016-08-01 08:46:54 +08:00
Cameron Ball
867b413181
MDL-55376 mod_assign: Fix bug stopping admin from editing submissions 2016-07-29 19:05:22 +08:00
Simey Lameze
9698ca2d20 MDL-55352 core: Label values series should override tooltip 2016-07-29 13:22:59 +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
45fec98358 MDL-55266 user: New WS core_user_get_user_preferences 2016-07-28 12:08:58 +02:00
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
Jun Pataleta
fe15136d37 MDL-55323 enrol_lti: Remove unused required parameter 2016-07-28 14:44:58 +08:00
David Monllao
d1a3ea62ef weekly release 3.2dev 2016-07-28 12:07:20 +08:00
Dan Poltawski
fdf50e35b6 Merge branch 'MDL-55287_master-fix' of git://github.com/dmonllao/moodle 2016-07-27 07:58:33 +01:00
David Monllao
e240a6132d MDL-55287 search: Custom error message if solr extension is not installed 
Correcting engine is not installed lang string as well.
 2016-07-27 13:57:15 +08:00
David Monllao
52872f66eb Merge branch 'wip-mdl-54987' of https://github.com/rajeshtaneja/moodle 2016-07-27 13:17:33 +08:00
Mark Nelson
e1f53120dd MDL-54984 core_cache: corrected exception message 2016-07-27 11:42:47 +08: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)
f9c46195e4 Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle 2016-07-26 19:56:20 +02:00
Eloy Lafuente (stronk7)
7647f3887f Merge branch 'MDL-54801-master' of git://github.com/jleyva/moodle 2016-07-26 19:54:53 +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
Dan Poltawski
3624777b24 Merge branch 'MDL-54984-master' of git://github.com/junpataleta/moodle 2016-07-26 09:52:42 +01:00
Dan Poltawski
970c8e5ba4 MDL-49533 version: bump 2016-07-26 09:41:24 +01:00
Dan Poltawski
e799990454 Merge branch 'MDL-49533-master' of git://github.com/andrewnicols/moodle 2016-07-26 09:40:17 +01:00
Simey Lameze
e747d65514 MDL-54987 mod_choice: Fix notices and behat failures 2016-07-26 16:24:35 +08:00
Dan Poltawski
d0733c7d69 Merge branch 'MDL-50051-master' of git://github.com/junpataleta/moodle 2016-07-26 09:14:45 +01:00
Dan Poltawski
6d5a7eee0c Merge branch 'MDL-54988-master' of git://github.com/junpataleta/moodle 2016-07-26 09:13:10 +01: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
1a9c3d587f Merge branch 'wip-MDL-55183-master' of git://github.com/abgreeve/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2016-07-26 09:52:51 +08:00
Andrew Nicols
f1f94da496 MDL-49533 repository: Remove the Alfresco plugin 
The SDK that this plugin was designed around is not compatible with recent
versions of Alfresco so the decisio has been made to move the repository to
the plugins database.
 2016-07-26 08:57:34 +08:00
David Monllao
db044a0997 Merge branch 'MDL-55251_m32v1' of https://github.com/sbourget/moodle 2016-07-26 05:12:00 +08:00