68527 Commits

Author SHA1 Message Date
Dan Poltawski
6ca4f19a9f Merge branch 'MDL-45682-master' of git://github.com/andrewnicols/moodle 2014-05-26 11:23:59 +01:00
Rajesh Taneja
6b8e46ad04 MDL-45565 core_message: Reset internal users in phpunit 2014-05-26 15:42:12 +08:00
Marina Glancy
87c1a30b1f Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle 2014-05-26 14:40:56 +08:00
Marina Glancy
8a564deb07 Merge branch 'MDL-44482-master' of git://github.com/jethac/moodle 2014-05-26 14:40:48 +08:00
Jetha Chan
101ec5fd3b MDL-44482 mod_lti: use localized dates
Fixed an issue where LTI external tools had creation datestamps of NaN/NaN/NaN under particular non-English languages.
2014-05-26 14:03:02 +08:00
Simey Lameze
b0ad512f95 MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php. 2014-05-26 12:51:40 +08:00
Damyon Wiese
ea1cd97ec7 Merge branch 'wip-MDL-45688-master' of git://github.com/marinaglancy/moodle 2014-05-26 12:46:29 +08:00
Damyon Wiese
4e2bf2381f MDL-45661 Assign: Clean bad data from DB after MDL-42526 2014-05-26 12:36:21 +08:00
Damyon Wiese
2562653a27 Merge branch '45499-28' of git://github.com/samhemelryk/moodle 2014-05-26 12:04:42 +08:00
Andrew Nicols
362659725b MDL-45682 editor_atto: Ensure that the current editor is active when saving selections 2014-05-26 12:02:02 +08:00
Marina Glancy
9e41209bba Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle 2014-05-26 11:58:50 +08:00
Marina Glancy
0251be5bcc Merge branch 'MDL-44014-master' of git://github.com/andrewnicols/moodle 2014-05-26 11:58:43 +08:00
Ankit Agarwal
963402c2ba MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree 2014-05-26 10:40:10 +08:00
Mark Nelson
476999c722 MDL-45675 mod_data: initialise options as an empty array to avoid error when there are none 2014-05-25 19:28:07 -07:00
Sam Hemelryk
c2182d24a4 Merge branch 'MDL-45650_master' of https://github.com/markn86/moodle 2014-05-26 13:59:08 +12:00
Sam Hemelryk
1912b5aa92 Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle 2014-05-26 13:23:02 +12:00
Sam Hemelryk
36c95fe075 Merge branch 'MDL-45660' of git://github.com/timhunt/moodle 2014-05-26 11:52:32 +12:00
Sam Hemelryk
837ab70b85 Merge branch 'MDL-45686' of git://github.com/jmvedrine/moodle 2014-05-26 10:55:11 +12:00
Sam Hemelryk
3b31276bc8 Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle 2014-05-26 10:36:11 +12:00
Sam Hemelryk
bba9c3bcf8 Merge branch 'master_MDL-45623' of git://github.com/totara/moodle 2014-05-26 09:58:48 +12:00
Sam Hemelryk
bde2e4c599 Merge branch 'MDL-45607_master' of https://github.com/markn86/moodle 2014-05-26 09:53:41 +12:00
Sam Hemelryk
c5eef789b9 Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle 2014-05-26 09:02:39 +12:00
Sam Hemelryk
b8b47a15da MDL-45499 admin: fixed error when displaying page settings 2014-05-26 09:01:16 +12:00
Sam Hemelryk
953eb35c84 Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle 2014-05-26 08:58:03 +12:00
Jean-Michel Vedrine
8974442b72 MDL-45686 qtype_multichoice get_num_selected_choices return wrong result 2014-05-25 09:11:33 +02:00
Marina Glancy
3e6adca945 MDL-45688 added missing library requirement 2014-05-24 18:33:00 +08:00
Rajesh Taneja
66d212fef0 MDL-45565 core_message: Added unit tests. 2014-05-23 16:46:58 +08:00
Andrew Nicols
0d1d542332 MDL-45635 javascript: Make core dialogue translatable 2014-05-23 16:01:48 +08:00
Mark Nelson
f5928e7893 MDL-45677 mod_assign: removed treatment of an array as an object 2014-05-22 22:16:57 -07:00
Mark Nelson
1f386b13c7 MDL-45676 mod_data: added missing additional name fields 2014-05-22 21:59:52 -07:00
Rajesh Taneja
25bd63b713 MDL-45565 core_message: Fixed strangers array
Strangers get mixed with noreply user and support user,
if  noreply/support users real user.
To avoid duplication use userid as array index. Also,
avoid fetching data again for noreply and support users,
if they are real users, then data is already feteched.
2014-05-23 11:56:38 +08:00
AMOS bot
363f258e8d Automatically generated installer lang files 2014-05-23 00:52:40 +00:00
Tim Hunt
8b431dca97 MDL-45660 question statistics: make comparison more robust. 2014-05-22 17:30:34 +01:00
Eloy Lafuente (stronk7)
3e511ca50b weekly on-sync release 2.8dev 2014-05-22 17:03:23 +02:00
Eloy Lafuente (stronk7)
9ba9ea30a2 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-22 17:03:19 +02:00
Mark Nielsen
041d22ea09 MDL-44014 Navigation: Set the correct context when retrieved via AJAX 2014-05-22 15:04:33 +08:00
James Pratt
fdb6811224 MDL-42526 mod_assignment : fix record insert with assigment.id 0 2014-05-22 12:10:07 +07:00
Marina Glancy
4b7af5040d Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle 2014-05-22 12:59:56 +08:00
Andrew Nicols
b791ee3d89 MDL-34737 Course: Modchooser should use coursebase to determine the section class 2014-05-22 12:30:32 +08:00
Andrew Nicols
39de876c04 MDL-45625 mod_forum: Deprecate many old forum functions
This also moves these to their own file to help manage the deprecation process.
2014-05-22 12:23:49 +08:00
Andrew Nicols
2c549f7802 MDL-45239 editor_atto: On Android do not restore focus in the callbackWrapper
It seems that Android automatically focuses the cursor in the last position
when the content editable region is programatically re-focused.

