mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
78,926 Commits 36 Branches 519 Tags
Commit Graph

78926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
f747f5a0d5 MDL-51806 mod_workshop: Add locale support for grade values. 2016-05-30 10:25:26 +08:00
David Monllao
0196f0101c Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle 2016-05-30 10:19:24 +08:00
Marina Glancy
bc6a7431a2 MDL-54065 gradebook: correctly display module icon 2016-05-30 10:07:40 +08:00
Stephen Bourget
18875f811a MDL-54655 Behat: Tests for the online_users block 2016-05-27 18:21:25 -04:00
Tim Hunt
31c07476db MDL-54756 moodle_url: remove dangerous trim from make_file_url 
This was a regression caused by MDL-50268. It broke qtype_stack.
 2016-05-27 19:55:25 +01:00
Tim Hunt
f027922e4f MDL-54605 quiz regrading: incorrect DB query 
There were two issues. With groups, the $params array was wrong
due to PHP + vs array_merge sillyness.

Also, the first column in the SQL was not necessarily unique,
so we need to use a recordset rather than get_records.
 2016-05-27 08:11:32 +01:00
Adrian Greeve
0cf8082a8f MDL-49852 mod_assign: Unit tests for activity completion. 2016-05-27 14:10:55 +08:00
Cameron Ball
e6e69969c1 MDL-43887 formslib: Allow not set date field 
Previously if the date field was not enabled it would
be treated as having value 0. A bug would allow this 0
to pass through and save the date as 1 January 1970
 2016-05-27 01:52:57 +08:00
AMOS bot
867181ab19 Automatically generated installer lang files 2016-05-27 00:04:40 +08:00
Frederic Massart
6e91817178 MDL-54721 report_competency: Do not ignore the first user selection 2016-05-26 17:54:52 +08:00
Steve Bader
9569b01cc9 MDL-49852 mod_assign: Fix group assignment completion tracking 
Fixes completion tracking for group assignments where either only
one student is required to click Submit when submitting the
assignment for grading, all students are required to submit,
or no students are required to click submit (meaning that simply
uploading submits for grading).
 2016-05-26 16:03:03 +08:00
Cameron Ball
bb30944f49 MDL-54010 roles: Specify encoding for escaped export data 2016-05-26 10:31:28 +08:00
Nigel Cunningham
d50a9a9d30 MDL-54010 roles: Fix missing HTMLspecialchars in role export code. 
Role name and description fields are currently not escaped when
exporting a role. This results in an unusable file when characters
such as ampersands are used in a name or description. Fix this by
using htmlspecialchars on both fields.

Signed-off-by: Nigel Cunningham <nigelc@catalyst-au.net>
 2016-05-26 10:31:28 +08:00
Stephen Bourget
71b1761337 MDL-54577 Behat: Add tests for messages block 2016-05-26 10:21:07 +08:00
Marina Glancy
c0e3e9da37 MDL-54116 block_comments: warnings when commenting outside of a course 2016-05-26 10:19:31 +08:00
Stephen Bourget
f2778cc5d6 MDL-54116 block_comments: behat test 2016-05-26 10:19:31 +08:00
Eloy Lafuente (stronk7)
6a74e76fb8 weekly on-sync release 3.2dev 2016-05-26 02:15:53 +02:00
Eloy Lafuente (stronk7)
ea051ef170 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-05-26 02:15:50 +02:00
Jakub Kania
10186fe83d MDL-53851 news block: Display news from all the accessible groups 2016-05-25 16:54:45 +02:00
David Monllao
3f59e20eeb Merge branch 'MDL-54059-master' of git://github.com/andrewnicols/moodle 2016-05-25 16:17:44 +08:00
Adrian Greeve
43c762ef10 MDL-45427 mod_data: Inserting tags into templates. 
Allows tags to be inserted into the editor without
having to touch Atto at all.
 2016-05-25 15:24:41 +08:00
