Commit graph

74527 commits

Author SHA1 Message Date
Andrew Davis
d1cb06fb1b MDL-49950 removed a duplicate string definition 2015-08-26 05:40:31 +08:00
Andrew Davis
d66c9f0d7b MDL-50529 core_grade: removed duplicate code 2015-08-25 21:14:47 +08:00
Eloy Lafuente (stronk7)
4738193225 Merge branch 'wip-MDL-50923-master' of git://github.com/marinaglancy/moodle 2015-08-25 11:34:33 +02:00
Dan Poltawski
f1352da1ba Merge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/moodle 2015-08-25 09:55:00 +01:00
Damyon Wiese
2e96b001c4 MDL-51179 Atto: Abort autosave if there are more recent changes to the files
If the files in the draft area have been modified more recently than the timestamp
of the draft - do not restore the files, or you will delete any newer files. We
cannot really guess here - merging the 2 lists of files will be wrong.
2015-08-25 16:09:57 +08:00
David Monllao
7ac0ddd00a Merge branch 'MDL-50933' of git://github.com/timhunt/moodle 2015-08-25 14:28:06 +08:00
David Monllao
a2ce97e306 Merge branch 'MDL-50996' of git://github.com/timhunt/moodle 2015-08-25 14:26:25 +08:00
Ramindu Deshapriya
202203e38f MDL-51172 core_files: Added Behat test to automate MDLQA-8166 2015-08-25 08:49:01 +05:30
David Monllao
09fc06d799 Merge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/moodle 2015-08-25 10:13:18 +08:00
David Monllao
61e44f4033 Merge branch 'mdl-50957' of git://github.com/cdsmith-umn/moodle 2015-08-25 10:06:49 +08:00
Adrian Greeve
4fc7b6a07b MDL-27177 roles: Update to behat full profile tests. 2015-08-25 09:43:17 +08:00
Adrian Greeve
82e4d43842 MDL-27177 roles: Unit test for newly created function. 2015-08-25 09:43:17 +08:00
Adrian Greeve
66a43cd543 MDL-27177 roles: Allow students to see co-students profiles.
If the student shares a course with another student then let them
see the same detail on the full profile page as they do on the
course profile page.
2015-08-25 09:43:17 +08:00
Eloy Lafuente (stronk7)
bcf9c54c20 Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle 2015-08-25 00:06:01 +02:00
Tim Hunt
924db7109c MDL-45841 forum: show unread posts on blog-style forum front page 2015-08-24 21:44:56 +01:00
Dan Poltawski
ee9b9ffd51 Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle 2015-08-24 15:14:15 +01:00
Clement Smith
368c1bb674 MDL-50957 grade/report/user: Fix division by zero
When using "sum of grades" and $grademax is zero, a division by zero
error occurs in fill_contributions_column() in
grade/report/user/lib.php.
2015-08-24 09:05:30 -05:00
Dan Poltawski
eee9e47d28 MDL-50723 upgrade.txt: Note dropped unused table
Just in case..
2015-08-24 14:52:26 +01:00
Dan Poltawski
482ebc1786 Merge branch 'MDL-50723-master' of git://github.com/andrewnicols/moodle 2015-08-24 14:47:25 +01:00
Dan Poltawski
030806a4ba Merge branch 'MDL-40179-master' of git://github.com/lameze/moodle 2015-08-24 13:40:15 +01:00
Dan Poltawski
fcd8119eda Merge branch 'wip-MDL-27859-master' of https://github.com/marinaglancy/moodle 2015-08-24 10:55:03 +01:00
Dan Poltawski
7ee1695850 Merge branch 'MDL-49826_grade_single_view' of git://github.com/davosmith/moodle 2015-08-24 10:39:06 +01:00
Dan Poltawski
4d9845426e Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle 2015-08-24 10:25:32 +01:00
Tim Hunt
857e2a6f8c MDL-50996 quiz: fix review error with unusual permissions 2015-08-24 09:53:52 +01:00
Michael Aherne
a25b5a9e6b MDL-51181 config: Correct documentation of lock_factory 2015-08-24 09:06:26 +01:00
David Monllao
1e5b562ac9 Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle 2015-08-24 15:40:10 +08:00
David Monllao
259bd67ce9 Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle 2015-08-24 15:29:58 +08:00
Marina Glancy
ba2ad4316e MDL-51184 themes: correctly check $CFG->svgicons
Thanks to Ralf Wiederhold for pointing out the bug
2015-08-24 11:06:24 +08:00
Damyon Wiese
e0d08bfa5d MDL-51116 Mustache: Caching issue exists with mustache templates
The first ajax load fetches the template and puts it in localstorage + a js var

