moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67179 commits 37 branches 540 tags 1.3 GiB
Commit graph

67179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ruslan Kabalin
61560c2b72 MDL-46833 mod_assign: Fix assignment view when available for group members only. 
When assignment is "Available for group members only" and no users with
mod/assign:submit role permision is enrolled (students),
groups_filter_users_by_course_module_visible is causing error (as $users
array is empty). The patch resolves the issue.
 2014-08-14 17:11:25 +01:00
Marina Glancy
e95c5eed2c weekly release 2.6.4+ 2014-08-14 14:52:19 +08:00
Marina Glancy
aec0fcdb6e Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-08-14 14:52:15 +08:00
AMOS bot
e11cf87496 Automatically generated installer lang files 2014-08-14 00:05:49 +08:00
Marina Glancy
81c65c089a Revert "Merge branch 'm26_MDL-46643' of git://github.com/totara/moodle into MOODLE_26_STABLE" 
This reverts commit c750f3de63, reversing
changes made to af8ef3b1da.
 2014-08-13 16:32:47 +08:00
Eloy Lafuente (stronk7)
934a342fef Merge branch 'wip-MDL-46470-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-08-13 00:26:27 +02:00
Tim Hunt
b483b31dab MDL-45642 questions: add required index to question_attempts. 
It is important to be able to tell which behaviours are in use, and
without this index, it requires a complete scan of this table, which can
be very big, to verify that a behaviour is unused.
 2014-08-12 11:37:50 +01:00
Dan Poltawski
82b7d129d7 Merge branch 'MDL-43824-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-12 11:08:13 +01:00
Dan Poltawski
a672c8337f Merge branch 'm26_MDL-46718' of https://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE 2014-08-12 11:02:20 +01:00
Marina Glancy
63edba375c Merge branch 'MDL-46308_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-08-12 16:03:07 +08:00
Marina Glancy
530da41f30 Merge branch 'MDL-21042_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE 2014-08-12 16:02:29 +08:00
Marina Glancy
0a94ca9765 Merge branch 'm26_MDL-46315' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-08-12 15:03:00 +08:00
Marina Glancy
a17f12e801 Merge branch 'MDL-46600_import_failed_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-08-12 15:02:51 +08:00
Marina Glancy
0faeeeea27 Merge branch 'wip_MDL-46480_m26_footernan' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-08-12 15:02:36 +08:00
Marina Glancy
c750f3de63 Merge branch 'm26_MDL-46643' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-08-12 13:32:03 +08:00
Marina Glancy
af8ef3b1da Merge branch 'MDL-43740_manual_none_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-08-12 13:29:43 +08:00
Eloy Lafuente (stronk7)
cb51189dce Merge branch 'MDL-46676_2.6' of https://github.com/ikawhero/moodle into MOODLE_26_STABLE 2014-08-12 01:48:26 +02:00
Eloy Lafuente (stronk7)
f9a93a6aab Merge branch 'MDL-46681_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-08-12 01:44:29 +02:00
Mary Evans
2b6526e717 MDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale grades. 2014-08-12 00:06:08 +01:00
Dan Poltawski
86a42029e3 Merge branch 'MDL-46496-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-08-11 14:38:47 +01:00
Dan Poltawski
278c04a414 Merge branch 'm26_MDL-44015' of https://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE 2014-08-11 14:31:06 +01:00
Dan Poltawski
db6c4fc975 Merge branch 'MDL-46688_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-08-11 14:13:17 +01:00
Andrew Davis
23f1bddc01 MDL-43740 core_grade: Thanks to Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None" 2014-08-11 20:20:36 +08:00
Dan Poltawski
7051114f00 Merge branch 'wip-MDL-30668-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-08-11 10:41:44 +01:00
Damyon Wiese
ceea52abf6 MDL-35984 Grades: Fix deprecation of grade_category::aggregate_values 2014-08-11 14:24:37 +08:00
Damyon Wiese
1285dadea3 MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved. 2014-08-11 14:24:22 +08:00
Damyon Wiese
e26695f647 MDL-35984 grade: Add behat tests for grade aggregations 2014-08-11 14:23:59 +08:00
Tim Hunt
25c302c393 MDL-46308 qformat_xml: fix import of broken calculated questions. 
Questions like this should not exist, of course. But they do, so we
should avoid generating errors in this case.
 2014-08-08 17:59:21 +01:00
Tim Hunt
b7dda99c5e MDL-46688 weblib: improve the highlight function. 
Thanks to Joseph Baxter for suggesting some of the test cases.
 2014-08-08 17:53:08 +01:00
Marina Glancy
8238f53d71 MDL-30668 gradereport_grader: split user preferences into individual courses 
This solves the DB exception when users were trying to insert very large string in DB
 2014-08-08 15:17:50 +08:00
Andrew Nicols
b6c2f9333c MDL-46496 JS: Replace jQuery UI 1.10.3 minified CSS 
The original version contained some invalid paths for images. I'm unsure
where these came from as the version from the offical jQuery UI does not
contain these, and these were the only differences in the files.
 2014-08-08 14:05:03 +08:00
Gregory Faller
f707b67259 MDL-46718: Return user to last accessed page when quick grading 2014-08-08 14:48:13 +09:30
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