18913 Commits

Author SHA1 Message Date
Marina Glancy
6bb1f0bf4c MDL-46540 stats: missing include file
Thanks to Vadim Dvorovenko for finding a bug and providing a solution
2014-09-18 03:40:54 +08:00
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
70c16c5336 Merge branch 'MDL-45642' of git://github.com/timhunt/moodle 2014-08-12 11:34:05 +01: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
7c27c681b1 Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle 2014-08-12 15:01:10 +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
Dan Poltawski
c068b0814b Merge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle 2014-08-11 14:38:33 +01:00
Dan Poltawski
c5186b2251 Merge branch 'MDL-46688' of git://github.com/timhunt/moodle 2014-08-11 14:13:12 +01:00
Dan Poltawski
463d281377 Merge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle 2014-08-11 11:24:19 +01: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
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
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
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
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
Petr Skoda
c6b5f18d06 MDL-46561 session: use full session validation in \core\session\manager::session_exists() 2014-08-07 08:59:24 +12:00
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01: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
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
Andrew Davis
7623260459 MDL-45897 blocks: added 3 new default blocks to /my 2014-08-05 08:44:21 +08:00
Damyon Wiese
ad5ab383e6 MDL-46548 behat: Prevent force file save as for some pages we want to test with behat. 2014-08-04 16:18:32 +08:00
Marina Glancy
da45b022f2 Merge branch 'MDL-32917-master' of git://github.com/andrewnicols/moodle 2014-08-04 15:13:30 +08:00
Marina Glancy
91a4788b17 Merge branch 'MDL-44794-master' of git://github.com/lameze/moodle 2014-08-04 14:24:04 +08:00
Marina Glancy
942aa06e91 Merge branch 'MDL-43506-master' of git://github.com/andrewnicols/moodle 2014-08-04 14:23:38 +08:00
Simey Lameze
a0372a4019 MDL-44794 group: unit test for groups_get_user_groups method. 2014-08-04 11:59:06 +08:00
Simey Lameze
93d10d162c MDL-44794 group: unit test for get_groups method. 2014-08-04 11:59:06 +08:00
Andrew Nicols
cbed1284f4 MDL-43506 Blocks: Remove various deprecated functions 2014-08-04 08:44:50 +08:00
Eloy Lafuente (stronk7)
1ad873c32f Merge branch 'MDL-46620-master' of https://github.com/merrill-oakland/moodle 2014-08-03 19:57:22 +02:00
Brian Barnes
1c77e2aafa MDL-46625 theme: Added a way to target the current page 2014-07-31 13:27:14 +12:00
Eric Merrill
3388a4f59e MDL-46620 messages Make sure full message is used for read marking
message_mark_message_read needs to have the full message object,
otherwise data will be lost.
2014-07-30 15:56:52 -04:00
Dan Poltawski
c44012e09e Revert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle"
This reverts commit 14a3ccc96da2c23fd5c34167d02e1323fb01d113, reversing
changes made to 4709708d4889e12f0f4a621ceaacb80c4cde6c51.
2014-07-30 09:00:58 +01:00
Marina Glancy
de9c82953f Revert "Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle"
This reverts commit 68373c7821f48b13bf4bffa5e1160fd5d0b3b3d2, reversing
changes made to 62d61619e80523e13b6f570fd9e130659c0a0d2e.
2014-07-30 15:28:55 +08:00
Damyon Wiese
016bbe2c2c MDL-44116 Atto: Improve new accessibility sniffs.
Check for empty text it row, column headers and captions on tables.
Link to "Entire document" text instead of repeating the entire document if the text is long and has no headings.
2014-07-30 12:06:20 +08:00
Sam Hemelryk
efe3aefaf2 Merge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle 2014-07-29 16:15:24 +12:00
Sam Hemelryk
6239a2358f Merge branch 'MDL-45041' of git://github.com/jleyva/moodle 2014-07-29 15:47:13 +12:00
Sam Hemelryk
fe5bf6ee81 Merge branch 'MDL-46460' of git://github.com/jleyva/moodle 2014-07-29 15:44:31 +12:00
Sam Hemelryk
4a928b9dfc Merge branch 'MDL-44116-master' of git://github.com/damyon/moodle 2014-07-29 09:37:44 +12:00
Dan Poltawski
70acf8388b Merge branch 'MDL-46206-master' of git://github.com/jethac/moodle 2014-07-28 17:25:04 +01:00
Dan Poltawski
5a8f38d712 Merge branch 'wip-MDL-46503-master' of git://github.com/marinaglancy/moodle 2014-07-28 12:49:13 +01:00
Dan Poltawski
14a3ccc96d Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle 2014-07-28 12:01:24 +01:00
Dan Poltawski
4709708d48 Merge branch 'MDL-46459' of git://github.com/jleyva/moodle 2014-07-28 11:59:02 +01:00
Dan Poltawski
aba225fd3a Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle 2014-07-28 10:45:17 +01:00
Marina Glancy
68373c7821 Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle 2014-07-28 16:00:48 +08:00
Jetha Chan
a9e05f49db MDL-46523 navigation: add body class when logged in as other role 2014-07-28 15:47:46 +08:00