Dan Poltawski
1a27142afe
Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
mod/forum/version.php
mod/forum/db/upgrade.php
2014-11-03 12:28:33 +00:00
Andrew Nicols
a6d7a81271
MDL-48020 mod_forum: Add missing sesskey check in AJAX subscription
2014-11-03 11:02:41 +00:00
Marina Glancy
8bd6b270b2
Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle
2014-11-03 17:21:55 +08:00
Sam Hemelryk
e014b6f2c4
MDL-47968 mod_forum: fixed search form HTML5 validation
2014-11-03 08:54:56 +13:00
Andrew Nicols
2a9f525bcf
MDL-47390 mod_forum: Correct check for groups when subscribing
2014-10-31 08:54:02 +08:00
Andrew Nicols
4c34089889
MDL-47987 mod_forum: Users subscribe to discussions not forums
...
Correct language string which describes users subscribing to a discussion,
and use it when subscribing on post.
2014-10-31 07:51:48 +08:00
Dan Poltawski
0a92904c47
MDL-47918 forum: Coding style fix
2014-10-30 16:46:46 +00:00
Dan Poltawski
fb9604d67c
Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle
2014-10-30 14:31:38 +00:00
Marina Glancy
08674d83c1
Merge branch 'MDL-25057-master' of git://github.com/andrewnicols/moodle
2014-10-30 17:14:09 +08:00
Marina Glancy
9e432c22cd
Merge branch 'MDL-47909-master' of git://github.com/andrewnicols/moodle
2014-10-30 16:15:10 +08:00
Andrew Nicols
02cf3958d2
MDL-47909 mod_forum: Respect user autosubscribe setting on post
...
Re-appropriate the forum autosubscribe setting as a discussion
autosubscribe setting.
The setting was no longer used after the per-discussion changes. The
original plan had been to remove this setting, but there is some benefit to
respecting it for discussion subscriptions instead.
2014-10-30 13:36:06 +08:00
Andrew Nicols
611a5ef714
MDL-25057 mod_forum: Stop duplicating forum_read posts from cron
...
This also includes an upgrade script to delete the existing duplicates.
2014-10-30 13:23:29 +08:00
David Monllao
b2b70eea49
MDL-47207 mod_forum: Unifying criteria
2014-10-30 12:50:17 +08:00
Andrew Nicols
a54702b234
MDL-47903 mod_forum: Correct test fails related to caching and time
...
This adds a reset of the discussion and forum cache when running the mail
and maildigest tests.
These test fails were highlighted by the addition of new tests which
add similar post ids.
2014-10-30 12:02:35 +08:00
Andrew Nicols
eb451c7981
MDL-47903 mod_forum: Add discussion subscription time
...
This helps us to only send notifications for messages the user should have
already seen.
2014-10-30 12:02:34 +08:00
Andrew Nicols
4e3af3cf42
MDL-47390 mod_forum: Add discussion unsub to email footer
2014-10-30 09:07:36 +08:00
Dan Poltawski
5d5e545fc7
Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle
2014-10-29 12:56:03 +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
Jetha Chan
8744529ff6
MDL-47945 mod_forum: neighbour links at bottom of discussion
2014-10-29 13:46:46 +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
Dan Poltawski
ac3d43b6ec
Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle
2014-10-28 12:25:27 +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
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
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
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
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
Mark Nelson
4afd26a618
MDL-47735 mod_forum: added 'My profile' -> 'Forum posts' behat test
2014-10-19 18:44:22 -07:00
Dan Poltawski
ea594eb10e
Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle
2014-10-08 14:43:13 +01:00
Damyon Wiese
6b58a6a445
Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
...
Conflicts:
version.php
2014-10-08 21:14:39 +08:00
Dan Poltawski
8b2d52b88d
Merge branch 'MDL-47389-master' of git://github.com/jleyva/moodle
2014-10-08 11:08:29 +01:00
Sam Hemelryk
e90a0396e1
MDL-3714 mod_forum: pre-integration clean up
2014-10-08 09:39:44 +13:00
Sam Hemelryk
82d9aebc7d
Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle
2014-10-08 09:39:01 +13:00
Sam Hemelryk
002ee6faab
Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle
2014-10-07 15:16:54 +13:00
Andrew Nicols
91223df61b
MDL-3714 mod_forum: Add an inbound message handler
...
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 09:58:36 +08:00
Dan Poltawski
fb991204a9
Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle
2014-10-06 16:01:26 +01:00
Andrew Nicols
f67b5c995e
MDL-47183: viewhiddenactivities should use the module context
...
Thanks to Paulo Matos for the forum part of this change.
2014-10-06 12:21:49 +08:00
Sam Hemelryk
7b08f6e888
Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2
2014-10-06 11:15:44 +13:00
Juan Leyva
7ea6ada343
MDL-47389 forum: Return discussions count in get_forums_by_courses ws
2014-10-03 16:39:02 +02:00
Juan Leyva
da1be050bc
MDL-47084 forum: New moodle_url method make_webservice_pluginfile_url
2014-10-03 16:34:48 +02:00
Juan Leyva
694bf0c74b
MDL-47084 forum: Return user picture URL in get_posts WS
2014-10-03 16:34:48 +02:00
