Commit graph

67299 commits

Author SHA1 Message Date
Tim Hunt
8e321075bd MDL-46916 behat: improve question state test. 2014-08-25 16:50:30 +08:00
Damyon Wiese
9a72e79050 Merge branch 'MDL-46923_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE 2014-08-25 16:47:55 +08:00
Damyon Wiese
ea254fc7dd Merge branch 'wip_MDL-43918_m26_cm' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-08-25 16:46:29 +08:00
Marina Glancy
514a13e431 Merge branch 'M26_MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle into MOODLE_26_STABLE 2014-08-25 16:30:01 +08:00
Colin Chambers
a9568d3d7f MDL-46895 qtype_calculated_find_formula_errors not defined causes Calculated question type test to fail 2014-08-25 16:28:25 +08:00
Rex Lorenzo
269695f48b MDL-46776 gradereport_grader: Improve Grader report user interface
* Adding assignments to test course generator to more easily test the grader report with large number of students and graded activities.
2014-08-25 16:20:56 +08:00
Dan Marsden
9dc8c0f8b1 MDL-46639 mod_scorm: Fix load of simple AICC content
Thanks to Ian Wild for the report and suggested patch.
2014-08-25 20:03:01 +12:00
Damyon Wiese
4b4fb1ce8b Merge branch 'wip-MDL-46812_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE 2014-08-25 14:03:36 +08:00
Damyon Wiese
4157b01343 Merge branch 'wip-MDL-46703-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-08-25 13:54:12 +08:00
Petr Skoda
98af233a16 MDL-43918 add more validation to $modulename parameter when fetching cms 2014-08-25 12:19:43 +12:00
Eloy Lafuente (stronk7)
3312fc1ed5 MDL-46918 ddl: cover behavior with unit test 2014-08-21 18:33:55 +01:00
Tim Hunt
f45e49f01b MDL-46918 ddl: fix error when renaming table already exists 2014-08-21 18:33:55 +01:00
AMOS bot
b463508597 Automatically generated installer lang files 2014-08-22 00:05:35 +08:00
Tim Hunt
7464e1b39d MDL-46894 make Behat backup steps more robust. 2014-08-21 14:15:20 +01:00
Amanda Doughty
1c5d2aefd1 MDL-46619 Forum: author showing in Q and A forum 2014-08-21 13:10:55 +01:00
shashirepo
910043d965 MDL-46477 chat:hard coded string in mod/chat 2014-08-21 17:34:30 +05:30
Mary Evans
f29d5f891a MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824
commit 47f382e509ec41bed7b0e7c12e7d798d2b5ba2f7
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Fri Aug 15 01:47:49 2014 +0100

    MDL-46812 grade/report/grader: Fixes gradebook in 2.6.

    also removed two redundent CSS rules in base/style/grade.css.
2014-08-21 11:27:33 +01:00
Mark Nelson
1d9c8d95f2 MDL-46923 core_behat: fixed typos in function names 2014-08-20 22:11:39 -07:00
Brian Barnes
d489ecd1eb MDL-46900 theme: allowed more than 1 nav collapse element 2014-08-21 15:05:37 +12:00
Marina Glancy
fd72531964 weekly release 2.6.4+ 2014-08-21 10:18:47 +08:00
Marina Glancy
ebb8098668 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-08-21 10:18:46 +08:00
AMOS bot
911ab1a334 Automatically generated installer lang files 2014-08-21 00:05:34 +08:00
Gregory Faller
fc86ba1b68 MDL-46842: Reopen assignment submissions when using offline grading worksheet 2014-08-20 19:12:15 +09:30
Damyon Wiese
24d7efcec3 Merge branch 'MDL-45029-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
Conflicts:
	course/modlib.php
2014-08-20 13:59:45 +08:00
Simey Lameze
66dbc14778 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-20 12:07:40 +08:00
Mark Nelson
ec5fda6d6f MDL-46188 core_course: use correct hide/show icon 2014-08-20 12:05:25 +08:00
Damyon Wiese
cb86d02348 Merge branch 'MDL-45029-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-08-20 10:22:08 +08:00
Mark Nielsen
8faaca0ea2 MDL-46536: OAuth signature fails with inconsistent new lines
When the LTI intro contains a single \n or
\r newline character then the OAuth signature
fails.  All newlines should be \r\n

Conflicts:
	mod/lti/tests/locallib_test.php
2014-08-19 22:17:04 +02:00
AMOS bot
b16e3e2217 Automatically generated installer lang files 2014-08-20 00:05:33 +08:00
Eloy Lafuente (stronk7)
881af32789 Merge branch 'MDL-46051_LTI_event26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE 2014-08-19 17:24:37 +02:00
Michael Wheeler
2cb77a22ff Normalize request header names. 2014-08-19 15:39:27 +02:00
David Balch
68305e513b MDL-46887 mod_assign: Enforce module's maxbytes setting at submission. 2014-08-19 14:03:13 +01:00
Simey Lameze
fe845dd3c2 MDL-45029 core_course: set aggregationcoef while creating a new course module 2014-08-19 17:08:18 +08:00
Marina Glancy
135efed7f1 MDL-46538 theme_base: recompiled moodle.css 2014-08-19 16:53:30 +08:00
Marina Glancy
2a8877376a Merge branch 'MDL-46538_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE 2014-08-19 16:53:09 +08:00
Marina Glancy
26929ce1a7 Merge branch 'MDL-46281-MOODLE_26_STABLE' of git://github.com/lucisgit/moodle into MOODLE_26_STABLE 2014-08-19 16:23:00 +08:00
Marina Glancy
3e15af69de Merge branch 'MDL-46833-MOODLE_26_STABLE' of git://github.com/lucisgit/moodle into MOODLE_26_STABLE 2014-08-19 14:22:01 +08:00
Damyon Wiese
a69107e549 Merge branch 'MDL-41513-Scrollbar_not_working-26' of https://github.com/MorrisR2/moodle into MOODLE_26_STABLE 2014-08-19 14:07:39 +08:00
Marina Glancy
0f9d61091b Merge branch 'wip-mdl-46817-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-08-19 14:04:21 +08:00
Marina Glancy
f09f95fefa Merge branch 'MDL-43197-26-2nd' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-08-19 13:26:19 +08:00
Damyon Wiese
4e6eb5b8be Merge branch 'MDL-46188_m26' of https://github.com/shashirepo/moodle into MOODLE_26_STABLE 2014-08-19 13:15:13 +08:00
Marina Glancy
8b50f60a64 MDL-46874 gradereport: replace usage of class hidden with dimmed_text 2014-08-19 12:56:43 +08:00
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
Frederic Massart
0eef41f639 MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades 2014-08-19 10:49: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