Andrew Nicols
4ee412613b
MDL-48061 mod_forum: posttext should concat
2014-11-06 11:29:25 +08:00
Damyon Wiese
b0637c57ad
Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle
2014-11-06 11:22:42 +08:00
Andrew Nicols
a41cff4e23
MDL-48061 mod_forum: Correct variable name in HTML warning message
2014-11-06 11:05:44 +08:00
Andrew Nicols
ddb4a31d54
MDL-48029 mod_forum: Check for subscription before enrolling
2014-11-06 10:42:09 +08:00
Sam Hemelryk
12a312ac6a
Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle
2014-11-06 11:55:46 +13:00
Eloy Lafuente (stronk7)
97100bea54
Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle
2014-11-05 21:34:37 +01:00
Dan Poltawski
5a6c9f1cfb
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle
...
Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php
2014-11-05 12:11:16 +00:00
Andrew Nicols
7a311adbba
MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs
...
This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.
2014-11-05 10:35:12 +00:00
Damyon Wiese
a75cc21442
Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle
2014-11-05 16:54:32 +08:00
Marina Glancy
93a4f8b5fc
Merge branch 'MDL-47390-master' of git://github.com/andrewnicols/moodle
2014-11-05 16:35:05 +08:00
Andrew Nicols
7122e1543a
MDL-48054 mod_forum: Fix unit test failures
...
These sporadic unit test failures were happening because the post time and
subscription time sometimes differ depending on the amount of time it takes
to complete the different components of the test.
To reliably address these issues, the post creation, and the discussion
subscription times are manually updated by different factors to ensure a
more realistic state of affairs.
2014-11-05 14:49:02 +08:00
Damyon Wiese
686150130e
Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle
2014-11-05 14:18:07 +08:00
Andrew Nicols
6a5b087163
MDL-48061 mod_forum: Tidy up reply-by-email information in emails
...
* Add a reminder to remove the original message; and
* Remove the reply-to address from the text.
2014-11-05 11:20:59 +08:00
Eloy Lafuente (stronk7)
8d3c518bd5
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
2014-11-05 01:16:05 +01:00
Helen Foster
ba033b861e
MDL-48035 Merge English strings from the en_fix language pack
2014-11-04 21:55:26 +01:00
Eloy Lafuente (stronk7)
de881693f7
MDL-48021 bump: Bump all versions to planned release
...
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
2014-11-04 17:52:35 +01:00
Andrew Nicols
1008dd8ef0
MDL-47390 mod_forum: Correct check for groups when subscribing
2014-11-04 16:35:47 +08:00
Andrew Nicols
da30d04408
MDL-47390 mod_forum: Add discussion unsub to email footer
2014-11-04 16:35:47 +08:00
Andrew Nicols
548453ecde
MDL-48044 mod_forum: Preload icons for discussion subscription toggles
2014-11-04 16:09:19 +08:00
Andrew Nicols
a35ce611cf
MDL-47944 mod_forum: Improve discussion subscription icon/link
...
* make the link text clickable
* changes the link text when unsubscribed to the action text "Subscribe"
2014-11-04 15:46:05 +08:00
Eloy Lafuente (stronk7)
882f915922
Merge branch '47968-28' of git://github.com/samhemelryk/moodle
2014-11-04 01:55:08 +01:00
Eloy Lafuente (stronk7)
bebd3ce8fc
Merge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle
2014-11-04 01:20:51 +01:00
Juan Leyva
40afeb4044
MDL-45303 Web Services: forum_discussions not checking groups
2014-11-03 21:55:03 +01:00
Amanda Doughty
c980dd123a
MDL-30968 mod/forum Fixed group link
2014-11-03 14:29:03 +00:00
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