Frederic Massart
9a601adc9e MDL-35987 qtype_multianswer: Prevent restore failure due to bad sequence 2016-05-25 12:23:50 +08:00
Andrew Nicols
c366cb08cf MDL-54059 testing: Add grunt test 2016-05-25 10:44:36 +08:00
Andrew Nicols
a24aff4edf MDL-54059 testing: Simplify travis output 2016-05-25 10:44:01 +08:00
Frederic Massart
b8f414c29f MDL-48248 enrol_manual: Ensure that the default value is always selected 2016-05-25 10:16:59 +08:00
Stephen Bourget
1633ec89ad MDL-54002 Behat: tests for recent blogs block 2016-05-24 12:42:31 -04:00
AMOS bot
0fcfcd8327 Automatically generated installer lang files 2016-05-25 00:04:41 +08:00
Andrew Nicols
979d5c0603 Merge branch 'MDL-54715-master' of git://github.com/marinaglancy/moodle 2016-05-24 14:53:24 +08:00
Marina Glancy
3e9437f412 MDL-54715 core_question: fixed bug when importing questions with tags 
Thanks to WangYang for original patch
 2016-05-24 14:37:53 +08:00
David Monllao
4024b94d17 Merge branch 'MDL-54675-forum-highlight' of https://github.com/brendanheywood/moodle 2016-05-24 14:20:13 +08:00
David Monllao
7b7b990e43 Merge branch 'MDL-54582' of git://github.com/timhunt/moodle 2016-05-24 11:17:08 +08:00
Brendan Heywood
d0d6902a72 MDL-54675 forum: Fixed bug with multiple adjacent hash anchors 2016-05-24 13:07:07 +10:00
Andrew Nicols
13c6946d92 MDL-53687 core_media: Comment fix 2016-05-24 09:02:36 +08:00
Andrew Nicols
939f2b31f9 Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle 2016-05-24 08:59:47 +08:00
AMOS bot
bcb51b8c87 Automatically generated installer lang files 2016-05-24 00:04:21 +08:00
Frederic Massart
c2f430a813 MDL-53687 core_media: Edge does not yet support WebM and OGG 2016-05-23 16:20:15 +08:00
David Monllao
21eef94436 Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle 2016-05-23 14:52:54 +08:00
David Monllao
287074207f Merge branch 'MDL-46934-master' of git://github.com/FMCorz/moodle 2016-05-23 14:38:01 +08:00
David Monllao
ec7ade95db Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle 2016-05-23 14:23:57 +08:00
David Monllao
170402cb4e Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle 2016-05-23 09:50:44 +08:00
David Monllao
2eb57cf7a2 Merge branch 'MDL-54677' of git://github.com/stronk7/moodle 2016-05-23 09:13:40 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Eloy Lafuente (stronk7)
7a3a3246fa MDL-54676 backup: Bump release to 3.2 2016-05-23 00:23:31 +02:00
Eloy Lafuente (stronk7)
2c952b2f38 weekly back-to-dev release 3.2dev 2016-05-22 02:46:17 +02:00
Eloy Lafuente (stronk7)
268abfacc5 Moodle release 3.1 v3.1.0 2016-05-21 23:51:54 +02:00
Eloy Lafuente (stronk7)
cd1c8d2132 Merge branch 'wip-MDL-54666-master' of git://github.com/marinaglancy/moodle 2016-05-21 12:36:51 +02:00
Eloy Lafuente (stronk7)
446e0299b9 Merge branch 'MDL-54672-master-given-i-enrol' of git://github.com/mudrd8mz/moodle 2016-05-21 12:26:01 +02:00
Marina Glancy
4ca17b63a1 MDL-54666 modedit: use default values when modgrade element is frozen 2016-05-21 12:37:46 +08:00
Eloy Lafuente (stronk7)
973641fe13 MDL-54666 tests: Verify that any activity keeps the settings 
This was affecting both to rateable (forum...) and not rateable
(assignment...) activities. So tests have been completed to verify
that now saving is performed and the correct scale values stored.
 2016-05-20 23:48:25 +02:00
David Mudrák
ac5dad467d MDL-54672 behat: Fix i_enrol_user_as() step in non-js sessions 
During the recent reimplementation of the step (eb9ca848), we did not
notice that javascript variant uses the string `assignroles` while the
non-js variant uses string `assignrole`. This caused any "Given I enrol"
steps to fail in non-javascript sessions.
 2016-05-20 20:37:28 +02:00