46564 Commits

Author SHA1 Message Date
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
Tim Hunt
3d0b815cb1 MDL-20636 Try to allow Opaque questions to work in deferred feedback mode, if they want. 2011-02-09 20:18:00 +00:00
Tim Hunt
a31689a4eb MDL-20636 Recent bug fix. 2011-02-09 20:17:35 +00: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
0fafed0f09 MDL-20636 Finish making ddwtos work, mostly. Also various other JS fixes.
This JavaScript really needs to be rewritten to use YUI3.
2011-02-02 19:03:38 +00:00
Petr Skoda
eef3578af0 weekly release 2011-02-02 14:10:02 +01:00
Petr Skoda
260d857de3 MDL-25834 revert unresolved PULL-174 2011-02-02 14:03:44 +01:00
Petr Skoda
e27b5b6b29 Merge branch 'MDL-26237' of git://github.com/stronk7/moodle 2011-02-02 13:49:16 +01:00
Eloy Lafuente (stronk7)
bd654f0ced MDL-26237 code coverage - prevent execution of not used stuff 2011-02-02 11:21:01 +01:00
Petr Skoda
5a6094137d MDL-25942 fix another Oracle compatibility issue 2011-02-02 09:59:56 +01:00
Dan Marsden
db1f94ce4e MDL-26201 fix Lang - Thanks Petr 2011-02-02 09:23:24 +01:00
Petr Skoda
ffcb837973 MDL-26177 compare 255 chars when checking custom field uniqueness 2011-02-02 09:15:42 +01:00
Sam Hemelryk
78f0f64d47 blog MDL-25981 PULL-162 Removed typehinting in blog after changed from stdClass to cm_info 2011-02-02 10:37:33 +08:00
Tim Hunt
706d06e29b MDL-20636 ddwtos and gapselect qtypes now very nearly work.
Todo rendering questions with files, and ddwtos javascript.
2011-02-01 23:44:40 +00:00
Petr Skoda
af0a06cb5a MDL-26177 fix non-working unique custom field check 2011-02-01 14:34:31 +01:00
Tim Hunt
9a9e776c55 MDL-20636 Now all the unit tests for the the ddwtos and gapselect qtypes pass. 2011-02-01 11:40:29 +00: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
4714815123 MDL-25981 fix inverted instanceof in require_login 2011-01-31 22:35:17 +01:00
Petr Skoda
d6f4508c36 MDL-25981 add missing global DB when fetching course modinfo 2011-01-31 22:23:34 +01:00
Petr Skoda
d4fb0e26e2 MDL-25981 make sure cm is defined 2011-01-31 22:19:36 +01:00
Eloy Lafuente (stronk7)
eb183178c8 Merge branch 'w05_MDL-26034_20_myprofile' of git://github.com/skodak/moodle 2011-01-31 20:10:27 +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
Tim Hunt
5258903e7f MDL-20636 More work on the ddwtos and gapselect qtypes.
Now there are no longer fatal errors that break other qtypes, but these two qtypes still not work completely. More to come.
2011-01-31 18:07:38 +00:00
Eloy Lafuente (stronk7)
9f58e26db6 Merge branch 'w05_MDL-26046_20_noemailever' of git://github.com/skodak/moodle 2011-01-31 18:02:02 +01:00
Eloy Lafuente (stronk7)
e030faee3e Take out debugging & merge branch 'w05_MDL-26198_20_completion' of git://github.com/skodak/moodle 2011-01-31 17:43:22 +01:00
Eloy Lafuente (stronk7)
45289c3e79 Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle 2011-01-31 17:17:48 +01:00
Eloy Lafuente (stronk7)
b6a0ec4238 Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle 2011-01-31 16:17:13 +01:00
Eloy Lafuente (stronk7)
d98c661428 Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle 2011-01-31 16:02:51 +01:00
Eloy Lafuente (stronk7)
133a9b738e Merge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle 2011-01-31 16:01:02 +01:00
Eloy Lafuente (stronk7)
e89a57dc10 Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle 2011-01-31 15:34:40 +01:00
Eloy Lafuente (stronk7)
9700d6835d Merge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle 2011-01-31 15:17:33 +01:00
Eloy Lafuente (stronk7)
7164db694c Merge branch 'w05_MDL-26189_20_imse' of git://github.com/skodak/moodle 2011-01-31 14:57:22 +01:00
Petr Skoda
57d51199b7 Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle 2011-01-31 14:26:03 +01:00
Petr Skoda
8afc38bd39 Merge branch 'MDL-25708' of git://github.com/stronk7/moodle 2011-01-31 14:21:53 +01:00
Petr Skoda
6fde0dac70 MDL-26189 protect imsenterprise enrol file 2011-01-31 13:22:55 +01:00
Eloy Lafuente (stronk7)
43bbf28849 Merge branch 'w05_MDL-26182_20_nginx' of git://github.com/skodak/moodle 2011-01-31 12:33:16 +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