69451 Commits

Author SHA1 Message Date
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
Marina Glancy
d28f978649 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-08-07 13:14:52 +08:00
Petr Skoda
e8b52671ae MDL-46711 session: add support for multiple servers to memcache session driver
Includes proper definition of object properties which fixes handling of timout default.
2014-08-07 15:39:27 +12:00
Paul Holden
3ae478ffd1 MDL-21042 report_security: don't display warning for riskbackup unnecessarily 2014-08-06 19:53:54 -07:00
Marina Glancy
c293baee2e Merge branch 'wip-mdl-46175' of https://github.com/rajeshtaneja/moodle 2014-08-07 10:02:25 +08:00
Marina Glancy
4b9bcb5264 Merge branch 'MDL-32917-master-1' of https://github.com/andrewnicols/moodle 2014-08-07 10:01:24 +08:00
Rajesh Taneja
cc41342290 MDL-46175 behat: Fixed lang changes in gradebook 2014-08-07 09:39:58 +08:00
Rajesh Taneja
0631009caf MDL-45897 behat: fixed behat for my home page 2014-08-07 09:39:07 +08:00
Andrew Nicols
b6c56044f6 MDL-32917 calendar: Fix centering of calendar heading on IE10 2014-08-07 09:38:06 +08:00
Petr Skoda
c6b5f18d06 MDL-46561 session: use full session validation in \core\session\manager::session_exists() 2014-08-07 08:59:24 +12:00
Andrew Davis
c568d478db MDL-46448 core_rating: now only formats rating aggregate if user can see it 2014-08-06 18:28:56 +08:00
Shane Elliott
99c9798b32 MDL-46676 profilefield_datetime: Use moodle time API 2014-08-06 16:34:40 +08:00
Adam Olley
780d42d0c6 MDL-46697 gradebook: Only count active users when needed (and only id)
The code only needs the id column to perform its count. On courses with a lot of users
fetching the whole user record for them all easily adds up to several hundred MB of
memory.
2014-08-06 16:02:08 +09:30
Gregory Faller
ce09177696 MDL-44015: EditPDF scrolls instead of drawing on iOS 2014-08-06 14:45:43 +09:30
Andrew Nicols
1fad754c58 MDL-44343 mod_glossary: Stop trying to pass deprecated unused variable for printing attachments 2014-08-06 12:04:36 +08:00
Marina Glancy
921390f103 MDL-46470 bootstrapbase: support linkedwhenselected attribute for tabs 2014-08-06 11:44:30 +08:00
Andrew Davis
23a62c47af MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported. 2014-08-06 10:58:59 +08:00
Mark Nelson
87f860cdd4 MDL-46565 gradereport_*: renamed report classes to match parent 2014-08-05 19:52:45 -07:00
Gregory Faller
e4ebf7ef0f MDL-46524: Auto-create groups from existing group or grouping membership 2014-08-06 10:50:14 +09:30
Petr Skoda
d9b60e315e MDL-46692 forum: fix defaultpreference_trackforums to not depend on forum settings
Existence of admin settings must not depend on other settings,
especially not from other plugins.

In any case somebody should cleaup the preference mess and allow
plugins to setup user preferences instead of hardcoding everything in
core.
2014-08-06 09:08:06 +12:00
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01:00
Dan Poltawski
f851224256 Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle 2014-08-05 19:14:15 +01:00
David Ligne
302b8abdd9 MDL-45932 enrol_imsenterprise: Implement Scheduled Task for IMS Enrolment plugin. 2014-08-05 13:41:09 -04:00
Syxton
fc6a0fe294 MDL-46646 course: regression in behat tests
Newly introduced unit tests are failing because the timestamps used are
too large.  Example timestamps were 11 characters long instead of 10.
2014-08-05 08:43:13 -04:00
Eloy Lafuente (stronk7)
5013c189e9 Merge branch 'm28_MDL-46625' of https://github.com/totara/moodle 2014-08-05 13:04:11 +02:00
Damyon Wiese
0ab3362218 Merge branch 'wip_MDL-39840_m28_addonenv' of https://github.com/skodak/moodle 2014-08-05 16:22:36 +08:00
Petr Skoda
40cba608a6 MDL-39840 environment: add support for environment.xml in plugins
New features:

* environment.xml files in all types of plugins
* support for plugin strings via new optional plugin attribute in FEEDBACK
* support for class_name::method_name custom callbacks and classloader
2014-08-05 20:18:18 +12:00
Damyon Wiese
650f14e555 Merge branch 'wip-MDL-41639-master' of git://github.com/marinaglancy/moodle 2014-08-05 15:52:50 +08:00
Damyon Wiese
fff702acfd Merge branch 'MDL-45897_my2' of https://github.com/andyjdavis/moodle 2014-08-05 12:06:36 +08:00
Brian Barnes
ecf02bf5b5 MDL-46315 themes: Fixed display inconsistancy with help modals 2014-08-05 13:11:26 +12:00