Commit graph

11225 commits

Author SHA1 Message Date
Tim Hunt
b2607ccc19 MDL-20636 Now the quiz review page works. 2011-02-09 20:18:24 +00:00
Tim Hunt
167f1562f8 MDL-20636 Merge and fix quiz unit tests. 2011-02-09 20:18:21 +00:00
Tim Hunt
8f37f7fb7a MDL-20636 It is now possible to submit a page of the quiz, and view the summary page. 2011-02-09 20:18:18 +00:00
Tim Hunt
a1eb3a4466 MDL-20636 It is now possible to start a quiz attempt.
This includes merging the CSS.
2011-02-09 20:18:15 +00:00
Tim Hunt
7c5bd5bfab MDL-20636 Working towards being able to attempt a quiz. 2011-02-09 20:18:12 +00:00
Tim Hunt
48f1784a16 MDL-20636 Quiz view page now works. 2011-02-09 20:18:09 +00:00
Tim Hunt
f255782339 MDL-20636 You can now create a quiz, and edit the settings.
Little else works, but this is just the first step.
2011-02-09 20:18:06 +00:00
Tim Hunt
25302dee78 MDL-20636 Started work converting the quiz. 2011-02-09 20:18:03 +00:00
Eloy Lafuente (stronk7)
cd03ecce8e Merge branch 'MDL-24870_rss_error' of git://github.com/andyjdavis/moodle 2011-02-08 10:21:55 +01:00
Petr Skoda
f2f45270ee Merge branch 'MDL-26267' of git://github.com/samhemelryk/moodle 2011-02-07 23:07:16 +01:00
Eloy Lafuente (stronk7)
20ba9a2e47 Merge branch 'MDL-17357-duplicate-strings' of git://github.com/mudrd8mz/moodle 2011-02-07 15:53:15 +01:00
David Mudrak
d5b7f35d65 MDL-17357 Removed duplicate string definitions 2011-02-07 15:08:07 +01:00
Sam Hemelryk
0032523aed Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle 2011-02-07 17:58:12 +08:00
David Mudrak
32ea207a48 MDL-26298 Workshop: fixed trivial typos in phpDoc blocks 2011-02-07 10:49:34 +01:00
David Mudrak
d239b952a5 MDL-26296 Workshop: trivial change in manual allocator CSS
When only two rows of the allocations table are displayed with the new
allocation highlighted, it is better not highlight the odd row.
2011-02-07 10:49:30 +01:00
Sam Hemelryk
9cb70adc33 Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle 2011-02-07 16:20:02 +08:00
Sam Hemelryk
dedda4abc3 Merge branch 'MDL-26272' of git://github.com/stronk7/moodle 2011-02-07 16:03:27 +08:00
Sam Hemelryk
89652edd6c Merge branch 'MDL-26242' of git://github.com/timhunt/moodle 2011-02-07 15:13:53 +08:00
Sam Hemelryk
1ca95a13f3 Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle 2011-02-07 14:01:00 +08:00
Sam Hemelryk
2addb4ba1b mod-workshop MDL-26267 workshop_extend_navigation argument 4 is now always going to be a cm_info object 2011-02-07 13:20:09 +08:00
Charles Fulton
9250bf8172 MDL-26238 remove deprecated second parameter from groups_get_group() calls 2011-02-06 18:15:36 +01:00
Eloy Lafuente (stronk7)
195a0848ec MDL-26272 ratings - fix uses breaking after last modinfo changes 2011-02-04 17:30:51 +01:00
David Mudrak
51abc39695 MDL-26188 Workshop: get rid of a method that is not used anyway
The protected method get_allocations_recordset() is a relict from
earlier development phases of Workshop module. Removing it as it
confuses recent Eloy's recordset usage detection tool.
2011-02-04 14:33:48 +01:00
andyjdavis
3ad3f24808 rss MDL-24870 fixed the capability checks to access module rss feeds 2011-02-04 10:27:52 +08:00
Tim Hunt
74c479f212 MDL-20636 Merge branch 'master' into qe2_wip
Conflicts:
	lib/questionlib.php
	question/type/calculated/lang/en/qtype_calculated.php
	question/type/questiontype.php
