Marina Glancy
b76ae3b0ce
Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle
2014-05-08 12:05:20 +08:00
Marina Glancy
f69c0d572e
Merge branch 'MDL-45398-master' of git://github.com/sammarshallou/moodle
2014-05-08 12:04:53 +08:00
Frederic Massart
6f6345e327
MDL-45462 flickr: Requests are now done over HTTPS
2014-05-08 11:27:36 +08:00
Dan Poltawski
d1a316373f
Merge branch 'MDL-45425-master' of git://github.com/andrewnicols/moodle
2014-05-08 11:05:20 +08:00
Dan Poltawski
327c382c47
MDL-43312 tinymce: bump plugin version
2014-05-08 10:52:36 +08:00
Dan Poltawski
dac2e286da
Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle
2014-05-08 10:51:51 +08:00
Rajesh Taneja
8ad79f5c2e
MDL-45461 behat: Added custom hack notice for chrome+safari+ie
2014-05-08 10:10:28 +08:00
Eloy Lafuente (stronk7)
9c1bbddce7
Merge branch '45457-27' of git://github.com/samhemelryk/moodle
2014-05-07 23:54:36 +02:00
Sam Hemelryk
1c17e19a5c
MDL-45457 phpdoc: fixed up a couple of @package typos
2014-05-08 08:14:10 +12:00
Mark Nielsen
e686494fbc
MDL-44630: Fixing PHP foreach warnings
2014-05-07 12:39:47 -07:00
Eloy Lafuente (stronk7)
1cf1ef9fe6
Merge branch 'MDL-45449-master' of https://github.com/sammarshallou/moodle
2014-05-07 19:58:52 +02:00
sam marshall
c545f3b0db
MDL-45449 Availabillity settings - new visible/hidden control (eye icon) is hard to spot
...
This change makes it use a larger icon.
2014-05-07 16:35:23 +01:00
Eloy Lafuente (stronk7)
83b25b12ff
Merge branch '45231-27-3' of git://github.com/samhemelryk/moodle
2014-05-07 15:50:15 +02:00
Tony Butler
b887c262bc
MDL-45432 mod_assign Declare character encoding in onlinetext export
...
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-05-07 13:07:04 +01:00
Dan Poltawski
917ceadbd7
Merge branch 'wip-MDL-45319-master' of git://github.com/marinaglancy/moodle
2014-05-07 17:51:31 +08:00
Frederic Massart
ba4e81d249
MDL-45447 editor_atto: Highlight collapse and html icons when toggled
2014-05-07 17:44:06 +08:00
sam marshall
59d585d135
MDL-45398 Manage availability restrictions: Show/hide not working
...
The show/hide icons were not working correctly. In addition, the
report still displayed even when availability feature was turned
off.
As well as fixing them, I added a Behat test to cover this report.
2014-05-07 10:15:27 +01:00
Marina Glancy
2cba18ee43
Merge branch 'MDL-45282_message' of git://github.com/andyjdavis/moodle
2014-05-07 16:52:11 +08:00
Dan Poltawski
fb3f578f41
Merge branch 'MDL-45410-en_fix' of git://github.com/mudrd8mz/moodle
2014-05-07 16:38:00 +08:00
Mark Nelson
425e761712
MDL-45319 events: added debugging messages for missing relateduserid value
2014-05-07 16:28:59 +08:00
Mark Nelson
f1e0f66ca8
MDL-45319 events: set the relateduserid when triggering the user_created/updated/deleted events
2014-05-07 16:28:59 +08:00
Mark Nelson
e687396a1e
MDL-45319 events: trivial changes
2014-05-07 16:28:59 +08:00
Marina Glancy
eaea796e70
MDL-45126 do not allow guests see name and summary of hidden course
2014-05-07 16:22:20 +08:00
Juan Leyva
679e323aaa
MDL-43119 Add valid until dates for tokens created by login/token.php
...
3 months were decided
2014-05-07 16:16:40 +08:00
Andrew Davis
f624f56999
MDL-45282 core_user: fixed up some oddities in the bulk user messaging screen
2014-05-07 15:34:29 +08:00
Andrew Nicols
ee37639542
MDL-45425 editor_atto: Check for change selections asynchronously
2014-05-07 14:30:28 +08:00
Frederic Massart
b04bf988ef
MDL-43877 blocks: Files from blocks in my/ were accessible to the world
2014-05-07 14:27:11 +08:00
Dan Poltawski
5140fac5da
Merge branch 'MDL-44606-master' of http://github.com/damyon/moodle
2014-05-07 14:18:13 +08:00
Dan Poltawski
b6cb3a4324
Merge branch 'wip-MDL-45421-master' of git://github.com/abgreeve/moodle
2014-05-07 14:16:20 +08:00
Adam Olley
c3af87ac64
MDL-23566 mod_lesson: Float answers so paragraphs line up correctly next to the inputs
2014-05-07 15:44:36 +09:30
Damyon Wiese
0cd720fe51
MDL-44606 assign: disable sesskey protection for unit test.
2014-05-07 14:06:08 +08:00
Damyon Wiese
85e8f68108
Merge branch 'MDL-45290-master-fix' of https://github.com/jethac/moodle
2014-05-07 13:28:20 +08:00
Marina Glancy
97436e311c
Merge branch 'MDL-45387-master' of git://github.com/jethac/moodle
2014-05-07 13:06:30 +08:00
Marina Glancy
90ce5afd81
Merge branch 'MDL-45201-master' of git://github.com/ankitagarwal/moodle
2014-05-07 13:06:17 +08:00
Damyon Wiese
6363588b72
MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks.
...
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
2014-05-07 12:54:43 +08:00
Damyon Wiese
46b56588ae
MDL-44606 Assign: Some grading functions are missing sesskey protection
2014-05-07 12:36:38 +08:00
Adrian Greeve
4b8f05adc6
MDL-45421 report_eventlist: Changed sorting of event name column to sort by event name.
...
It was sorting by the full event path previous to this.
2014-05-07 12:30:36 +08:00
Dan Poltawski
fa00be94b1
Merge branch 'wip-MDL-45414-master' of git://github.com/marinaglancy/moodle
2014-05-07 12:05:17 +08:00
Dan Poltawski
4d693c3839
Merge branch 'wip-MDL-45429-master' of git://github.com/marinaglancy/moodle
2014-05-07 11:50:09 +08:00
Eric Merrill
391101008a
MDL-45439 reports Don't send contextlevel to legacy logging.
...
It doesn't support the column.
2014-05-07 11:10:19 +08:00
Jetha Chan
c9b94fb0d4
MDL-45387 core_form: erroneous escaping on reference list
...
Fixed erroneous escaping in JS.
2014-05-07 10:52:51 +08:00
Helen Foster
f15fa7a281
MDL-45410 Merge English strings from the en_fix language pack
2014-05-07 00:16:51 +02:00
Sam Hemelryk
cfd97e02f7
MDL-45231 theme_clean: navbar is absolute when running behat in IE
2014-05-07 09:42:07 +12:00
Mark Nielsen
4bcde92185
MDL-44630: Fix CC backup of quizzes
...
The common cartridge backup was skipping
quizzes because the <questions> element
is no longer in the Moodle backup file.
Instead, now reading from the list of
<question_instances> list.
2014-05-06 14:00:13 -07:00
Eloy Lafuente (stronk7)
f8fa440649
on-demand release 2.7rc1+
2014-05-06 15:57:48 +02:00
Marina Glancy
88c0e2f374
MDL-45357 events: unittest correction, event description change
2014-05-06 17:13:37 +08:00
Jetha Chan
cecd602d8b
MDL-45290 rubrics: overflow, delete button alignment
...
Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
2014-05-06 16:47:20 +08:00
Andrew Nicols
02915dfc23
MDL-45357 events: Remove unnecessary the before 'id' in event descriptions
2014-05-06 16:45:05 +08:00
Andrew Nicols
4d87e5c109
MDL-45357 events: Normalise event description names
2014-05-06 16:44:04 +08:00
Andrew Nicols
f32629c7ea
MDL-45357 events: Improve clarity of allow role change descriptions
2014-05-06 16:43:56 +08:00
