mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
79,028 Commits 36 Branches 527 Tags
Commit Graph

17982 Commits

Author SHA1 Message Date
Andrew Nicols
a029e5212d Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle 2016-06-16 09:04:15 +01:00
Andrew Nicols
00f99e270a Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:14 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
4f400df523 Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle 2016-06-16 09:04:09 +01:00
Andrew Nicols
62bc2e84c5 Merge branch 'MDL-54712-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:08 +01:00
Andrew Nicols
337ee7ffa2 Merge branch 'MDL-54787_master' of https://github.com/snake/moodle 2016-06-16 09:04:07 +01:00
Andrew Nicols
de0298d5fd Merge branch 'MDL-54859_master' of git://github.com/dmonllao/moodle 2016-06-16 09:04:05 +01:00
Eloy Lafuente (stronk7)
392c40467f Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:04 +01:00
Nicholas Hoobin
99a5377bb7 MDL-53788 mod_lti: fix aggressive course cache rebuilding 2016-06-15 10:42:27 +10:00
Dan Poltawski
d25e8fde45 Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle 2016-06-13 09:35:58 +01:00
Dan Poltawski
88b0045106 Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle 2016-06-13 09:17:49 +01:00
Jun Pataleta
cdbdb2f9b7 MDL-54772 mod_assign: Fixes for PDF editor 
* Render the annotations and comments within the drawing canvas, not in
the drawing region.
* Remove edit-related event bindings for stamp annotations.
 2016-06-13 09:54:02 +08:00
Jake Dallimore
cd6dfd68d8 MDL-54787 mod_quiz: Fix notification error on regrade 2016-06-10 18:26:30 +08:00
Dan Poltawski
8b766dd1d8 MDL-54890 assignfeedback_editpdf: Fix missing semicolon 
Detected by eslint rule 'semi'
 2016-06-10 10:06:25 +01:00
Jun Pataleta
93f3988cf7 MDL-54712 mod_lti: Remove markup from LTI admin notification messages 2016-06-10 15:10:45 +08:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
David Monllao
dc4c357435 MDL-54859 mod_wiki: Client rules only when fields are visible 2016-06-08 16:44:45 +08:00
Dan Poltawski
631edc10ae MDL-46721 assign: clarify ternerary statement 2016-06-07 12:15:19 +01:00
Dan Poltawski
db417025d7 Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle 2016-06-07 12:12:28 +01:00
Dan Poltawski
654e77e74d MDL-54729 mod_forum: clarify static variable usage 
After some time discussing with integrators, we decided that this
slightly yukky solution probably fits safely, so just making its usage
better explained and speciifc.
 2016-06-07 10:46:53 +01:00
Adrian Greeve
09fec72819 MDL-54729 mod_forum: Deep link highlighting works in IE. 2016-06-07 10:30:18 +01:00
Dan Poltawski
df4af29945 Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle 2016-06-07 09:41:27 +01:00
Dan Poltawski
5bd52435b4 Merge branch 'MDL-54702_master' of https://github.com/snake/moodle 2016-06-06 13:41:48 +01:00
Dan Poltawski
e750544a06 Merge branch 'MDL-53392_master' of https://github.com/snake/moodle 2016-06-06 13:21:09 +01:00
Dan Poltawski
a7de32a265 Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle 2016-06-06 11:59:42 +01:00
Dan Poltawski
f549e4b7e8 MDL-54649 quiz/question: remove uncessary !important uses 
They do not seem at all necessary in testing, so probably just legacy
from lack of css understanding when added.
 2016-06-05 20:29:13 +01:00
Dan Poltawski
996a1dab8f MDL-54649 quiz/question: fix css lint errors 
Mostly the rules were not having any effect so have been removed.

The text-wrap rule was removed rather than corrected because overflow
was clipped with ellipsis anyway.

An exception for !important has been added to mod/quiz/styles.css
because the use in the secure style is by design. But the exception
isn't ideal because it applied to the whole file and csslint doesn't
seem to be very intelligent at appling line rules at a more granular
level at this point in time.
 2016-06-03 14:18:57 +01:00
Jun Pataleta
bb2281d53c MDL-54765 mod_assign: Use selectedIndex for setting page selection 
Set the 'selectedIndex' attribute of the page selection element instead of
the 'value' attribute since YUI is having trouble with this in IE.
 2016-06-03 14:55:43 +08:00
Frederic Massart
ac032e0e09
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished 2016-06-03 14:52:34 +08:00
Jake Dallimore
c724c98829 MDL-54702 mod_lti: Support standard cartridge icons in LTI import 2016-06-01 09:49:10 +08:00
David Monllao
d1577993b6 Merge branch 'MDL-54605' of git://github.com/timhunt/moodle 2016-05-31 11:32:11 +08:00
David Monllao
42d0093d6e Merge branch 'MDL-49943-master' of git://github.com/marinaglancy/moodle 2016-05-30 15:29:22 +08:00
David Monllao
1e562ebc48 Merge branch 'MDL-37138-master-2' of git://github.com/cameron1729/moodle 2016-05-30 15:02:17 +08:00
Marina Glancy
42dfbb5416 MDL-49943 mod_choice: display multiple answers in complete report 2016-05-30 14:17:17 +08:00
Cameron Ball
cd29373c35 MDL-37138 chat: Use blanktarget option for chat text 2016-05-30 13:18:02 +08:00
David Monllao
5baf32c038 Merge branch 'MDL-51806_master' of https://github.com/snake/moodle 2016-05-30 10:51:33 +08:00
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
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
Jake Dallimore
7eafbbf7fa MDL-53392 mod_assign: Remove old Grade Max warning string references 2016-05-26 17:16:53 +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
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
Cameron Ball
4ca7fdd26e MDL-46721 assign: Make blind marking participant numbers match 
Previously emails were setting the "From" header to the incorrect
participant number.
 2016-05-24 18:19:54 +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
Brendan Heywood
d0d6902a72 MDL-54675 forum: Fixed bug with multiple adjacent hash anchors 2016-05-24 13:07:07 +10:00
David Monllao
e5fa1c5781 MDL-54562 mod_data: Add activities info to search 2016-05-23 16:06:00 +08:00
David Monllao
ec7ade95db Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle 2016-05-23 14:23:57 +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
Jun Pataleta
7af009633a MDL-54661 mod_assign: Unescape course name in grading nav template 2016-05-20 15:28:37 +08:00