Commit graph

67299 commits

Author SHA1 Message Date
Gregory Faller
f707b67259 MDL-46718: Return user to last accessed page when quick grading 2014-08-08 14:48:13 +09:30
Dan Marsden
c15f312ff0 MDL-46737 SCORM: correct dml syntax. 2014-08-08 15:10:58 +12:00
Petr Skoda
8f73f2a160 MDL-46480 fix get_htmlelement_size() to deal with hidden or non-block elements 2014-08-08 10:29:17 +12:00
Tim Hunt
822ba7d3d8 MDL-46681 qtype_multichoice: disabled unused options
For questions set to 'One answer only', the 'Clear incorrect responses'
and 'Show the number of correct responses' hint options make not sense,
and are not used. Hence we disableIf them.
2014-08-07 14:23:13 +01:00
Marina Glancy
c1b4e91098 weekly release 2.6.4+ 2014-08-07 13:15:01 +08:00
Marina Glancy
8e349b6d67 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-08-07 13:15:00 +08:00
Paul Holden
9d4a316732 MDL-21042 report_security: don't display warning for riskbackup unnecessarily 2014-08-06 19:54:28 -07:00
Andrew Davis
b6e158c52f MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported. 2014-08-07 09:16:58 +08:00
Shane Elliott
8dd43942d3 MDL-46676 profilefield_datetime: Use moodle time API 2014-08-06 16:36:43 +08:00
Gregory Faller
0eddbe018e MDL-44015: EditPDF scrolls instead of drawing on iOS 2014-08-06 15:28:41 +09:30
Brian Barnes
bdfa413c98 MDL-46643 calendar: improved tab order of calendar detail pages 2014-08-06 15:56:07 +12:00
Marina Glancy
faf858b6d4 MDL-46470 bootstrapbase: support linkedwhenselected attribute for tabs 2014-08-06 11:48:12 +08:00
Brian Barnes
ee483e0520 MDL-46625 theme: Added a way to target the current page 2014-08-05 13:05:29 +02:00
Brian Barnes
73ae7da37b MDL-46315 themes: Fixed display inconsistancy with help modals 2014-08-05 13:04:09 +12:00
Eloy Lafuente (stronk7)
4bdc10db61 Merge branch 'MDL-44149-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-08-04 17:11:55 +02:00
Damyon Wiese
5d839b02c2 MDL-44149 Assign: Reopen attempts from quick grading (reopenuntilpass)
Conflicts:
	mod/assign/locallib.php
2014-08-04 15:56:18 +08:00
Marina Glancy
3000cb1ee2 Merge branch 'MDL-44794-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-08-04 14:25:16 +08:00
Simey Lameze
8be9386bdc MDL-44794 group: unit test for get_groups method. 2014-08-04 12:07:24 +08:00
Simey Lameze
4325b460cc MDL-44794 group: unit test for groups_get_user_groups method. 2014-08-04 12:07:01 +08:00
Marina Glancy
216da8ebb0 Merge branch 'MDL-46457_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE 2014-08-04 11:25:10 +08:00
Eloy Lafuente (stronk7)
71591d7822 Merge branch 'MDL-46620-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-08-03 20:01:51 +02:00
AMOS bot
a7f445318d Automatically generated installer lang files 2014-08-01 00:05:41 +08:00
Dan Poltawski
753493ae11 weekly release 2.6.4+ 2014-07-31 09:37:18 +01:00
Dan Poltawski
f73bb3a21a Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-07-31 09:37:14 +01:00
Eric Merrill
e89b812518 MDL-46620 messages Make sure full message is used for read marking
message_mark_message_read needs to have the full message object,
otherwise data will be lost.
2014-07-30 15:58:08 -04:00
Dan Poltawski
4fe1c7647c Merge branch 'MDL-46236_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE 2014-07-29 12:04:34 +01:00
AMOS bot
3c1814cac7 Automatically generated installer lang files 2014-07-29 16:02:25 +08:00
Dan Poltawski
765ba4ce1e Merge branch 'wip-MDL-46338-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-29 08:50:40 +01:00
Marina Glancy
2d1ac616e8 Merge branch 'm26_MDL-46325' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-07-29 11:59:29 +08:00
Sam Hemelryk
23bf420120 Merge branch 'MDL-43908-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE 2014-07-29 15:51:03 +12:00
Sam Hemelryk
5175bb487e Merge branch 'MDL-45041_26_STABLE' of git://github.com/jleyva/moodle into MOODLE_26_STABLE 2014-07-29 15:47:18 +12:00
Marina Glancy
198c28cda2 MDL-46338 enrol_self: Icon should indicate enrolment availability 2014-07-29 09:52:34 +08:00
Adam Olley
2b413491e3 MDL-46457 mod_lti: Render lti description through standard format_module_intro 2014-07-29 10:40:52 +09:30
Sam Hemelryk
98311522ed Merge branch 'MDL-45044-m26-master' of https://github.com/dthies/moodle into MOODLE_26_STABLE 2014-07-29 08:46:55 +12:00
Dan Poltawski
0a346972f3 Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE 2014-07-28 12:54:19 +01:00
Dan Poltawski
54021dcedb Merge branch 'wip-MDL-46503-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-28 12:49:17 +01:00
Dan Poltawski
abeb9d6544 Merge branch 'm26_MDL-45715' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-07-28 12:47:35 +01:00
Dan Poltawski
2c28f42bae Merge branch 'MDL-46433-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-07-28 11:49:40 +01:00
Dan Poltawski
f5b49d8004 Merge branch 'MDL-46504_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-07-28 10:56:50 +01:00
Nobelium
c02b2fc931 MDL-46236 mod_scorm : Setting lauch options for scorm in popup 2014-07-28 06:35:33 +00:00
Sam Hemelryk
3390644156 Merge branch 'MDL-43390_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-07-28 12:22:45 +12:00
Sam Hemelryk
fcb1e8a9c2 Merge branch 'wip-MDL-46525-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-28 12:13:48 +12:00
Sam Hemelryk
cedd791b19 Merge branch 'MDL-46506-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-07-28 08:46:07 +12:00
Tony Butler
072e93e26e MDL-43908 mod_assign: Order submissions by course id then cm id
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-25 10:28:47 +01:00
Tony Butler
f249f9f41a MDL-43908 mod_assign: Remove redundant code and improve SQL query
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-25 10:28:47 +01:00
Tony Butler
d53cc3da71 MDL-43908 mod_assign: Prevent notifications for unavailable assignments
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>

Conflicts:
	mod/assign/locallib.php
2014-07-25 09:54:49 +01:00
Tony Butler
1d3c72cafd MDL-43908 mod_assign: Defer notifications for unavailable assignments
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-25 09:54:49 +01:00
Juan Leyva
4f3ed071d4 MDL-45041 Web Service: add_user_device doesn't store entries for different users using the same push key 2014-07-25 10:42:27 +02:00
Marina Glancy
9de849779c MDL-46525 enrol_cohort: fix JS error 2014-07-25 14:45:53 +08:00
Brian Barnes
67c5420a1f MDL-46325 behat: Fixed issue where 'teacher1' didn't exist 2014-07-25 14:37:27 +12:00