3473 Commits

Author SHA1 Message Date
Marina Glancy
c733401634 Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle 2014-04-15 14:34:36 +08:00
Marina Glancy
fdb8bae241 Merge branch 'wip-mdl-41283' of git://github.com/rajeshtaneja/moodle
Conflicts:
	mod/upgrade.txt
2014-04-15 14:34:28 +08:00
Rajesh Taneja
7b7bb92d42 MDL-41283 report_participation: Fixed legacy actions returned from api's 2014-04-15 13:31:03 +08:00
Rajesh Taneja
b2b4ec308e MDL-41283 report_participation: Added phpdoc about function not used
In new logging api, xxx_get_view_actions() and xxx_get_post_actions()
will not be used to identify the paticipation of user. Event's crud
and edulevel status will define user's participation.
2014-04-15 13:31:03 +08:00
Mark Nelson
92089e0ecc MDL-45057 mod_quiz: restored the user/group override deleted events 2014-04-13 22:32:06 -07:00
Dan Poltawski
97c274ded7 MDL-40063/MDL-45057 quiz: disable related unit tests
I kept the commit number format same as the last commit just
to annoy Fred.
2014-04-11 17:36:40 +08:00
Dan Poltawski
c5e5f1b786 MDL-40063/MDL-45057 quiz: disable firing of override events
This hacky solution is brought to you by the the motivation to
release.
2014-04-11 16:58:10 +08:00
Dan Poltawski
34f7e31ffb Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle 2014-04-11 14:31:27 +08:00
Ankit Agarwal
9638600bbb MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events 2014-04-11 13:32:33 +08:00
Dan Poltawski
9d1eed69a0 Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle 2014-04-11 13:01:38 +08:00
Dan Poltawski
d6a756a949 Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle 2014-04-11 12:55:15 +08:00
Mark Nelson
9d65d3e70b MDL-40063 mod_quiz: created 'override_created' events 2014-04-10 20:42:44 -07:00
Mark Nelson
e8365f27e5 MDL-40063 mod_quiz: replaced ‘manualgrade’ add_to_log call with an event 2014-04-10 20:42:24 -07:00
Mark Nelson
a2caf56dff MDL-40063 mod_quiz: replaced 'attempt' add_to_log call with an event 2014-04-10 20:41:56 -07:00
Mark Nelson
45e1e3bd76 MDL-40063 mod_quiz: replaced 'preview' add_to_log call with an event 2014-04-10 20:41:54 -07:00
Mark Nelson
e0114708af MDL-40063 mod_quiz: replaced 'continue attempt' add_to_log call with an event 2014-04-10 20:41:39 -07:00
Mark Nelson
8de2eb3582 MDL-40063 mod_quiz: replaced 'delete override' add_to_log call with events 2014-04-10 20:41:09 -07:00
Mark Nelson
e7d80a059a MDL-40063 mod_quiz: replaced 'edit override' add_to_log call with events 2014-04-10 20:40:51 -07:00
Mark Nelson
68758eff12 MDL-40063 mod_quiz: removed 'close attempt' add_to_log call 2014-04-10 20:40:27 -07:00
Mark Nelson
60ab03eb10 MDL-40063 mod_quiz: replaced 'view summary' add_to_log call with an event 2014-04-10 20:40:25 -07:00
Mark Nelson
2a3f82041f MDL-40063 mod_quiz: replaced 'review' add_to_log call with an event 2014-04-10 20:40:13 -07:00
Mark Nelson
2ec79ad996 MDL-40063 mod_quiz: replaced 'report' add_to_log call with an event 2014-04-10 20:39:56 -07:00
Mark Nelson
7dad3d95fd MDL-40063 mod_quiz: replaced 'delete attempt' add_to_log call with an event 2014-04-10 20:39:15 -07:00
Mark Nelson
58940b190a MDL-40063 mod_quiz: replaced 'addcategory' add_to_log call with an event 2014-04-10 20:38:34 -07:00
Mark Nelson
5e8f736565 MDL-40063 mod_quiz: replaced 'editquestions' add_to_log call with an event 2014-04-10 20:34:27 -07:00
Mark Nelson
b332fc6c8c MDL-40063 mod_quiz: replaced 'view' and 'view all' add_to_log calls with events 2014-04-10 20:34:14 -07:00
James Pratt
1d75d9fe70 MDL-44981 quiz statistics report : Differentiating '0' and no response
in numeric questions.
2014-04-07 19:13:04 +07:00
James Pratt
bec7719c3b MDL-44980 quiz statistics report : break down by variants failing
when there has only been one variant seen.
2014-04-07 18:44:48 +07:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Tim Hunt
07a0370bf8 MDL-44940 quiz editing page problems from MDL-43749.
* If the quiz starts with an empty page, you could not move the first
question up onto it.
* Adding page breaks in the middle sometimes added them in the wrong
place.
* Adding a new page at the end is problematic, and here we fix it as
much as possible, by letting you move the last question down to create a
new page. This needs MDL-40987 to be fixed properly.
2014-04-04 19:03:16 +01:00
Marina Glancy
e19c086c36 MDL-40843 recent_activity: corrections to grouping and user fields 2014-04-04 16:52:01 +08:00
Eloy Lafuente (stronk7)
2e20fc3742 Merge branch 'MDL-31262' of git://github.com/timhunt/moodle 2014-04-02 03:18:05 +02:00
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
2014-04-01 15:08:34 +08:00
Marina Glancy
0b1afc71bb Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle 2014-04-01 13:45:59 +08:00
Tim Hunt
6a981b45c3 MDL-31262 fix quiz review capability check.
This change is logically the same as changing
    $this->has_capability('mod/quiz:viewreports')
