mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
68,418 Commits 36 Branches 519 Tags
Commit Graph

68418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Okely
9c94ca5843 MDL-45296 events: Fix objecttable and ids 
Various events had them incorrectly set or missing:
  - submission_locked
  - submission_unlocked
  - subscription_created
  - subscription_deleted
 2014-05-08 15:30:03 +02:00
Marina Glancy
585ff7eaec Merge branch 'MDL-45462-master' of git://github.com/FMCorz/moodle 2014-05-08 19:50:13 +08:00
sam marshall
4133822ea5 MDL-45478 Conditional availability: Custom user restriction missing 
There was an error in the JavaScript and custom user field
restrictions did not show correctly when editing the form.

Behat tests didn't cover custom user fields, so I added a
scenario.
 2014-05-08 11:57:57 +01:00
Eloy Lafuente (stronk7)
b8622d1632 Merge branch 'MDL-45443-master' of git://github.com/FMCorz/moodle 2014-05-08 12:52:54 +02:00
Eloy Lafuente (stronk7)
6280e88d69 Merge branch 'MDL-45444-master' of git://github.com/andrewnicols/moodle 2014-05-08 12:40:27 +02:00
Eloy Lafuente (stronk7)
a23a2ed19d Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	composer.json
 2014-05-08 12:00:33 +02:00
Rajesh Taneja
50a01e0fc5 MDL-44262 Behat: Bump behat version to get format fix 2014-05-08 17:46:50 +08:00
Frederic Massart
a36f8b36dd MDL-45443 theme_base: Missing closing bracket ruining the CSS 2014-05-08 17:37:37 +08:00
Eloy Lafuente (stronk7)
ab870c7e69 Merge branch 'wip-mdl-45461' of https://github.com/rajeshtaneja/moodle 2014-05-08 11:31:54 +02:00
Andrew Nicols
83e8f495f2 MDL-45472 AJAX: Whitelist prototype values form JS Error in exception dialogue 2014-05-08 16:44:11 +08:00
Marina Glancy
9a9b5257fa Merge branch 'MDL-45373-master' of git://github.com/jamiepratt/moodle 2014-05-08 15:41:20 +08:00
Frederic Massart
c5e8a036c5 MDL-45332 repository_url: URL parameter is using PARAM_URL 2014-05-08 15:35:03 +08:00
Andrew Nicols
079c3a9446 MDL-45444 editor_atto: Fix vertical alignment of editor buttons 2014-05-08 12:33:12 +08:00
Marina Glancy
317e98badd MDL-45414 wiki: blank image for page index icons 2014-05-08 12:12:50 +08:00
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