Whilst this does not cause an issue on it's own, when combined with the
behaviour of the dictionary auto-completion to restore focus on the start
of the word when a word has not yet been finished, this was causing us to
change focus when pressing buttons.
2014-05-22 12:19:43 +08:00
Andrew Nicols
ae14a50114 MDL-45536 atto_html: Update the textarea size when switching to HTML view 2014-05-22 11:20:35 +08:00
Mark Nelson
81512b9856 MDL-45658 events: included enrolment method in the user_enrolment_deleted/updated event descriptions 2014-05-21 20:00:48 -07:00
AMOS bot
bdc5ab9dc1 Automatically generated installer lang files 2014-05-22 01:07:56 +00:00
Mark Nielsen
e9033d11e1 MDL-44902: Update admin settings support for ltisource plugins 2014-05-21 11:10:08 -07:00
Mark Nielsen
d3496e3ff6 MDL-44902: Remove custom LTI hook API 2014-05-21 11:05:45 -07:00
Mark Nielsen
b28b8953d5 MDL-44902: Removing LTI submission.js
This was used in grade.php which has
been deprecated.
2014-05-21 11:03:43 -07:00
Mark Nielsen
26ad0f1e0d MDL-44902: Removing LTI styles for submission.php
This file no longer exists.
2014-05-21 11:02:55 -07:00
Rod Norfor
75b70ab6cd MDL-45654 cron: fix non-empty directories deletion
Remove errors when attempting to delete non-empty directories when
child directories do not get removed since the mtime was updated when
files were removed from the child directory.
2014-05-21 17:15:30 +01:00
Sam Hemelryk
37d39fe348 MDL-44711 course: fixed navigation expansion in course tests 2014-05-21 20:58:16 +12:00