2011-02-03 11:18:40 +00:00
Tim Hunt
5f11e00db1 MDL-26242 quiz reports. No students in course => get_in_or_equal doesn't like empty arrays error 2011-02-02 16:40:14 +00:00
Dongsheng Cai
08a7fbb027 mod-data MDL-25671 disable editor in data list template editor will not save the changes 2011-02-02 22:17:15 +08:00
Dan Marsden
db1f94ce4e MDL-26201 fix Lang - Thanks Petr 2011-02-02 09:23:24 +01:00
Eloy Lafuente (stronk7)
909d2b8f63 MDL-25791 quiz - bump version 2011-02-01 09:37:36 +01:00
Eloy Lafuente (stronk7)
278de0eb52 Merge branch 'MDL-25791_20_quizdb_rev1' of git://github.com/samhemelryk/moodle 2011-02-01 09:35:49 +01:00
Sam Hemelryk
16da818528 mod-quiz MDL-25791 Fixed database discrepancies between a fresh install and an upgraded site within the Quiz module 2011-02-01 12:54:16 +08:00
Eloy Lafuente (stronk7)
12fc00c951 Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle 2011-02-01 01:53:47 +01:00
Petr Skoda
46df3c6059 Merge branch 'MDL-25981' 2011-01-31 22:44:17 +01:00
Petr Skoda
b6f3e4f8f0 Merge branch 'MDL-26098' of git://github.com/timhunt/moodle 2011-01-31 19:25:41 +01:00
Eloy Lafuente (stronk7)
9de8515b2e MDL-26201 scorm & js - CSS changes => version bump 2011-01-31 19:23:31 +01:00
Eloy Lafuente (stronk7)
8e1ad9c60f Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle 2011-01-31 19:14:55 +01:00
Petr Skoda
8afc38bd39 Merge branch 'MDL-25708' of git://github.com/stronk7/moodle 2011-01-31 14:21:53 +01:00
Sam Hemelryk
2b1f6ced64 Merge branch 'MDL-26178' of git://github.com/timhunt/moodle 2011-01-31 17:47:30 +08:00
Dan Marsden
334d8b94f5 SCORM MDL-25850 - check for viewscores cap before adding score to toc 2011-01-31 17:38:01 +08:00
Sam Hemelryk
1f5a33439e Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle 2011-01-31 17:16:56 +08:00
Sam Hemelryk
dfc05681f2 Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle 2011-01-31 17:06:53 +08:00
Sam Hemelryk
8dadee2499 Merge branch 'MDL-21250-capitalized_strings' of git://github.com/mudrd8mz/moodle 2011-01-31 13:05:09 +08:00
Dan Marsden
30bce58eb9 SCORM MDL-26201 setting to allow admin to force users to enable JS in their browser before allowing them to view/use SCORM objects. 2011-01-31 16:53:10 +13:00
Tim Hunt
3fa5724a1f javascript MDL-26098 manual grading was not working when quiz_attempts.id and question_attempts.id were out of synch. 2011-01-29 14:03:02 +00:00
Tim Hunt
3708abd0f2 javascript MDL-26098 make the review this question in a previous state popup work. 2011-01-29 13:59:51 +00:00
Tim Hunt
2cb01c9205 mod_quiz MDL-26178 it let you try to preview a quiz with several empty pages.
You should not be allowed to preview an empty quiz, to make it correctly detect this case.
2011-01-29 12:11:10 +00:00
Dan Marsden
39340358b4 MDL-26176 - cleanup garbage/pointless code 2011-01-29 21:27:12 +13:00
Dan Marsden
7cc7cf58f5 SCORM MDL-25781 fix links in TOC on view.php 2011-01-29 21:27:12 +13:00
Dan Marsden
08868f58e4 SCORM MDL-25781 fix links in TOC on view.php 2011-01-29 21:25:26 +13:00
Helen Foster
82b15e2811 MDL-21250 capital letters removal
Also some spotted leading and trailing whitespace was removed from some
strings.
2011-01-27 16:24:30 +01:00