moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67193 commits 37 branches 544 tags 1.3 GiB
Commit graph

67193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Wheeler
25da4fa204 MDL-46794 install: Fixed typo in config-dist.php 2014-08-19 11:27:46 +08:00
Marina Glancy
c8c0aa21e4 Merge branch 'm26_MDL-46775' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-08-19 11:22:09 +08:00
Marina Glancy
0a88b33a6a MDL-46691 mod_choice: apply filters to user input 2014-08-19 03:05:55 +02:00
James Henestofel
d79710afde MDL-42231 auth: custom profile fields to support numbers at the end. 
For data mapping LDAP or CAS.  Change order of fieldname display checks to verify
custom profile fields first to allow custom field shortname to contain number at the end.
 2014-08-19 02:44:14 +02:00
Eloy Lafuente (stronk7)
829eb491e0 Merge branch 'MDL-44894_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-08-19 02:35:04 +02:00
Petr Skoda
f460295a58 MDL-46552 session: add support for multiple servers in memcached session driver 2014-08-19 02:30:30 +02:00
Eloy Lafuente (stronk7)
de25146b0a Merge branch 'MDL-45874-26' of https://github.com/danielneis/moodle into MOODLE_26_STABLE 2014-08-19 02:12:32 +02:00
Eloy Lafuente (stronk7)
432785d430 Merge branch 'wip-MDL-46826-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-08-18 20:08:52 +02:00
Eric Merrill
ad94c5efb4 MDL-46766 auth_cas: Upgrading to phpCAS 1.3.3 2014-08-18 16:40:42 +08:00
Damyon Wiese
e2aa68b154 Merge branch 'm26_MDL-46760' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-08-18 12:41:29 +08:00
Daniel Neis
3395def1fa MDL-45874 Fix access to users reports in navigation when using separate groups 2014-08-15 17:04:36 -03:00
Marina Glancy
756d8f1171 MDL-46826 forum: make sql query indexed, regression from MDL-31089 2014-08-15 11:47:03 +08:00
Tim Hunt
82e46ef9ea MDL-44894 question editing: fix validation with odd permissions 
For users with edit permissions, but not add permissions, it was
impossible to save the editing form. The validation assuemd this value
was present, but it was not. Other code checks this field too, so I
added it rather than changing the validation and all the other uses.
 2014-08-14 11:26:50 +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
Dan Marsden
151b3a299b MDL-46760 mod_scorm: Fix js error when preview mode disabled 2014-08-14 10:11:28 +12: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
Simon Coggins
1a68d6e7e1 MDL-46775: Fix call to unavailable function when loading an invalid JS file 2014-08-12 14:34:17 +12: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