3168 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
cf140de945 Merge branch 'MDL-38557' of git://github.com/timhunt/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-03-26 23:38:07 +01:00
Eloy Lafuente (stronk7)
b741fac308 Merge branch 'MDL-38651' of git://github.com/timhunt/moodle 2013-03-26 23:27:16 +01:00
Eloy Lafuente (stronk7)
d89eed6fca Merge branch 'MDL-38647' of git://github.com/timhunt/moodle 2013-03-26 23:22:25 +01:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
2013-03-22 16:57:55 +01:00
Tim Hunt
a7a031a4e4 MDL-38651 quiz settings: fix layout of review options. 2013-03-22 15:30:48 +00:00
Tim Hunt
2515be0e80 MDL-38647 quiz review question issues
1. Page URL should contain 'step=0' if necessary, but not 'step='.
2. Review specific step was not using the right display options.
2013-03-22 11:16:02 +00:00
Tim Hunt
7dbde4ed3b MDL-38557 quiz install.php code should actually be in reports.
I think it is worth moving this code to its correct home in master.
2013-03-22 10:36:15 +00:00
Tim Hunt
30461b0066 MDL-38557 quiz manual grading should check mod/quiz:grade 2013-03-22 10:36:14 +00:00
Tim Hunt
0559a72aa3 MDL-38557 fix quiz version number mess from MDL-31983 2013-03-22 10:36:13 +00:00
Tim Hunt
a4768fe290 MDL-38412 fix quiz reports group mode weirdness.
Moodle currently selected group uses the session. This can cause weird
effects when you have two tabs open. This is particularly weird in the
quiz reports, where some actions like delete attempt are checked against
the currently selected group.

The solution is to put the currently selected group into the URL for all
actions like delete/regrade attempt, regrade all attempts, download and
sort table.
2013-03-15 11:58:06 +00:00
Tim Hunt
f9e5471273 MDL-38337 quiz: respect maximum grade config for new quizzes. 2013-03-08 21:36:27 +00:00
Eloy Lafuente (stronk7)
641577eb32 Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle 2013-03-06 17:26:37 +01:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
Aparup Banerjee
045a4173b1 Merge branch 'MDL-38209' of git://github.com/timhunt/moodle 2013-03-05 17:14:02 +08:00
Tim Hunt
9fc29eec6d MDL-39282 quiz: always allow removal of bogus questions. 2013-03-01 17:33:32 +00:00
Tim Hunt
ae271eba1f MDL-38209 quiz CSS: strip browser-specific rules. 2013-02-28 18:33:45 +00:00
Tim Hunt
c04ed8d51c MDL-38209 quiz CSS: fix coding style. 2013-02-28 18:33:45 +00:00
Eloy Lafuente (stronk7)
36650d6f51 Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle 2013-02-26 10:14:28 +01:00
Eloy Lafuente (stronk7)
3b00c13bf1 MDL-37894 Amend tests with new openclose rule. 2013-02-20 01:36:20 +01:00
Eloy Lafuente (stronk7)
b70a3b7106 Merge branch 'MDL-38093' of git://github.com/timhunt/moodle 2013-02-20 00:44:54 +01:00
Eloy Lafuente (stronk7)
f1b011d3a8 Merge branch 'MDL-37894' of git://github.com/timhunt/moodle 2013-02-20 00:39:44 +01:00
Tim Hunt
e58b2c326b MDL-38093 quiz settings: make overall feeback editors collapsible. 2013-02-18 18:13:51 +00:00
Tim Hunt
6e78a7bdb4 MDL-37894 Show the quiz close date even if the quiz is not open yet.
People care a lot about deadlines!
2013-02-18 10:27:37 +00:00
Frederic Massart
2d10823a7c MDL-38076 usability: Fix wrong position of new 2.4 icons 2013-02-18 09:40:49 +08:00
Frederic Massart
ebd9ae6523 MDL-31983 navigation: Move reports from Navigation to Settings 2013-02-15 13:06:26 +08:00
Tim Hunt
b4be77c570 MDL-37924 quiz settings: change wrong 'fix' => 'adv'. 2013-02-12 13:36:54 +08:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files
YAY!
2013-01-29 22:34:46 +01:00
Dan Poltawski
5d80fc80c0 Merge branch 'MDL-37694' of git://github.com/timhunt/moodle 2013-01-29 11:54:36 +08:00
Sam Hemelryk
58f828ca14 Merge branch 'wip-MDL-29723_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:35:04 +13:00
Tim Hunt
e389874d19 MDL-37694 move quiz unit tests to the right place.
Follow-on from MDL-37684.
2013-01-25 12:12:12 +00:00
Mary Evans
bd5d8b5041 MDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS rules to styles.css to make Question bank block more compatible/adaptable with themes. 2013-01-22 16:17:11 +00:00
Aparup Banerjee
8b042b1cc8 Merge branch 'MDL-37583' of git://github.com/timhunt/moodle 2013-01-22 11:37:24 +08:00
Eloy Lafuente (stronk7)
ea4edbd6bc Merge branch 'MDL-37577' of git://github.com/timhunt/moodle 2013-01-21 20:01:39 +01:00
Tim Hunt
805e32f74e MDL-37577 quiz overdue handling: optimise database query
This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.
2013-01-21 13:21:38 +00:00
Dan Poltawski
73ce4ac996 Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle 2013-01-21 10:53:12 +08:00
Tim Hunt
283cbd825c MDL-37583 quiz statistics report. Delete junk code. 2013-01-18 14:43:17 +00:00
Dan Poltawski
864ff70c74 Merge branch 'MDL-36534' of git://github.com/timhunt/moodle 2013-01-15 14:44:28 +08:00
David Monllao
5c3c2c81be MDL-37457 testing Refactoring references 2013-01-15 11:07:43 +08:00
Tim Hunt
5574862063 MDL-36534 question editing: clean up lang strings.
There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END
2013-01-14 14:52:49 +00:00
Tim Hunt
816138b4f2 MDL-37378 quiz restore: timecheckstate not in old backups.
We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.
2013-01-11 13:17:13 +00:00
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
Thanh Le
d18f78b046 MDL-35794 quiz: config for whether Outcomes are advanced settings 2012-12-22 17:38:45 +00:00
Eloy Lafuente (stronk7)
cbef51f54b Merge branch 'MDL-36842' of git://github.com/timhunt/moodle 2012-12-18 00:17:51 +01:00
Tim Hunt
4475b0ff63 MDL-36842 quiz: update accessrule upgrade.txt file in master. 2012-12-17 17:02:21 +00:00
Joseph Rezeau
26efb4888f MDL-37114 quiz form validation: feedback boundaries.
The feedback boundaries must either be a number or a percentage.
We were not correctly validating the non-percentage case.
2012-12-15 10:44:51 +00:00
Dan Poltawski
aa3258d586 Merge branch 'MDL-36897' of git://github.com/timhunt/moodle 2012-12-13 09:54:17 +08:00
Tim Hunt
0fe1b50c29 MDL-36897 quiz review: fixup previous commit. 2012-12-12 08:12:16 +00:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski
70f4fddae5 Merge branch 'MDL-37098' of git://github.com/timhunt/moodle 2012-12-11 17:51:50 +08:00
Tim Hunt
1744033ccb MDL-37098 quiz: event handler fails deleting group with no overrides
This was a regression from MDL-35717.
2012-12-11 09:06:19 +00:00