Commit graph

12183 commits

Author SHA1 Message Date
Dan Poltawski
efff2ab77f Merge branch 'MDL-32430' of git://github.com/timhunt/moodle 2012-05-07 12:48:18 +08:00
Dan Poltawski
deda57ae1a Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:37:09 +08:00
Dan Poltawski
defbe24610 Merge branch 'MDL-32772-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:34:06 +08:00
Damyon Wiese
9f91316495 MDL-32781: assignfeedback_comments plugin not loading previous comments
Was setting the wrong field names in the form.
2012-05-07 12:15:08 +08:00
Damyon Wiese
cfc81f03c5 MDL-32813: Change mod_assign settings to use plugin settings table.
Also move the 'default' setting for each plugin into it's own settings file
so that it is handled properly on new installs.
(ensure the plugin is available at setting time)
Also make the file submission plugin on by default
2012-05-07 11:49:15 +08:00
Damyon Wiese
8ab7bb9f56 MDL-32768: mod_assign - Change plugin constants to use correct prefix for component 2012-05-07 10:59:07 +08:00
Damyon Wiese
a3dbdc2c03 MDL-32772: Change SQL for mod_assign gradingtable to use named query parameters
This makes it consistent with the built in filtering in flexible_table.

Fix additional issue with SQL for grading table when there are no enrolled users

Change SQL for mod_assign grading table to use get_in_or_equal
As Suggested by Andrew Nicols in tracker
2012-05-07 10:45:23 +08:00
Christopher Tombleson
1273dde9f7 MDL-30598 SCORM api.php moved to loaddatamodel.php
Merged api.php into loaddatamodel.php. Changed all references to api.php
to point at loaddatamodel.php
2012-05-07 14:41:57 +12:00
Petr Skoda
411fd747cf MDL-32735 fix multiple E_STRICT feedback issues 2012-05-06 12:02:54 +02:00
Petr Skoda
0209f96485 MDL-32762 fix E_STRICT issue in forum 2012-05-06 10:54:37 +02:00
Tim Hunt
26d9ee4ee9 MDL-31854 quiz grades report: move total grade closer to names. 2012-05-04 17:41:25 +01:00
Tim Hunt
8180ee2360 MDL-32430 quiz calendar events: fix pluginfile URLs in the description. 2012-05-04 15:17:23 +01:00
Tim Hunt
9e83f3d11d MDL-32788 quiz: clean up codechecker issues before the 2.3 release. 2012-05-04 15:12:23 +01:00
Rex Lorenzo
4ff8dccccc MDL-32670 mod/chat: also added missing call to ->set_heading in report.php 2012-05-02 19:09:43 -07:00
Dan Poltawski
307621dfce Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle 2012-05-02 18:01:40 +08:00
David Mudrak
f08c15685b MDL-32638 fixing the area names and file_browser::get_file_info() API call
These two bug made the file browsing non-working in workshop 2.x
2012-05-02 11:39:30 +02:00
Tim Hunt
9ab9f9feb7 MDL-32721 quiz: missing message provider lang string from MDL-3030 2012-05-02 08:19:10 +01:00
Sam Hemelryk
fe9693df87 Merge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/moodle 2012-05-02 11:48:24 +12:00
Dan Poltawski
6b445cb17a Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle 2012-05-01 11:27:16 +08:00
Dan Poltawski
35a1c03448 Merge branch 'MDL-27508-workshop-groups' of git://github.com/mudrd8mz/moodle 2012-05-01 11:16:20 +08:00
Sam Hemelryk
4bbefa1c19 Merge branch 'w18_MDL-32640_m23_forumstrict' of git://github.com/skodak/moodle 2012-05-01 13:26:53 +12:00
Sam Hemelryk
16fd605208 MDL-32012 Fixed white space 2012-05-01 12:38:37 +12:00
Sam Hemelryk
2dcc93644f Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle 2012-05-01 12:37:59 +12:00
Tim Hunt
59d14f31bd Improve the wording of overdue messages. Thanks Phil. 2012-04-30 13:46:02 +01:00
Davo Smith
32528f94e4 MDL-22504 Drag and drop upload course - enables upload of files, text and urls to a course page 2012-04-30 09:53:25 +01:00
Dan Poltawski
bc24339e00 Merge branch 'MDL-32357' of git://github.com/timhunt/moodle 2012-04-30 14:29:40 +08:00
Dan Poltawski
fdf26a0ec0 MDL-3030 mod_quiz: fix training whitespace 2012-04-30 11:05:29 +08:00
Dan Poltawski
c1bb7a6f39 Merge branch 'MDL-3030' of git://github.com/timhunt/moodle 2012-04-30 11:05:19 +08:00
Sam Hemelryk
21f7b01d19 Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle 2012-04-30 13:26:38 +12:00
Sam Hemelryk
bc0be2fb80 Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle 2012-04-30 12:16:35 +12:00
Sam Hemelryk
c547c7c784 Merge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle 2012-04-30 11:57:40 +12:00
Tim Hunt
df710f84d0 MDL-32357 Try to fix unread post notification for blog-style forums.
I know that showing unread posts is not 100% blog-style, but I think
it is useful functionality, therefore, I chose to fix it, rather than,
say, disable it completely.