to
    $this->has_capability('mod/quiz:viewreports') || $this->has_capability('mod/quiz:preview')
in the original code. However, I rewrote the logic so that we test the
most common and performance-critical case first - that of a student
lookign at their own attempt.
2014-03-28 18:37:21 +00:00
Tim Hunt
4dc30936f7 MDL-44811 quiz settings form title: change for consistency.
Thanks to Fred for poining out that most other activities use the work
Appearance for these sorts of settings.
2014-03-28 18:02:02 +00:00
Petr Škoda
578645aadf MDL-44715 use parent::validate_data() consistently in all events
Includes some minor PHPDocs typo fixes.
2014-03-28 14:09:31 +08:00
Sam Hemelryk
46c627cf05 Merge branch 'MDL-44690-master' of git://github.com/jamiepratt/moodle 2014-03-26 13:25:51 +13:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
James Pratt
49dda8fe6e MDL-44690 core_questions : amending unit tests
to use more human friendly format for submitted question type data.
2014-03-25 14:37:51 +07:00
Marina Glancy
2bcb6dbeb0 Merge branch 'MDL-44665' of git://github.com/timhunt/moodle 2014-03-25 14:28:55 +08:00
Sam Hemelryk
027d10d67f Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle 2014-03-25 15:06:44 +13:00
Sam Hemelryk
8134eb8573 Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle 2014-03-25 12:51:14 +13:00
Tim Hunt
f38965db42 MDL-44665 declare all quiz page types in the blocks UI. 2014-03-21 14:40:57 +00:00
James Pratt
58794ac948 MDL-44690 core_questions : download of question steps data as csv file 2014-03-21 12:32:00 +07:00
Eloy Lafuente (stronk7)
1c774322ba Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle
Conflicts:
	version.php
2014-03-19 02:14:00 +01:00
James Pratt
fcdd04db0a MDL-44075 quiz_statistics : Various coding style / phpdocs fixes 2014-03-18 19:09:39 +07:00
James Pratt
ebb8de5d37 MDL-44535 quiz_statistics : response analysis - limit tries counted 2014-03-18 18:54:07 +07:00
James Pratt
038014c415 MDL-41760 quiz_statistics : response analysis for first/last/all tries 2014-03-18 18:47:19 +07:00
David Monllao
0176d12dd6 MDL-44246 behat: New mod_quiz test when JS is disabled
Also including a modification in behat_question_base
to make the internal method work with both JS and non-JS.
2014-03-18 15:32:58 +08:00