Commit graph

3480 commits

Author SHA1 Message Date
Dan Poltawski
0cf4e15baf Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle 2013-11-19 10:04:59 +08:00
Dan Poltawski
66a02845e9 Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle 2013-11-18 15:37:01 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
M Kassaei
0328341f97 MDL-42181 quiz nav: highight all buttons when all Qs on one page 2013-11-15 15:30:31 +00:00
Tim Hunt
c590848158 MDL-42880 quiz settings: remove unnecessary disabledif rules.
These rules were causing problems in the case where the form was
sumitted with validation errors. In that case, the During the attempt ->
The attempt checkbox was becoming unset, and hence the other During the
attmept checkboxes became disabled, and the values were not saved.

Thanks to Sam Marshall for suggesting this fix.
2013-11-15 15:09:25 +00:00
Tim Hunt
52b612f08b MDL-42504 quiz autosave: alert users if connection lost.
When the auto-save fails, we alert the user that they may have lost their
internet connection so that they don't do more work that they might just
lose.
2013-11-15 15:08:13 +00:00
Damyon Wiese
34b67813ec Merge branch 'MDL-42598' of git://github.com/timhunt/moodle 2013-11-13 13:43:52 +08:00
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
Adrian Greeve
f3fbb6137b MDL-42812 mod_quiz: Fixed up a syntax error for additional name fields. 2013-11-12 15:46:45 +08:00
Marina Glancy
c7ef597040 Merge branch 'MDL-42540' of git://github.com/timhunt/moodle 2013-11-12 14:47:54 +11:00
Adrian Greeve
e351bed5c1 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 11:30:16 +08:00
Eloy Lafuente (stronk7)
5d875d18e0 Merge branch 'MDL-40481' of git://github.com/timhunt/moodle 2013-11-12 00:38:35 +01:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
2013-11-11 11:01:14 +08:00
Dan Poltawski
f9dc4bd78b MDL-42704 quiz statistics: make test more tolerant 2013-11-08 11:11:31 +08:00
Dan Poltawski
379cbb459a Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle 2013-11-08 11:11:28 +08:00
Jamie Pratt
ec477ba1bb MDL-42704 quiz statistics : SQL Errors under MSSQL 2013-11-07 18:05:10 +07:00
Tim Hunt
a289a2b51c MDL-42540 quiz manual grading should have setType 2013-11-07 09:44:24 +00:00
Dan Poltawski
48fe93fa26 Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 17:17:32 +08:00
rwijaya
c544ee92f5 MDL-41615 quiz_mod: fix heading levels for usability and accessibility 2013-11-07 12:04:00 +08:00
Dan Poltawski
57d14266a8 Merge branch 'wip-mdl-42692' of https://github.com/rajeshtaneja/moodle 2013-11-07 11:23:11 +08:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/moodle.php
2013-11-07 09:34:31 +08:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
Rajesh Taneja
0507c33cad MDL-42692 Quiz: Fixed z-index for tab and marks
On edit quiz page marks/reorder text box has zindex set, which should be considered by modal
window. Also, tab set is also using zindex for active node.
2013-11-06 16:09:18 +08:00
Colin Campbell
6d2baaaea4 MDL-42640 quiz: Fix restore of backup without overduehandling setting
Use default quiz overduehandling setting when restoring a
backup from older Moodle version that does not have a quiz
overduehandling setting.
2013-11-06 16:32:15 +11:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Tim Hunt
94ffbef19a MDL-40481 quiz responses report needs cols need text_sorting 2013-11-05 14:13:53 +00:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
5e70fc1f9c Merge branch 'MDL-42548' of git://github.com/timhunt/moodle 2013-11-04 22:34:27 +08:00
Dan Poltawski
22379484fd Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle 2013-11-04 19:35:01 +08:00
Rajesh Taneja
5540b2caf3 MDL-41849 Quiz: Quiz send mail from noreply user
Mails should be send by noreply user and not admin user
2013-11-04 16:29:55 +08:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Tim Hunt
78a492330d MDL-41820 XSS in the quiz responses report.
Thanks to Michael Hess for finding this bug and reporting it to us.
2013-11-04 11:12:42 +08:00
Tim Hunt
d7db097db1 MDL-42598 quiz variant randomisation not random enough.
A student would get the same question variants (for example for a
calculated question) on their first attempt at both copies of a
duplicated quiz.
2013-10-29 16:19:24 +00:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Tim Hunt
6c7e553fc4 MDL-42548 quiz review: don't show grade for non-finished attempts.
Now we show the attempt state separately, so there is no need to show
Grade: Attempt still in progress - especially since we were showing that
for abandoned and overdue attempts which is just wrong.
2013-10-25 20:08:17 +01:00
Dan Poltawski
b2d08cad46 Merge branch 'MDL-42220-master' of git://github.com/ankitagarwal/moodle 2013-10-25 12:42:38 +08:00
Ankit Agarwal
b2b50d92f6 MDL-42219 quiz: Fix alternate name warnings in quiz
Fix the alternate name warning which is generated when submitting an attempt for a quiz
2013-10-23 14:36:00 +08:00
Ankit Agarwal
b469c5e750 MDL-42220 quiz: Fix name fields warning in quiz
Fix warnings generated when manually grading a quiz attempts
2013-10-23 14:21:15 +08:00
Dan Poltawski
0c7c5e767c Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle 2013-10-22 12:11:45 +02:00
Jamie Pratt
f16ed06c2c MDL-42115 exception when there are no questions 2013-10-16 19:40:04 +07:00
Tim Hunt
562684e3a0 MDL-42309 typo: fix reponse -> response throughout Moodle. 2013-10-15 13:47:27 +11:00
Tim Hunt
d3603928a9 MDL-42230 fix inconsistent quiz lang string.
This matches a change made to another string in MDL-32188.
2013-10-11 14:32:24 +01:00
Eloy Lafuente (stronk7)
8fe9bbde09 Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle 2013-10-09 01:29:17 +02:00
Eloy Lafuente (stronk7)
7d19bc1353 Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle 2013-10-08 21:25:46 +02:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 16:42:17 +08:00
Sam Hemelryk
cbf34f34cc Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
Conflicts:
	lib/db/upgrade.php
2013-10-08 14:43:36 +13:00
Sam Hemelryk
87f28ddceb Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle 2013-10-08 11:20:51 +13:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
2013-10-07 13:10:36 +02:00