I think this fix will only affect blog-style forums since
forum_print_latest_discussions is only called with mode 'plain' in
three places:
1. Blog-style forums - the case we want to fix,
2. Site news forum, and
3. Social course format.

In all cases, having read tracking work properly seems like the
right thing to do.
2012-04-28 18:57:05 +01:00
Petr Skoda
99302c5e96 MDL-26028 cleanup all IE6 gzip hacks 2012-04-28 18:00:06 +02:00
Rex Lorenzo
a9ce6b1f8d MDL-32670 mod/chat: added missing call to $PAGE->set_heading 2012-04-27 15:58:16 -07:00
Eric Merrill
4eef1c2e14 MDL-32012 resource: flaw in restore from moodle 1.9 backups 2012-04-27 16:16:00 -04:00
Tim Hunt
b640e6815a MDL-3030 quiz overdue handling: allow access to summary during grace period 2012-04-27 15:07:43 +01:00
Tim Hunt
2512341872 MDL-3030 quiz statistics: fix stict syntax problem. 2012-04-27 15:07:42 +01:00
Tim Hunt
e1bf1619e1 MDL-3030 quiz overdue handling: cron to update overdue attempts. 2012-04-27 15:07:41 +01:00
Tim Hunt
be18f589e2 MDL-3030 quiz overdue handling: test state, not timefinish where applicable. 2012-04-27 15:07:40 +01:00
Tim Hunt
3e77b60f36 MDL-3030 quiz overdue handling: ignore responses received much too late. 2012-04-27 15:07:38 +01:00
Tim Hunt
fd0537ce36 MDL-3030 quiz overdue handling: catch the overdue event and send message. 2012-04-27 15:07:37 +01:00
Tim Hunt
a403bce0bd MDL-3030 quiz overdue handling: back-end code for the new transitions 2012-04-27 15:07:36 +01:00
Tim Hunt
34b7d8383d MDL-3030 quiz overdue handling: trigger automatic state transitions.
Here, we catch all the places where a student might be accessing their
own attempts, and make sure any automatic state transitions that
should happen, do happen, before the student sees the attempt.

The places where we need to check this are view.php, startattempt.php
and processattempt.php.

We do not really need to check attempt.php or summary.php, because if
the student is on one of those pages, the JavaScript timer will
auto-submit when time expires, taking them to processattempt.php,
which will do the acutal work.

We intentionally do not trigger state transition when a teacher is
looking at a student's quiz attemp. We will trigger state transitions
on cron, but that is still to do.

Also, the body of the process_... methods still needs to be written.
2012-04-27 15:07:35 +01:00
Tim Hunt
863872e3e7 MDL-3030 quiz overdue handling: show the attempt state in the reports. 2012-04-27 15:07:33 +01:00
Tim Hunt
2cdd2df92d MDL-3030 quiz overdue handling: only finished attempts in stats. 2012-04-27 15:07:32 +01:00
Tim Hunt
c547514a9e MDL-3030 quiz overdue handling: show attempt state in the reports. 2012-04-27 15:07:31 +01:00
Tim Hunt
b39b5d77c3 MDL-3030 quiz overdue handling: show attempt state on the review page. 2012-04-27 15:07:30 +01:00
Tim Hunt
2b2b645842 MDL-3030 quiz overdue handling: display message on the summary page.
This change also includes a clean-up of how we display and initialise the countdown timer.
2012-04-27 15:07:29 +01:00
Tim Hunt
2de9be52aa MDL-3030 quiz overdue handling: show attempt state on the view page 2012-04-27 15:07:27 +01:00
Tim Hunt
fd55f4bf49 MDL-3030 quiz overdue handling: backup and restore new settings. 2012-04-27 15:07:26 +01:00