mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 16:59:56 +01:00
Code Issues Projects Releases Wiki Activity
66,458 Commits 36 Branches 523 Tags
Commit Graph

3383 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
16b2fc5913 Merge branch 'MDL-43338-master' of https://github.com/jamiepratt/moodle 2014-02-11 00:26:29 +01:00
Sam Hemelryk
179ddd105b Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-02-10 08:50:23 +13:00
Sam Hemelryk
705c5e0aed Merge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi/moodle 2014-02-10 08:44:39 +13:00
James Pratt
c3e2e754dd MDL-43338 quiz statistics : refactoring question statistics code 
to improve readability and maintainability.
 2014-02-07 13:35:20 +07:00
Matt Petro
74b3c4e58c MDL-44029 mod_quiz: Fixing group deleted handler so it does not remove user overrides. 2014-02-06 13:32:04 -05:00
Marina Glancy
7f34b8e135 Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle 2014-02-05 15:56:30 +08:00
Rossiani Wijaya
8c6ca6961a MDL-42339 - removed double formatting for set_title() and set_heading() 2014-02-05 14:47:23 +08:00
Sam Hemelryk
d9fece93d0 Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle 2014-02-05 12:36:52 +13:00
Sam Hemelryk
8213574043 Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-02-05 12:35:11 +13:00
Marina Glancy
e5fd05a368 Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:44:51 +08:00
Sam Hemelryk
aa01949f24 Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:50:48 +13:00
Ankit Agarwal
6b21643236 MDL-43804 themes: Update css not to use r0 and r1 identifiers for table rows 2014-02-03 14:29:39 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57 MDL-43736 Events: event->contextinstanceid should be used where possible 
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
 2014-01-29 11:39:44 +08:00
Tomasz Muras
672ce966c6 MDL-43040 Replace $module with $plugin in all mod/*/version.php 
Conflicts:
	mod/quiz/version.php
 2014-01-29 00:36:12 +01:00
Tim Hunt
e101ec9fd7 MDL-43874 quiz, teacher comments should respect display options. 
Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.
 2014-01-27 12:01:32 +00:00
James Pratt
df9ddae686 MDL-41757 quiz statistics : limit subq and variant stat rows 
and print min, median and max.
 2014-01-27 18:04:08 +07:00
James Pratt
4f7516f6e8 MDL-41756 (3) quiz statistics : test variant stats 2014-01-27 18:00:04 +07:00
James Pratt
1239d28776 MDL-41756 (2) quiz statistics : break down question stats by variant 2014-01-27 18:00:04 +07:00
James Pratt
8da6fc9d57 MDL-41754 (2) quiz statistics : using Sam's new progress classes 2014-01-27 17:45:50 +07:00
James Pratt
8e32861786 MDL-43369 : quiz statistics - average across attempts where item seen 
and not across all attempts for subqs.
 2014-01-27 17:30:56 +07:00
Dan Poltawski
6fe1f72ca0 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-23 09:32:36 +08:00
Tim Hunt
e5c86d0740 MDL-43670 fix quiz backup. 2014-01-22 08:32:10 +00:00
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Dan Poltawski
e5c5f52e8b MDL-43670 quiz: improve code comments a little 2014-01-21 11:59:07 +08:00
Dan Poltawski
1f931e2928 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-21 11:25:38 +08:00
Damyon Wiese
7b6464bf9d Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle 2014-01-21 09:28:54 +08:00
Eric Merrill
bed27b3024 MDL-43732 quiz Fix styles so that question div doesn't overlap controls. 2014-01-20 19:56:17 -05:00
Damyon Wiese
3a96e8b4c3 Merge branch 'MDL-32523' of git://github.com/timhunt/moodle 2014-01-20 16:02:54 +08:00
Tim Hunt
7051f3a882 MDL-43690 quiz_question_tostring missing s(). 
This meant that the edit quiz page sometimes had invalid HTML.
 2014-01-17 10:56:27 +00:00
Tim Hunt
dc4a3ea1ee MDL-43670 quiz_question_instances to match coding guidelines. 
Some columns needed to be renamed:
* quiz     -> quizid
* question -> questionid
* grade    -> maxmark

Then all the places that refer to those needed to be fixed.
 2014-01-17 10:56:07 +00:00
M Kassaei
e0c41591e1 MDL-32523 Duplicate questions in question bank 2014-01-17 10:54:12 +00:00
Dan Poltawski
198b1facc3 Merge branch 'MDL-40313' of git://github.com/timhunt/moodle 2014-01-14 14:21:06 +08:00
Dan Poltawski
4be67945aa Merge branch 'MDL-43412' of git://github.com/timhunt/moodle 2014-01-14 10:46:22 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Tim Hunt
d62382d1f9 MDL-40313 question bank search classes should be namespaced. 2014-01-09 18:26:21 +00:00
Tim Hunt
e22e749002 MDL-40313 Fix code and doc checker warnings. 2014-01-09 18:26:18 +00:00
Ray Morris
efa5155a2a MDL-40313 questionbank: Add question filtering API 
Add new API for filtering questions, refactoring the options to display
old questions and include subcategories into new
question_bank_search_condition classes. Make the new API pluggable via
local_[pluginname]_get_question_bank_search_conditions.
 2014-01-09 16:46:42 +00:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Tim Hunt
1f8ff396d2 MDL-43412 quiz with grade period and password did not work. 
Once the attempt became overdue, it was impossible to get in to submit
it because of a redirect loop. This fix resovles that loop, so the
student can enter their password and get in.
 2014-01-08 17:55:25 +00:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Eloy Lafuente (stronk7)
3e1a05790d Merge branch 'master-mdl33971' of https://github.com/tlock/moodle 2013-12-03 17:17:06 +01:00
Eloy Lafuente (stronk7)
6cc00494e2 Merge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle 2013-12-03 15:36:25 +01:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Dan Poltawski
9a7de39d7a Merge branch 'MDL-43068' of git://github.com/timhunt/moodle 2013-12-02 11:11:07 +08:00
Eloy Lafuente (stronk7)
4942801c39 Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle 
Conflicts:
	question/classes/statistics/questions/calculator.php
	question/classes/statistics/responses/analyser.php
 2013-11-28 12:44:04 +01:00
James Pratt
7d6b28d87a MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests 2013-11-28 17:57:02 +07:00
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
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