Commit graph

68958 commits

Author SHA1 Message Date
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
Mark Nelson
82d0e3749d MDL-45650 events: ensure correct objectid passed when triggering user_profile_viewed event 2014-05-21 00:25:17 -07:00
Marina Glancy
65ae0a1bde MDL-45469 profile: make sure profile fields can be initialised without arguments 2014-05-21 11:40:43 +08:00
Dan Poltawski
627a4619f5 Merge branch 'wip-MDL-45371-master' of git://github.com/marinaglancy/moodle 2014-05-21 10:03:05 +08:00
Sam Chaffee
435c709c84 MDL-45645 mod_lti Add custom LTI request parameter ext_user_username 2014-05-20 15:34:21 -06:00
Marina Glancy
f06daff29d MDL-45320 behat: change to block selector 2014-05-20 20:43:37 +08:00
Marina Glancy
deeaed4332 MDL-45320 block_html: behat tests 2014-05-20 20:43:37 +08:00
Marina Glancy
3ee51425c7 MDL-45320 behat: Step definitions for blocks 2014-05-20 20:43:36 +08:00
David Monllao
28c86221ac MDL-45294 behat: Updating block references to aria label value
Also improving moodle selectors xpath expressions
readability.
2014-05-20 20:43:36 +08:00
David Monllao
02a61c6461 MDL-45294 behat: Supporting an aria-label as a block ref 2014-05-20 20:43:36 +08:00
Dan Poltawski
be38640dfa Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle 2014-05-20 20:32:14 +08:00
Sam Hemelryk
487e68b432 MDL-44711 block_navigation: fixed typo in behat tests 2014-05-20 23:39:29 +12:00
Damyon Wiese
84f08cfa9d MDL-45606 Unit test fix for MySQL and added a comment about the removed code. 2014-05-20 18:01:32 +08:00
Dan Poltawski
2eb4176242 Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle 2014-05-20 15:54:25 +08:00
Frederic Massart
a71ece3757 MDL-45563 message: Inverting IDs in description of event message_viewed 2014-05-20 15:51:07 +08:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Mark Nelson
9d4b3d42fc MDL-45629 mod_assign: removed use of '$this->objectid' in the submission_status_viewed event 2014-05-19 23:51:09 -07:00
Marina Glancy
78ee646dd9 Merge branch 'MDL-45525-27' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-05-20 14:28:36 +08:00
Marina Glancy
143eef0e37 Merge branch 'MDL-45536-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-05-20 14:25:10 +08:00
Marina Glancy
fdece45b06 Merge branch 'wip-MDL-45512-master' of git://github.com/abgreeve/moodle 2014-05-20 14:21:56 +08:00
Marina Glancy
4cc89d51eb Merge branch 'MDL-43669-m' of git://github.com/micaherne/moodle 2014-05-20 14:12:38 +08:00