mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 01:12:42 +02:00
Code Issues Projects Releases Wiki Activity
69,323 Commits 36 Branches 529 Tags
Commit Graph

69323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
023d758513 Merge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle 2014-08-12 14:28:22 +01:00
Dan Poltawski
231520807e Merge branch 'MDL-37401' of git://github.com/nobelium/moodle 2014-08-12 13:58:38 +01:00
Dan Poltawski
70c16c5336 Merge branch 'MDL-45642' of git://github.com/timhunt/moodle 2014-08-12 11:34:05 +01:00
Dan Poltawski
134b1e4c90 Merge branch 'MDL-43824-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-12 11:06:53 +01:00
Dan Poltawski
57fdca8cec Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle 2014-08-12 11:04:15 +01:00
Dan Poltawski
62e30bfbcd Merge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign 2014-08-12 11:02:18 +01:00
Marina Glancy
3cef86a42b Merge branch 'MDL-46308' of git://github.com/timhunt/moodle 2014-08-12 16:02:41 +08:00
Marina Glancy
dc0f4b4f26 Merge branch 'MDL-21042_master' of git://github.com/markn86/moodle 2014-08-12 16:01:56 +08:00
Marina Glancy
2e6188a7f2 Merge branch 'MDL-46448_rating_ajax2' of git://github.com/andyjdavis/moodle 2014-08-12 15:22:19 +08:00
Marina Glancy
49b9144c87 Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle 2014-08-12 15:01:30 +08:00
Marina Glancy
e12ffe254e Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle 2014-08-12 15:01:19 +08:00
Marina Glancy
7c27c681b1 Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle 2014-08-12 15:01:10 +08:00
Marina Glancy
44c2bafc1f Merge branch 'MDL-46646-master' of git://github.com/andrewnicols/moodle 2014-08-12 13:32:33 +08:00
Marina Glancy
ff195da1e3 Merge branch 'm28_MDL-46643' of git://github.com/totara/moodle 2014-08-12 13:31:25 +08:00
Marina Glancy
36e2b86dd3 Merge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle 2014-08-12 13:29:15 +08:00
Andrew Nicols
b21b32a4af MDL-46646 gradebook: Optimise generation of the grader report table 
The grader report table makes use of various user preferences, and strings
which on every iteration. On a large gradebook, this can have a significant
impact upon performance.
The table also uses html_writer::tag to generate spans for
machine-generated content which becomes expensive on larger gradebooks.
 2014-08-12 11:56:42 +08:00
Eloy Lafuente (stronk7)
f414c5aa9e Merge branch 'MDL-46646_master' of https://github.com/Syxton/moodle 2014-08-12 01:53:23 +02:00
Eloy Lafuente (stronk7)
27e7715141 Merge branch 'MDL-46676_master' of https://github.com/ikawhero/moodle 2014-08-12 01:48:10 +02:00
Eloy Lafuente (stronk7)
0bf7e11a04 Merge branch 'MDL-46681' of git://github.com/timhunt/moodle 2014-08-12 01:44:13 +02:00
Mary Evans
6f0bab6888 MDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale grades. 2014-08-11 23:40:46 +01:00
Dan Poltawski
c7a042bfcf Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 17:06:54 +01:00
Dan Poltawski
2f035def0f Merge branch 'MDL-45932-master' of https://github.com/StudiUM/moodle 2014-08-11 16:53:51 +01:00
Dan Poltawski
c068b0814b Merge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle 2014-08-11 14:38:33 +01:00
Dan Poltawski
d3014cca39 Merge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 14:31:02 +01:00
Dan Poltawski
c5186b2251 Merge branch 'MDL-46688' of git://github.com/timhunt/moodle 2014-08-11 14:13:12 +01:00
Andrew Davis
93dbb21841 MDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None" 2014-08-11 20:15:00 +08:00
Dan Poltawski
463d281377 Merge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle 2014-08-11 11:24:19 +01:00
Dan Poltawski
0bd41a9ccf Merge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle 2014-08-11 10:41:40 +01:00
Marina Glancy
e4c2a25866 Merge branch 'wip_MDL-46692_m28_forum' of git://github.com/skodak/moodle 2014-08-11 17:24:19 +08:00
Marina Glancy
b832dde880 Merge branch 'MDL-35984-master' of git://github.com/damyon/moodle 2014-08-11 17:22:13 +08:00
Damyon Wiese
d6caf63789 MDL-35984 Grades: Fix deprecation of grade_category::aggregate_values 2014-08-11 15:53:47 +08:00
Damyon Wiese
5232d3f2c9 MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved. 2014-08-11 15:53:47 +08:00
Damyon Wiese
d2e9fc5845 MDL-35984 grade: Add behat tests for grade aggregations 2014-08-11 15:53:41 +08:00
Dan Poltawski
ac7584c85b Merge branch 'MDL-46748-master' of git://github.com/damyon/moodle 2014-08-11 08:37:35 +01:00
Andrew Nicols
83d68fde48 MDL-45780 mod_quiz: Autosave should listen for textarea:change events too 2014-08-11 12:31:36 +08:00
Andrew Nicols
4dbc02f664 MDL-45780 editor_atto: Update the textarea more often 
This change updates the frequency of the textarea update to additionally
update it:
* on keypress; and
* on content paste.
 2014-08-11 12:31:36 +08:00
