Andrew Nicols
7545e84661
MDL-47877 mod_forum: Correct subscription options for forums
...
Test was the wrong way around when checking subscription state.
2014-10-28 15:57:12 +08:00
Marina Glancy
45b7a397bb
Merge branch 'MDL-46215-master-fixes' of git://github.com/andrewnicols/moodle
2014-10-28 15:37:05 +08:00
Andrew Nicols
79b4fb1282
MDL-46215 mod_forum: Only add text on discussion view
...
Do not show the status text in the thread list.
2014-10-28 14:27:05 +08:00
Andrew Nicols
1d8e8494bf
MDL-47918 mod_forum: Unsubscribe all - remove discussion subscriptions
2014-10-28 13:29:51 +08:00
Marina Glancy
f173ae2014
Merge branch 'MDL-814-master' of git://github.com/danpoltawski/moodle
2014-10-28 12:23:23 +08:00
Sam Hemelryk
77b31ba2ce
Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle
2014-10-28 14:02:19 +13:00
Juan Leyva
f47eeafdfd
MDL-47916 web services: Fixed invalid returned value type
2014-10-27 23:14:13 +01:00
Ray Morris
9f56cc3794
MDL-47902 mod_scorm: Inappropriate default values for SCORM 1.3 variables
2014-10-27 15:06:42 -05:00
Dan Poltawski
f3206dfc36
MDL-814 forum: provide cancel button when posting
...
This is the way to clear atto drafts
2014-10-27 16:44:47 +00:00
Dan Poltawski
b5780fbd18
Merge branch 'MDL-46215-master' of git://github.com/andrewnicols/moodle
2014-10-27 14:51:04 +00:00
Andrew Nicols
d5653c6968
MDL-47898 mod_quiz: Correct path when checking content_editable
...
Addresses a number of issues when using the text editor in a quiz using
secure mode.
2014-10-27 19:23:56 +08:00
Andrew Nicols
517e17826b
MDL-46215 mod_forum: Improve style of subscription state
...
With the implementation of per-discussion subscription, the current
discussion's subscription state must be shown.
Since this state belongs to the discussion rather than the forum, it
should be shown accordingly. This change therefore includes the addition
of the discussion name as a heading on the page.
2014-10-27 12:37:05 +08:00
Marina Glancy
a8668e161a
Merge branch 'MDL-47882_scorm_loadsco_invalid_html' of git://github.com/MorrisR2/moodle
2014-10-27 11:52:18 +08:00
Damyon Wiese
d2dbc373f8
Merge branch 'MDL-47690-master' of git://github.com/jleyva/moodle
2014-10-27 11:11:53 +08:00
Ray Morris
a53bf3a031
MDL-47882 SCORM: invalid HTML in loadSCO.php
2014-10-24 16:45:32 -05:00
Dan Poltawski
42b6b39136
Merge branch 'MDL-46088-master' of git://github.com/timhunt/moodle
2014-10-24 17:10:56 +01:00
Dan Poltawski
cb1bc5eb6b
Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle
2014-10-24 15:37:26 +01:00
Frederic Massart
20942dd702
MDL-47397 assignfeedback_editpdf: Copy stamps to other students in team
...
During a team submission the stamps were attached to the user that
was graded and not to the other users. This could lead to errors when
generating the PDF for each user.
2014-10-24 15:09:06 +01:00
Frederic Massart
47ff1cd93b
MDL-47397 assignfeedback_editpdf: Tests use reliable way to annotate PDF
...
The drag and drop step did not work, so we moved to using the stamps
to annotate the PDF. They do not rely on drag&drop and produce the same
effects.
2014-10-24 15:09:06 +01:00
Andrew Nicols
71bc139d63
MDL-47802 mod_forum: Check for required subscription capabilities
...
Users must be able to both view, and manage their subscription in order to
subscribe or be subscribed to a discussion.
2014-10-24 14:44:21 +01:00
Andrew Nicols
0603df04da
MDL-47802 mod_forum: Include discussion subscriptions when moving
...
Check for both forum, and discussion subscriptions when moving a discussion
to a different forum.
2014-10-24 14:44:21 +01:00
Sam Hemelryk
1e97569713
Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
2014-10-24 11:48:20 +02:00
Dan Poltawski
a5f9fc6be3
Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
2014-10-24 11:48:19 +02:00
Damyon Wiese
8112670d62
MDL-47815 assign: Fix random unit test fails
...
This test was failing when it was run really slowly (looking at you oracle).
2014-10-24 11:48:18 +02:00
Marina Glancy
2a9bc5909d
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
2014-10-24 11:48:11 +02:00
Marina Glancy
c3b545a92a
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
2014-10-24 11:48:09 +02:00
Adrian Greeve
780ff300a8
MDL-43245 mod_lesson: Add string for essay grading permission.
2014-10-24 11:48:04 +02:00
Jean-Michel Vedrine
5fc6a9e77b
MDL-43245 Lesson: non editing teacher cannot grade lesson essay
2014-10-24 11:48:00 +02:00
Juan Leyva
e13c152e82
MDL-47690 web services: Fixed invalid return parameter type in mod_url
2014-10-24 09:54:35 +02:00
Marina Glancy
d4a9e66130
MDL-47812 mod_lti: execute upgrade script for all DBs
2014-10-24 14:00:30 +08:00
Andrew Nicols
555837c5d4
MDL-47808 mod_forum: Correct maxeditingtime for unit tests
...
The maxeditingtime needs to be a negative value for unit tests to ensure
that the messages are actually sent out.
Whilst fixing this I also discovered that the create_discussion part of the
generator also creates the first post.
2014-10-23 08:43:29 +08:00
Syxton
35e7ad6a60
MDL-47777 assign: max files hard coded to setting
...
The current file submission is hard coded to a maximum of 20 files
possible. While the user can choose a number less than 20, the maximum
is still set in code. This converts the hard coded 20 to a site setting
defaulting to 20.
2014-10-22 08:24:30 -04:00
Gareth J Barnard
a024eaa5fc
MDL-47795 SCORM: SCORM report not a report.
2014-10-21 15:37:31 +01:00
Sam Hemelryk
28f1bd0106
Merge branch 'MDL-47695' of git://github.com/timhunt/moodle
2014-10-21 14:42:36 +13:00
Dan Poltawski
96b1223387
Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle
2014-10-20 18:28:44 +01:00
Dan Poltawski
6c75bcb5d6
Merge branch 'MDL-47651' of git://github.com/timhunt/moodle
2014-10-20 17:44:33 +01:00
Dan Poltawski
670b0d0283
Merge branch 'MDL-47691' of git://github.com/timhunt/moodle
2014-10-20 17:24:22 +01:00
Dan Poltawski
22c4db3ede
Merge branch 'MDL-47673' of git://github.com/timhunt/moodle
2014-10-20 17:20:26 +01:00
Tim Hunt
97ef7ea2ce
MDL-47695 quiz editing: descritions don't have a max mark!
...
So don't show the UI for editing it.
Also, don't show non-functional page split/join icons after the quiz has
been attempted.
2014-10-20 15:30:35 +01:00
Tim Hunt
1c2e05c060
MDL-47691 quiz: only warn re overdue attempts if a Q has been answered
...
If a quiz is set to have a grace period when time has expired, we only
email studnets to warn them about their overdue attempt if they have put
in an answer to at least one question that is worth some marks.
2014-10-20 12:11:10 +01:00
Tim Hunt
0233e2a973
MDL-47673 quiz generator: default grade 100 & fix review options
...
The review option defaults need to be like what you get from the editing
form, no what is stored in the database, or they don't work!
2014-10-20 12:11:01 +01:00
Tim Hunt
a40eaaa28f
MDL-47651 quiz responses: allow for qtypes without responses
2014-10-20 12:10:43 +01:00
Adrian Greeve
c42d18183a
MDL-47675 phpunit: Update unit tests to pass on MSSQL
...
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.
This patch includes the garbage collection for the unit tests
that require it.
2014-10-20 14:26:11 +08:00
Mark Nelson
4afd26a618
MDL-47735 mod_forum: added 'My profile' -> 'Forum posts' behat test
2014-10-19 18:44:22 -07:00
Jean-Michel Vedrine
814e381a47
MDL-29873 Lesson: Essays not shown on grade page with SQL server
2014-10-18 19:40:20 +02:00
Jean-Michel Vedrine
28928667a0
MDL-38172 Lesson: Additional Info not displayed at end of lesson
2014-10-17 17:04:57 +02:00
Dan Poltawski
bef6e88b5d
Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle
2014-10-17 09:34:39 +01:00
Dan Poltawski
e435f174d3
Revert "MDL-44548 mod_scorm: force an external sync to check for updated files."
...
This reverts commit 2d9a4a5f93169207a166d6d7a7426652e2bf83a1.
2014-10-17 09:30:38 +01:00
Damyon Wiese
7c2977bc5b
MDL-45843 LTI: Fixes for sloppy form handling
2014-10-17 16:24:26 +08:00
Damyon Wiese
821ce4d63b
MDL-47655 assign: Fix unit tests triggering debugging
...
Test was triggering notifications - so needs to use a message sink.
2014-10-17 09:45:02 +08:00
