Eloy Lafuente (stronk7)
ec2ee188fc
Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle
2014-09-23 01:48:21 +02:00
Eloy Lafuente (stronk7)
4922a1d46a
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle
2014-09-23 01:40:50 +02:00
Eloy Lafuente (stronk7)
da483a72c8
Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle
2014-09-23 01:28:29 +02:00
Eloy Lafuente (stronk7)
44af6d53a7
Merge branch 'MDL-47266' of git://github.com/timhunt/moodle
2014-09-23 01:12:16 +02:00
Tim Hunt
358f31672b
MDL-37998 quiz settings: disableif rules should account for overrides.
...
Some form fields are disabled if only one attempt is allowed. However,
there may be an override allowing some students more attempts. We need
to account for that possiblity when setting up the disabled if rules.
Note the disabledIf is good for usability on this complex form, which is
why I don't just want to get rid of them.
2014-09-22 16:23:38 +01:00
Dan Poltawski
546acfbf67
Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle
2014-09-22 16:13:20 +01:00
Dan Poltawski
e79420eaf1
Merge branch 'MDL-47276' of git://github.com/timhunt/moodle
2014-09-22 16:08:19 +01:00
Dan Poltawski
490263ec68
Merge branch 'MDL-47270-core-component-classmap-ordering' of https://github.com/mpetrowi/moodle
2014-09-22 16:03:50 +01:00
Dan Poltawski
bd75ef826e
Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
2014-09-22 15:02:51 +01:00
Dan Poltawski
96ab0104ea
Merge branch 'MDL-40006' of git://github.com/timhunt/moodle
2014-09-22 11:55:47 +01:00
Dan Poltawski
aebe5eeea0
Merge branch 'MDL-10971_cloze_shuffle_fix' of git://github.com/timhunt/moodle
2014-09-22 11:39:42 +01:00
Dan Poltawski
4c5b60a72c
Merge branch 'MDL-46991-master' of https://github.com/sammarshallou/moodle
2014-09-22 10:57:20 +01:00
Nadav Kavalerchik
f2ee054b52
MDL-47269 yui/src/dock: Invert dock reset blocks icon, in RTL mode
2014-09-22 11:41:17 +03:00
Andrew Davis
005fa74115
MDL-47238 core_user: added an error message if guests access user profiles and they aren't allowed to
2014-09-22 11:02:54 +08:00
Tim Hunt
129a45687c
MDL-47276 quiz: change default for When time expires for new installs
2014-09-19 21:59:46 +01:00
Tim Hunt
0d4075d514
MDL-40006 searchableselector does not work in IE or Safari.
...
This fix is a horrible hack, but one I have used for years in tool_editrolesbycap
https://github.com/moodleou/moodle-tool_editrolesbycap/blob/master/yui/capabilityformfield/capabilityformfield.js
and it seems to be reliable.
As an added bonus, I removed the use of YUI2 here.
Also, I fixed the related button in quiz to be GET not POST.
2014-09-19 21:59:34 +01:00
markv
94999731ce
MDL-10971 question type multianswer: Respect quiz shuffle option
2014-09-19 11:39:22 +01:00
sam marshall
5176504d3f
MDL-46991 Availability: Conditional dates not updated on restore
2014-09-18 16:37:53 +01:00
Tim Hunt
a7b0bd1331
MDL-47266 quiz: fix restore log message.
2014-09-18 11:04:28 +01:00
Dan Poltawski
272fec367f
weekly release 2.8dev
2014-09-18 07:41:00 +01:00
Dan Poltawski
727a43391a
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2014-09-18 07:40:56 +01:00
Andrew Nicols
535364c8f5
MDL-46313 forum: Move discussiontoggle CSS to module
2014-09-18 10:42:55 +08:00
Matt Petro
be6f3c6e6b
MDL-47270 core_component: make cache independent of filesystem ordering
2014-09-16 12:50:53 -04:00
Eloy Lafuente (stronk7)
e1bb8035e6
Merge branch 'MDL-46613-master' of git://github.com/jleyva/moodle
2014-09-16 18:42:17 +02:00
Eloy Lafuente (stronk7)
d3921f07b8
Merge branch 'wip-MDL-47079-master' of git://github.com/marinaglancy/moodle
2014-09-16 17:57:19 +02:00
Juan Leyva
10f1cfc18c
MDL-46613 grades ws: Fixed external function declaration
...
Gradebook items with overridden grades was causing error as Web
Services response
2014-09-16 10:06:21 +02:00
Damyon Wiese
ac7fac558e
Merge branch 'MDL-47225-master' of git://github.com/andrewnicols/moodle
2014-09-16 15:15:57 +08:00
Damyon Wiese
ffd9e5d269
MDL-44257 Message: Update phpdocs for email_to_user function
2014-09-16 15:08:08 +08:00
Andrew Nicols
96671c8c38
MDL-47225 core: Tidy up component normalisation tests
2014-09-16 15:07:11 +08:00
Andrew Nicols
7ace328737
MDL-47225 core: Add ability to normalize component names
2014-09-16 15:06:46 +08:00
Damyon Wiese
c4006c851a
Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle
2014-09-16 14:58:48 +08:00
Jetha Chan
46629116cc
MDL-46523 navigation: add body class when roleswitched and not in initial install
2014-09-16 13:41:41 +08:00
Matt Staroste
8af594ac87
MDL-46313 mod_forum: Replace subscription status icons
2014-09-16 11:23:52 +08:00
Adrian Greeve
b3d5f7bc50
MDL-40356 lib: New setting to display full names.
...
This adds a new setting to display more name information for users
with the viewfullnames capability.
2014-09-16 11:01:42 +08:00
Adrian Greeve
795c5881ab
MDL-40356 lib: Unit tests for the alternativefullnameformat setting.
2014-09-16 10:57:28 +08:00
Simey Lameze
99c2ee6f9b
MDL-44257 lib: fix the attachment code to accept tempdir and dataroot.
...
Credit goes to Damyon, thanks.
2014-09-16 10:18:47 +08:00
Simey Lameze
9a2c52571e
MDL-44257 message: added test to make sure the stored file still exists
2014-09-16 10:07:17 +08:00
Marina Glancy
ea80c29a2c
MDL-47079 user: behat test for deleting users
2014-09-16 09:43:48 +08:00
Eloy Lafuente (stronk7)
26115c284e
Merge branch 'MDL-46588-master' of git://github.com/jleyva/moodle
2014-09-16 00:23:09 +02:00
Dan Poltawski
5ce0af436d
Merge branch 'MDL-46195' of git://github.com/timhunt/moodle
2014-09-15 16:07:05 +01:00
Dan Poltawski
0908fb4221
Merge branch 'wip-MDL-46585-master' of git://github.com/marinaglancy/moodle
2014-09-15 13:00:24 +01:00
Dan Poltawski
d1c9b792b0
Merge branch 'MDL-46331' of git://github.com/timhunt/moodle
2014-09-15 11:55:16 +01:00
Dan Poltawski
6576ab01b6
Merge branch 'MDL-46810' of git://github.com/timhunt/moodle
2014-09-15 11:25:27 +01:00
Dan Poltawski
ffd24d9a61
Merge branch 'wip-MDL-47187-master' of git://github.com/marinaglancy/moodle
2014-09-15 11:08:24 +01:00
Dan Poltawski
91596eeacc
Merge branch 'MDL-47206-master' of git://github.com/andrewnicols/moodle
2014-09-15 11:02:48 +01:00
Damyon Wiese
dff9a97350
MDL-44447 Grade: Re-order lang strings
2014-09-15 17:02:43 +08:00
Damyon Wiese
952f37486d
MDL-44447 Grade: Whitespace fix
2014-09-15 16:49:23 +08:00
Damyon Wiese
20a2e554f9
Merge branch 'MDL-44447-master' of git://github.com/lameze/moodle
2014-09-15 16:44:41 +08:00
Simey Lameze
be289f57b2
MDL-44447 grade_export: Added multiple grade display types to grade export.
2014-09-15 16:42:07 +08:00
Damyon Wiese
5fe74c1bcf
Merge branch 'MDL-47127-master' of git://github.com/ankitagarwal/moodle
2014-09-15 16:41:28 +08:00