Damyon Wiese
0b51b466a1 MDL-46748 MathJax filter: Update setting default for https cdn url. 2014-08-11 12:02:35 +08:00
Damyon Wiese
fa268b7ed6 MDL-46748 MathJax filter: Make misconfigured mathjax url less "fatal" for Atto. 2014-08-11 11:37:35 +08:00
Petr Skoda
67dabb5ace MDL-46660 muc: add env check to memcache driver 2014-08-11 08:57:19 +12:00
Nobelium
6a6709ec51 MDL-37401 mod_scorm : autocommit for scorm 2014-08-09 22:06:54 +00:00
Tim Hunt
013fa7a444 MDL-46308 qformat_xml: fix import of broken calculated questions. 
Questions like this should not exist, of course. But they do, so we
should avoid generating errors in this case.
 2014-08-08 17:58:44 +01:00
Tim Hunt
1fa2823de8 MDL-46688 weblib: improve the highlight function. 
Thanks to Joseph Baxter for suggesting some of the test cases.
 2014-08-08 17:51:58 +01:00
Tim Hunt
bbea936991 MDL-45642 questions: add required index to question_attempts. 
It is important to be able to tell which behaviours are in use, and
without this index, it requires a complete scan of this table, which can
be very big, to verify that a behaviour is unused.
 2014-08-08 13:56:23 +01:00
Marina Glancy
9fe5a1b8f4 MDL-30668 gradereport_grader: split user preferences into individual courses 
This solves the DB exception when users were trying to insert very large string in DB
 2014-08-08 15:13:58 +08:00
Andrew Nicols
c8f596147a MDL-46496 libraries: Add additional tests for jquery and jqueryUI 
The additional tests add a clear example of the use of jquery UI images in
addition to working JavaScript.
 2014-08-08 14:09:05 +08:00
Gregory Faller
cfdd3e5cac MDL-46718: Return user to last accessed page when quick grading 2014-08-08 14:01:02 +09:30
Andrew Nicols
74ce46e4ae MDL-45759 javascript: Handle setting of the confirm button fields post-init 2014-08-08 08:25:43 +08:00
Petr Skoda
70a63f0eef MDL-46480 fix get_htmlelement_size() to deal with hidden or non-block elements 2014-08-08 10:28:11 +12:00
Tim Hunt
aa4dcee761 MDL-46681 qtype_multichoice: disabled unused options 
For questions set to 'One answer only', the 'Clear incorrect responses'
and 'Show the number of correct responses' hint options make not sense,
and are not used. Hence we disableIf them.
 2014-08-07 14:20:06 +01:00
Marina Glancy
14cb870f46 weekly release 2.8dev 2014-08-07 13:14:54 +08:00