The second load gets it from local storage, but does not put it in the js var.

The pix_icon helper expects it to be in the js var always.
2015-08-24 10:50:40 +08:00
Bruce Silver
88a26baec0 MDL-50958 block_messages: declare missing stdClass object 2015-08-24 10:47:24 +08:00
David Monllao
8d2a44b554 Merge branch 'wip-MDL-51087-master' of git://github.com/marinaglancy/moodle 2015-08-24 10:18:14 +08:00
Marina Glancy
2aaed97f61 MDL-51131 tags: remove instances when course is deleted 2015-08-22 21:51:11 +08:00
Tim Hunt
83cd293a10 MDL-50933 quiz: improve completion behat tests
These now use the faster set-up methods.
2015-08-21 17:51:04 +01:00
Marina Glancy
46f708ea17 MDL-27859 tags: unit test for tag cleanup 2015-08-21 21:14:10 +08:00
Marina Glancy
a196f37088 MDL-27859 tags: unit test for correlated tags 2015-08-21 21:14:06 +08:00
Andrew Nicols
3c3d38d09a MDL-51170 core: Scheme section of URL should be case insensitive 2015-08-21 12:26:10 +08:00
Andrew Nicols
bff7570e87 MDL-50714 mod_forum: Add tests for all groupmodes 2015-08-21 08:19:29 +08:00
Andrew Nicols
344e126378 MDL-50714 mod_forum: Correct use of movedicussions cap when posting
The ability to view the group dropdown was too closely related to the
movediscussions capability when posting, or editing a forum post.

The movedicussions capability should only be considered for some parts of
this logic. Users should be able to select the group to post to when
writing message, as long as they have access to that group.
2015-08-21 08:18:46 +08:00
Nelson Moller
52b08f5fce MDL-51090: mod_quiz grading validation of an essay question
An invalid format is casted to 0 (if a string) or to some truncated value in other cases (ex: 10..5).
2015-08-20 19:58:49 +01:00
Gareth J Barnard
267c636702 MDL-50869 themes: Quiz feedback colours are not accessible. 2015-08-20 16:44:29 +01:00
Davo Smith
4021aa45ce MDL-49826 gradereport_singleview: fix permission check
Users with capability 'moodle/grade:edit' should be able to edit grade values
- 'moodle/grade:manage' is not needed, as grade items are not being changed.
2015-08-20 14:55:56 +01:00
Dan Poltawski
6d392b3027 weekly release 3.0dev 2015-08-20 14:24:28 +01:00
David Monllao
cf9fe42f6e Merge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle 2015-08-20 15:41:07 +08:00
Andrew Nicols
9ed97f19ad Merge branch 'MDL-50801_master-unexisting-caption' of git://github.com/dmonllao/moodle 2015-08-20 15:37:13 +08:00
David Monllao
bcd58d9ff7 MDL-50801 atto_table: Caption node might not be present
Users may not use atto table (which always adds a caption) to set
HTML tables, this patch addresses that case.
2015-08-20 15:25:44 +08:00
Andrew Nicols
cf86d4f5bc MDL-42634 theme: Increase margin on activity instance to not cover controls 2015-08-20 15:18:14 +08:00
David Monllao
9502083292 MDL-49280 auth: Rewording duplicate emails setting
From allowuserstoshareemailaddresses to allowaccountssameemail, also
changing lang strings.
2015-08-20 12:56:11 +08:00
Damyon Wiese
85fa6a9305 MDL-50150 Mustache: Update to 2.9.0 version of mustache.php
And enable the BLOCKS pragma (we need it for reusable templates).
2015-08-20 11:44:56 +08:00
Damyon Wiese
841e689a1c MDL-50150 Mustache: Add "BLOCKS" feature to javascript mustache engine.
Pull request: https://github.com/janl/mustache.js/pull/473
2015-08-20 11:44:49 +08:00
David Monllao
3ac1350598 Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle 2015-08-20 10:31:20 +08:00