Commit graph

12902 commits

Author SHA1 Message Date
Aparup Banerjee
7183a1f4a4 Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues."
This reverts commit 0e708c3476.

note : there is another commit prefixed with MDL-34257 hash 'ddda79c' which was really for MDL-34187. 'ddda79c' is not being reverted as its not really about MDL-34257.
2012-09-06 17:35:40 +08:00
Dan Marsden
81f460b1e2 MDL-33755 SCORM only auto-skipview for users with skipview cap that can't see reports
also don't generate unrequired content when scorm will be launched automatically.
2012-09-06 20:30:37 +12:00
Piers Harding
35cfa9e62c MDL-33755 mod/scorm: directview scorm activity
Enable direct view of scorm activity from the course
overview page

Conflicts:

	mod/scorm/view.js
2012-09-06 20:28:42 +12:00
Dan Marsden
122878590a MDL-35123 SCORM: cleaner version of get_last_attempt and get_last_completed_attempt, fixes support for MS Sql driver 2012-09-06 18:42:55 +12:00
Eloy Lafuente (stronk7)
37a74d1e28 Merge branch 'MDL-27799' of git://github.com/timhunt/moodle 2012-09-06 01:29:04 +02:00
Eloy Lafuente (stronk7)
393cadf205 MDL-29662 quiz overrides: use proper course value (was php notice). 2012-09-05 18:01:24 +02:00
Dan Marsden
c792565b9d MDL-35255 mod_assign plagiarism api shift update_status call to after header has been printed. 2012-09-05 12:44:18 +12:00
Tim Hunt
0e708c3476 MDL-34257 quiz 'secure' mode: PAGE initialisation order issues. 2012-09-04 11:39:38 +08:00
Aparup Banerjee
8f8e28c0b6 Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle 2012-09-04 11:38:11 +08:00
Simon Coggins
02ed0df5ae MDL-34755 SCORM: pop-up not loading in IE7/IE8 compat mode 2012-09-04 13:11:22 +12:00
Eloy Lafuente (stronk7)
259208e0ab MDL-31295 assign: fix comments in upgrade code. 2012-09-04 01:27:49 +02:00
Eloy Lafuente (stronk7)
7ef0d527b2 Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-04 01:20:55 +02:00
Eloy Lafuente (stronk7)
b448cf475e Merge branch 'MDL-29662' of git://github.com/timhunt/moodle 2012-09-04 01:14:06 +02:00
Dan Marsden
cfa5063777 MDL-35208 mod_choice: respect order of options when running backup 2012-09-04 11:01:06 +12:00
Eloy Lafuente (stronk7)
a39c97ca4a Merge branch 'MDL-33306' of git://github.com/timhunt/moodle 2012-09-04 00:30:35 +02:00
Eloy Lafuente (stronk7)
bf14738ea1 Merge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle 2012-09-04 00:05:52 +02:00
Eloy Lafuente (stronk7)
efca150b15 Merge branch 'MDL-31973-master-7' of git://git.luns.net.uk/moodle 2012-09-03 15:49:50 +02:00
Martin Vögeli
2d0e682d8b MDL-31365 Fix for safebrowser and securewindow 2012-09-03 07:25:30 +02:00
Damyon Wiese
b98824c219 MDL-31291: Fix a warning on the assignment summary page. 2012-09-03 12:20:39 +08:00
Damyon Wiese
88cfe46998 MDL-31291: Do not show students names who have not submitted when blind marking is enabled. 2012-09-03 11:11:16 +08:00
Damyon Wiese
b473171a6f MDL-31291: Blind marking feature for mod_assign 2012-09-03 11:11:16 +08:00
Damyon Wiese
dd1fe178eb MDL-31284: Fix for plugin summary display in grading table with team submissions 2012-09-03 11:10:03 +08:00
Damyon Wiese
cd01491c11 MDL-31284: Backported team assignment fixes from stable branch 2012-09-03 10:54:14 +08:00
Damyon Wiese
12a1a0da2f MDL-31284: New feature for mod_assign: Team assignments 2012-09-03 10:54:07 +08:00
Damyon Wiese
9e795179ad MDL-31295: Allow granting individual extension dates to students for mod_assign 2012-09-03 10:08:47 +08:00
Dan Marsden
eb93ee27b3 MDL-34544 - assign - document assessable_ events 2012-09-03 13:45:51 +12:00
Kanika Goyal
d37781a529 MDL-34544: Plagiarism API - add support for control of drafts to new assign 2012-09-03 13:11:16 +12:00
Sam Hemelryk
c367e7fe4e Merge branch 'MDL-31496_master' of git://github.com/dmonllao/moodle 2012-09-03 12:20:38 +12:00
Eloy Lafuente (stronk7)
1c3b1f7aee MDL-35147 lesson qformat import: Dirty hack to support array questiontext structures. 2012-08-31 03:02:53 +02:00
Tim Hunt
e231a3ffa2 MDL-27799 question bank: remove last traces of qtype constants.
Using consants to refer to plugin names is crazy. The whole point of
plugins is that you can install more, hence the list of constants will
never be complete.
2012-08-30 13:15:52 +01:00
Tim Hunt
bba5e71628 MDL-35147 lesson: fix regression from MDL-25492.
I really wish someone would fix lesson to use the question bank.
2012-08-30 13:09:10 +01:00
Tim Hunt
2079c732f9 MDL-29662 quiz overrides: update dates during course reset.
Also, fix duplicate SQL clause in similar code in lib,
and fix error when saving overrides.
2012-08-29 18:41:37 +01:00
Tim Hunt
89269fc2c8 MDL-33306 qtype multichoice: fix display of right answer.
Also, fix  higlighing of last edited question in the qeustion bank, when
it co-incides with a grey row.
2012-08-29 17:47:48 +01:00
David Mudrák
b615c46821 MDL-34725 Make the signatures of process_legacy_element() method consistent
The patch fixes the missing parameter type declaration in all subclasses
of the moodle1_workshopform_handler class.
2012-08-29 15:35:37 +02:00
Eloy Lafuente (stronk7)
c63efc9a6b Merge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle 2012-08-29 12:14:46 +02:00
Andrew Robert Nicols
b677b83d57 MDL-31973 Remove inadvertantly committed function call from testing 2012-08-29 09:22:11 +01:00
Aparup Banerjee
8df0008856 Merge branch 'MDL-34952_master' of git://github.com/grabs/moodle 2012-08-29 13:26:51 +08:00
Eloy Lafuente (stronk7)
238f7761af Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle
Conflicts:
	lib/db/upgrade.php
