Commit graph

65806 commits

Author SHA1 Message Date
James Pratt
487e7e6602 MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause
Fixing some typos and adding some tests.
2013-11-28 17:13:26 +07:00
AMOS bot
4be2c1b812 Automatically generated installer lang files 2013-11-28 09:12:39 +00:00
Andrew Nicols
104d698ffd MDL-43105 JavaScript: Use the correct versions of our rollups 2013-11-28 12:31:51 +08:00
Frederic Massart
74c4405b8a MDL-42951 curl: Re-organise Unit Tests in smaller chunks 2013-11-28 12:14:13 +08:00
Frederic Massart
102230b23c MDL-42951 curl: Always keep the last headers of a request 2013-11-28 12:00:42 +08:00
Tim Hunt
1c73df9eea MDL-43068 course&gradebook: show/hide cm & CONTROLS_GRADE_VISIBILITY
Making a quiz visible on the course page, of via the settings form,
could cause the grade item to become visible in the gradebook, even
though the quiz supports FEATURE_CONTROLS_GRADE_VISIBILITY to ensure
that when the grades are hidden in the quiz settings, they do not appear
in the gradebook.

Now, if a module supports FEATURE_CONTROLS_GRADE_VISIBILITY, then
set_coursemodule_visible calls the _grade_item_update callback to update
the grade item(s).

In addition, there was a bug when saving the quiz form, where it used
the value of $cm->visible from the database, which was wrong if the
value of cm->visible had just been changed on the setting form.
2013-11-27 17:40:40 +00:00
James Pratt
34292e218d MDL-43079 quiz statistics : fix stats graph when all grades zero 2013-11-27 17:50:05 +07:00
Jason Fowler
d9308a07e8 MDL-43083 Course: Swapping the edit/cog for the right size icon 2013-11-27 15:06:25 +08:00
Adrian Greeve
8b1d424098 MDL-43058 reports: updated sql to return fullnames in security check reports. 2013-11-27 14:43:33 +08:00
Jason Fowler
7d4e3575bc MDL-43076 Activity Chooser: Fixing the white bar at the bottom of the dialogue 2013-11-27 14:39:42 +08:00
Rajesh Taneja
c891a73d97 MDL-43048 block_tags: Initalised content->text for tags block 2013-11-27 14:32:35 +08:00
Dan Poltawski
fb16acf24e MDL-43081 upgrade.txt: note generator change 2013-11-27 13:29:15 +08:00
Mark Nelson
275d958e62 MDL-42885 tool_uploaduser: removed misleading debugging message 2013-11-26 21:26:03 -08:00
Dan Poltawski
ab47c758d1 MDL-42942 behat: increment version 2013-11-27 11:33:11 +08:00
Dan Poltawski
eeb6b7847b Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle 2013-11-27 11:32:23 +08:00
Andrew Nicols
19d97d6b15 MDL-43018 JavaScript: Correct joining of multiple minified JS
When minifiying JS, unnecessary semi-colons are removed - this includes the
trailing semi-colon.

Since we join multiple files together after minification, we need to add an
additional semi-colon in this situation to produce valid JavaScript.
2013-11-27 09:33:14 +08:00
AMOS bot
4729051593 Automatically generated installer lang files 2013-11-27 00:48:23 +00:00
Sam Hemelryk
8d5a9d6ec1 Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle 2013-11-27 12:36:02 +13:00
Tim Lock
579f849928 MDL-33971: When viewing course log entries for Quiz View Summary a number is displayed not the quiz name 2013-11-27 08:14:40 +10:30
Eloy Lafuente (stronk7)
51e9d69af2 Merge branch 'master_MDL-43045' of git://github.com/totara/moodle 2013-11-26 21:27:35 +01:00
Ruslan Kabalin
749700e4a7 MDL-43071 assign: Fix offline grades import for scale grading. 2013-11-26 16:36:37 +00:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Mark Nelson
bb32a499e1 MDL-42932 core_calendar: introduced calendar type system setting 2013-11-25 23:11:17 -08:00
Dan Poltawski
bb29677965 Merge branch 'MDL-43000' of git://github.com/timhunt/moodle 2013-11-26 15:05:42 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
Dan Poltawski
fb9c770d8d Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-26 14:48:21 +08:00
Damyon Wiese
3a5c3b3cbf MDL-42919 Assign: Remove no-label form hacks 2013-11-26 13:30:36 +08:00
Damyon Wiese
4d4b345392 MDL-42919 Question: Remove   from empty labels
This allows the form elements with empty labels to "fold" properly.
2013-11-26 13:30:36 +08:00
Damyon Wiese
e6b1d132cb MDL-41919 Forms: Add a class to form elements with an empty label
This means they can be styled properly when the form is folded with
the labels above the form fields.
2013-11-26 13:28:51 +08:00
Dan Poltawski
6ac888c5f2 Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle 2013-11-26 13:24:02 +08:00
David Monllao
39386f271f MDL-42738 behat: Updating composer.json to point to the new moodle-behat-extension master 2013-11-26 12:49:33 +08:00
rwijaya
e94d023225 MDL-42918: fixed fullscreen width for multichoice answers editor 2013-11-26 12:21:51 +08:00
Dan Poltawski
c9ed9e5662 Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle 2013-11-26 12:09:45 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
Jerome Mouneyrac
2a974bb79c MDL-42969 Main Menu Block loses ability to move resource or activity up or down (add back exact same behavior than in 2.5) 2013-11-26 11:38:56 +08:00
Marina Glancy
4fd2a16e35 MDL-40191 navigation: do not throw an error if activity is not visible
navigationlib is not the place to check it, let the page itself decide what to do in this case
2013-11-26 13:54:19 +11:00
Damyon Wiese
46b9d1bec6 Merge branch 'master-mdl42998' of https://github.com/tlock/moodle 2013-11-26 10:49:32 +08:00
David Monllao
e2d7379682 MDL-42842 behat: Adding a new formatter
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
2013-11-26 10:48:58 +08:00
David Monllao
7514c2f282 MDL-42842 testing: Generalization of the site info 2013-11-26 10:48:29 +08:00
Dan Poltawski
01db5af468 Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle 2013-11-26 10:42:04 +08:00
David Monllao
d949882691 MDL-43050 behat: Fixing moodlehq/behat-extension version 2013-11-26 10:36:08 +08:00
Dan Poltawski
4bf3517bc7 Merge branch 'wip-mdl-41635' of git://github.com/rajeshtaneja/moodle 2013-11-26 10:24:59 +08:00
Damyon Wiese
18962add08 Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle 2013-11-26 09:29:44 +08:00
Sam Hemelryk
f9cb086dfc Merge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle 2013-11-26 08:42:25 +13:00
Sam Hemelryk
657b29e7bc Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle 2013-11-26 08:36:36 +13:00
Simon Coggins
b92709db40 MDL-43045 report: Fix missing role name in security overview report 2013-11-26 08:14:10 +13:00
Simon Coggins
529b85b06f MDL-43049 accesslib: Fix typo in memory optimization code 2013-11-26 08:01:28 +13:00
Tomasz Muras
399889c11a MDL-42563 Correct version of GPL license to GPL 2+ for AlgParser.pm 2013-11-25 11:53:18 +01:00
Dan Poltawski
25da2fe065 Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle 2013-11-25 15:43:44 +08:00