Commit graph

3442 commits

Author SHA1 Message Date
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
Marina Glancy
e65825830f Merge branch 'MDL-44588' of git://github.com/timhunt/moodle 2014-03-17 18:18:36 +08:00
Tim Hunt
2f83d71ccc MDL-44534 also fix the mod_quiz behat tests.
They had duplicated code. I refactored.
2014-03-13 18:33:27 +01:00
Tim Hunt
fb4ae869e5 MDL-44588 quiz: fix crazy variable called $this. 2014-03-12 18:20:45 +00:00
Dan Poltawski
8674c5e415 Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle 2014-03-11 12:35:57 +08:00
James Pratt
185aae5dbe MDL-44497 quiz responses report : error when no attempts 2014-03-07 17:24:13 +07:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
Eloy Lafuente (stronk7)
170c87d808 Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle 2014-03-06 00:35:28 +01:00
Helen Foster
fcca760ae7 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:29:32 +01:00
Dan Poltawski
a59b2e18d8 Merge branch '44180-27' of git://github.com/samhemelryk/moodle 2014-03-05 12:47:17 +08:00
Tim Hunt
2fa19cfe82 MDL-43749 quiz editing: fix adding the first question.
The first question added to a quiz was getting slot number 2, not 1.
2014-03-04 17:57:47 +00:00
Dan Poltawski
3071e2bbf9 Merge branch 'MDL-44278' of git://github.com/timhunt/moodle 2014-03-04 15:43:23 +08:00
Damyon Wiese
267c4b4292 Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle 2014-03-04 13:29:03 +08:00
Dan Poltawski
f504e63daa Merge branch 'wip-MDL-44321-master' of git://github.com/marinaglancy/moodle 2014-03-03 13:50:18 +08:00
Dan Poltawski
a8b07dbf98 Merge branch 'wip-MDL-44362-master' of git://github.com/marinaglancy/moodle 2014-03-03 13:33:40 +08:00
Maria Torres
dc8f55c302 MDL-43916 - Email addresses incorrectly displayed
When capabilities and settings do not allow it.
2014-03-03 10:35:00 +08:00
Sam Hemelryk
01773a6d00 MDL-44180 mod_quiz: unified @package use 2014-03-03 08:37:06 +13:00
Tim Hunt
b111c177f0 MDL-43749 quiz DB tables. Put install.xml in a more logical order.
All settings tables before all user data.
2014-03-02 10:01:22 +01:00
Tim Hunt
ccba5b8805 MDL-43749 normalise quiz database structure.
The sequence of questions that made up a quiz used to be stored as a
comma-separated list in quiz.questions. Now the same information is
stored in the rows in the quiz_slots table. This is not just 'better' in
a database design sense, but it allows for the future changes we will
need as we enhance the quiz in the MDL-40987 epic.

Having changed the database structure, all the rest of the code needs to
be changed to account for it, and that is done here.

Note that there are not many unit tests for the changed bit. That is
because as part of MDL-40987 we will be changing the code further, and
we will add unit tests then.
2014-03-02 10:00:40 +01:00
Marina Glancy
21d2280361 MDL-44362 recentactivity: fix regressions from MDL-44055 2014-02-28 16:39:32 +08:00
Marina Glancy
cd5be9a504 MDL-44321 events: make sure the full object is passed to add_record_snapshot() 2014-02-28 16:37:36 +08:00
Tim Hunt
73465743f9 MDL-44278 Quiz time overrides: use the same step everywhere.
On the main form, you could select to the nearest minute. On
the override form you could only select to the nearest 5 minutes.
2014-02-28 08:58:58 +01:00
David Monllao
8aff0eec9d MDL-43738 behat: Refactoring the field type guesser
The previous behaviour delegates the responsability
of overwriting the 3 public methods to the child
classes, now the field type or moodleform field is
guessed earlier in the execution flow.

Other changes introduced here:
- Fix wrong moodleform detection when there is a form
  in the page but the field we are dealing with is
  not inside it.
- Updating the last week feature files to these new
  step definitions.
- Some coding style changes.
2014-02-27 18:43:20 +08:00
Damyon Wiese
a18c3591c6 MDL-40619 mod_quiz: Remove commented non-js behat scenario 2014-02-25 11:02:03 +08:00
Damyon Wiese
fce9daa806 Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle 2014-02-25 10:53:09 +08:00
James Pratt
99caa248a8 MDL-43478 quiz responses report : display last / first / all tries
when using multiple try question behaviour
2014-02-23 13:39:08 +07:00
Damyon Wiese
6071a209fe Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
Conflicts:
	version.php
2014-02-19 09:08:42 +08:00
Tim Hunt
30de48d285 MDL-44118 drop old quiz/question attempt data.
This data should all have been upgraded when moving to Moodle 2.1. It
was only kept as a back-up, and now, after 3 years have past, we can
clean it up.
2014-02-18 11:55:26 +00:00
Damyon Wiese
d306807e02 Merge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle 2014-02-18 10:16:15 +08:00
Damyon Wiese
a0cb27f72a Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle 2014-02-17 16:08:50 +08:00
Damyon Wiese
9e72fa97a9 Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle 2014-02-17 15:32:45 +08:00
Damyon Wiese
1265a7c4c5 Merge branch 'MDL-41758-master' of git://github.com/jamiepratt/moodle 2014-02-17 15:04:05 +08:00