Dan Poltawski
5d5e545fc7
Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle
2014-10-29 12:56:03 +00:00
Dan Poltawski
290bcd3476
MDL-47368 fix trailing whitespace
2014-10-29 11:20:29 +00:00
Dan Poltawski
0af29b0383
Merge branch 'MDL-47368' of git://github.com/timhunt/moodle
2014-10-29 11:18:15 +00:00
Michael Aherne
48242bf33f
MDL-47793 assign: Reset reveal identities
2014-10-29 11:18:06 +00:00
Marina Glancy
72dbe74e7e
Merge branch 'MDL-47916-master' of git://github.com/jleyva/moodle
2014-10-29 16:15:07 +08:00
Damyon Wiese
520bcbb9ab
Merge branch 'MDL-47946-master' of git://github.com/andrewnicols/moodle
2014-10-29 15:53:17 +08:00
Damyon Wiese
e562a1b25b
Merge branch 'MDL-46219' of https://github.com/dkns/moodle
2014-10-29 15:37:47 +08:00
Damyon Wiese
3c459b6300
Merge branch 'wip-MDL-47796-master' of git://github.com/abgreeve/moodle
2014-10-29 15:15:14 +08:00
Adrian Greeve
7e7715fb6b
MDL-47796 mod_data: Fix display of group records.
...
When viewing entries as a teacher in separate group
mode, changing the group would result in random
entries being shown.
2014-10-29 13:52:29 +08:00
Jetha Chan
8744529ff6
MDL-47945 mod_forum: neighbour links at bottom of discussion
2014-10-29 13:46:46 +08:00
Damyon Wiese
cf13ece570
Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle
2014-10-29 13:36:17 +08:00
Damyon Wiese
d7c1945472
Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle
...
Conflicts:
mod/forum/styles.css
2014-10-29 12:53:21 +08:00
Andrew Nicols
8271c89a94
MDL-47946 mod_forum: Correct strings in behat features
...
These are a regression from MDL-46215.
2014-10-29 12:01:41 +08:00
Andrew Nicols
0d7cb0f805
MDL-47930 mod_forum: Display all forum statuses correctly
...
It is possible for users with the mod/forum:managesubscriptions to
subscribe to forums with subscription disabled. This is handled by
forum_get_subscribe_link() already and should have been handled here all
along.
2014-10-29 11:52:54 +08:00
Tim Hunt
e3d3e1e652
MDL-47368 quiz editing: fix icon url generation.
2014-10-28 18:45:17 +00:00
Dan Poltawski
ac3d43b6ec
Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle
2014-10-28 12:25:27 +00:00
Colin Chambers
a69f81f0d3
MDL-47368 Edit quiz: page should not reload so often
...
The approach is that we have a new JavaScript function
M.mod_quiz.resource_toolbox.reorganise_edit_page which, after a ajax
action, fixes up everything like page breaks, page and question numbers,
that might now be wrong.
We call that function instead of reloading the page.
Also, there are a lot more Behat tests to verify this works correctly.
AMOS BEGIN
MOV [joinpages,mod_quiz],[removepagebreak,mod_quiz]
MOV [splitpages,mod_quiz],[addpagebreak,mod_quiz]
AMOS END
2014-10-28 11:32:42 +00:00
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
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