2012-08-29 00:42:43 +02:00
Eloy Lafuente (stronk7)
d970005273 Merge branch 'MDL-34192' of git://github.com/stronk7/moodle 2012-08-28 14:44:06 +02:00
Eloy Lafuente (stronk7)
dbd0529ae5 MDL-34192 mod_assign: prevent ambiguous column use for Oracle.
Credit goes to Raymond Antonio from NetSpot.
2012-08-28 14:16:15 +02:00
Aparup Banerjee
9455f48280 Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle 2012-08-28 11:45:11 +08:00
Eloy Lafuente (stronk7)
1edce590bd Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle 2012-08-27 18:17:55 +02:00
Eloy Lafuente (stronk7)
d324394594 Merge branch 'MDL-35038' of git://github.com/timhunt/moodle 2012-08-27 16:24:17 +02:00
Aparup Banerjee
889754ad31 Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle 2012-08-27 16:56:03 +08:00
Andreas Grabs
2c65cd8462 MDL-34996 - Improve help text for Feedback dependancies 2012-08-24 23:08:55 +02:00
Andreas Grabs
9b90584f43 MDL-34952 - change get_info() to public access 2012-08-24 21:56:45 +02:00
sam marshall
1d1917aeaa MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields 2012-08-24 15:30:13 +01:00
Raymond Wijaya
694b11ab4a MDL-35004: Fix 'can not create a new instance of the assignment module with no completion setting' 2012-08-24 14:45:01 +08:00
Raymond Wijaya
93c18e73c2 MDL-34660: Fix SQL error in assignments module with Oracle Database I by replacing 'offline' with 'nosubmissions' 2012-08-24 14:32:04 +08:00
Raymond Wijaya
a9b94affd4 MDL-34692: Fix the assignment submission agreement will not be visible if the submission statement is empty 2012-08-24 13:18:38 +08:00