69688 Commits

Author SHA1 Message Date
Frederic Massart
ef93efbf9d MDL-46818 core_grade: Prevent form checker to catch move fields 2014-09-10 10:43:16 +08:00
Dan Poltawski
4b5fd6eb6d Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle 2014-09-09 10:35:48 +01:00
Marina Glancy
a788aade7c Merge branch 'MDL-46997-master' of git://github.com/damyon/moodle 2014-09-09 17:18:42 +08:00
Marina Glancy
0e88fe0227 Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle 2014-09-09 17:16:15 +08:00
Marina Glancy
de62e57a9b Merge branch 'master_MDL-47076' of git://github.com/totara/moodle 2014-09-09 17:12:28 +08:00
Damyon Wiese
b50b12b3f9 MDL-46997 Grades: fix sum of grades with hidden items with differing maxgrades 2014-09-09 17:11:59 +08:00
Damyon Wiese
0db54b5ba2 MDL-46997 Grades: Fix aggregation when hiding is excluded and items have nested dependencies
Includes a unit test for the dependency flattening function.
2014-09-09 17:11:59 +08:00
Damyon Wiese
15ace20460 MDL-46997 Grades: Improve the behat tests for grade aggregation
The tests now cover hidden grades in sub categories for all aggregation types. This change
includes a data generator for grade categories, with unit tests and behat tests for
the generator.
2014-09-09 17:11:59 +08:00
Marina Glancy
ba41742ea2 MDL-47080 theme: call format_string on site shortname 2014-09-09 10:05:28 +01:00
Dan Poltawski
fb385cb7af Merge branch 'MDL-46572_master' of https://github.com/markn86/moodle 2014-09-09 09:18:00 +01:00
Dan Poltawski
78f284b6ea Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle 2014-09-09 08:46:01 +01:00
Dan Poltawski
c35e9b73a5 Merge branch 'wip-MDL-46834-master' of git://github.com/marinaglancy/moodle 2014-09-09 08:06:40 +01:00
David Curry
927ea484ec MDL-47076 badges: Add checks to user fields during badges restoration
Change-Id: Iff6402d1da835ed57dc17d079adf1bbd2e76dd6c
2014-09-09 16:22:52 +12:00
Frederic Massart
f1272bbecd MDL-46696 backup: Handle older backups not containing grade history 2014-09-09 10:23:11 +08:00
Marina Glancy
588ff74f11 MDL-46834 dndupload: Hide dnd message when user cant upload files 2014-09-09 10:02:25 +08:00
Marina Glancy
7b22e2ab54 MDL-46834 filepicker: dnd upload should respect the current context id 2014-09-09 10:02:24 +08:00
Adrian Greeve
4112ef994a MDL-40356 lib: Unit tests for the alternativefullnameformat setting. 2014-09-09 09:23:19 +08:00
Adrian Greeve
ea6f548081 MDL-40356 lib: Added a new setting to display more information from the fullname function. 2014-09-09 09:22:43 +08:00
Eloy Lafuente (stronk7)
eb80a145c8 Merge branch 'm28_MDL-47054' of git://github.com/totara/moodle 2014-09-09 02:18:59 +02:00
Eloy Lafuente (stronk7)
a02aef0c7c Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle 2014-09-09 02:15:26 +02:00
Eloy Lafuente (stronk7)
559f6d6d1b Merge branch 'MDL-46428_master3' of https://github.com/Syxton/moodle 2014-09-09 01:33:44 +02:00
Dan Poltawski
99e221f844 Merge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amandadoughty/moodle 2014-09-08 17:26:56 +01:00
Dan Poltawski
205cd43352 Merge branch 'wip-MDL-45602-master' of git://github.com/marinaglancy/moodle 2014-09-08 16:30:33 +01:00
Dan Poltawski
a3b93be8f8 Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle 2014-09-08 16:23:59 +01:00
Dan Poltawski
0072e5d559 Merge branch 'MDL-46586-master' of git://github.com/jleyva/moodle 2014-09-08 15:31:13 +01:00
Dan Poltawski
7b41ee2752 Merge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle 2014-09-08 15:16:38 +01:00
Dan Poltawski
735c7ee41a Merge branch 'MDL-47122' of git://github.com/timhunt/moodle 2014-09-08 14:28:30 +01:00
Tim Hunt
16e246ac52 MDL-47122 question_engine_data_mapper: which methods are public.
That is, which may be used from outside the question engine.
2014-09-08 13:24:17 +01:00
Dan Poltawski
7f2c821420 Merge branch 'MDL-46982' of https://github.com/shashirepo/moodle 2014-09-08 12:22:27 +01:00
Dan Poltawski
45121f9b25 Merge branch 'MDL-47014' of git://github.com/jleyva/moodle 2014-09-08 12:19:24 +01:00
Dan Poltawski
b93cd58dd3 Merge branch 'wip-MDL-46254-master' of git://github.com/marinaglancy/moodle 2014-09-08 12:14:51 +01:00
Juan Leyva
7cfe4419c2 MDL-47014 airnotifier: Missing require of filelib.php 2014-09-08 11:42:05 +02:00
Marina Glancy
aea49eb5f9 Merge branch 'MDL-46818_master' of git://github.com/markn86/moodle 2014-09-08 14:04:33 +08:00
Marina Glancy
1302bb08f6 MDL-43739 block_course_overview: allow resorting of big number of courses
previously an exception was thrown if the user preference exceeds 1333 chars
2014-09-08 14:01:06 +08:00
Marina Glancy
d619776bd5 MDL-46254 theme: apply filters to theme footnote 2014-09-08 13:55:55 +08:00
Marina Glancy
cb1be3a7ae Merge branch 'MDL-46587-master' of git://github.com/jleyva/moodle 2014-09-08 13:48:37 +08:00
Marina Glancy
2eacde6be0 Merge branch 'MDL-46761' of git://github.com/timhunt/moodle 2014-09-08 13:48:26 +08:00
Marina Glancy
68044ce347 Merge branch 'MDL-46821-master' of git://github.com/ankitagarwal/moodle 2014-09-08 13:48:15 +08:00
Marina Glancy
d281dffa8d Merge branch 'MDL-46564_master' of https://github.com/totara/openbadges 2014-09-08 13:48:06 +08:00
Marina Glancy
70fb279f56 Merge branch 'MDL-47060-master' of git://github.com/damyon/moodle 2014-09-08 12:57:41 +08:00
Marina Glancy
7fde166775 Merge branch 'MDL-44304-master' of git://github.com/damyon/moodle 2014-09-08 12:57:34 +08:00
Tim Hunt
a7b4c96440 MDL-46761 fix PHPdocs on question_usage_by_activity::get_total_mark
Thanks to Tony Gardner-Medwin for spotting this.
2014-09-07 11:37:43 +01:00
Juan Leyva
ff831a44ed MDL-46587 files: Invalid $itemid conversion in core_files_get_files Web Service 2014-09-05 13:46:18 +02:00
Juan Leyva
b893dc2252 MDL-46586 files: Invalid return parameters definition in core_files_get_files external function 2014-09-05 13:31:14 +02:00
Marina Glancy
9cc66e866c MDL-45602 behat: add members to cohorts 2014-09-05 16:40:00 +08:00
Andrew Nicols
4238983e2a MDL-47107 mod_forum Optimise forum subscription checks
Supply a coursemodule where relevant to the forum subscription checks.
2014-09-05 15:06:15 +08:00
shashirepo
04e57ab0c7 MDL-46982 core: fixes wrong opening div tag 2014-09-05 10:19:24 +05:30
Tim Hunt
4040e2dd11 MDL-47122 use insert_records to improve question engine performance. 2014-09-04 23:15:27 +01:00
Syxton
60df67878b MDL-46428 course: Remove confirm when duplicating
A confirm dialog is given when Javascript is off but not when it is on.
This aligns the two so that they neither have a confirm when duplicating
an activity.
2014-09-04 15:19:17 -04:00
Eloy Lafuente (stronk7)
457f818026 weekly release 2.8dev 2014-09-04 19:54:47 +02:00