Commit graph

68 commits

Author SHA1 Message Date
Sam Hemelryk
0b7e4a1474 Merge branch 'MDL-4908-m' of git://github.com/andrewnicols/moodle
Conflicts:
	version.php
2013-08-14 09:15:00 +12:00
Andrew Nicols
2eb67dfa6c MDL-4908 Forum: Add backup/restore steps for per-forum digest settings 2013-08-13 14:46:11 +01:00
Andrew Nicols
b28118f673 MDL-4908 Forum: Add a digest option link to outgoing forum mails 2013-08-13 14:46:11 +01:00
Andrew Nicols
8e08c731eb MDL-4908 Forum: per-forum digests 2013-08-13 14:46:10 +01:00
Frederic Massart
3785358d47 MDL-39954 event: Delocalise get_description 2013-08-12 17:35:30 +08:00
Frederic Massart
62b3b99784 MDL-39954 mod_forum: Replacing old-style events_trigger 2013-08-12 17:35:29 +08:00
Eloy Lafuente (stronk7)
8b180f2317 Merge branch 'MDL-40439-en_fix' of git://github.com/mudrd8mz/moodle 2013-07-02 13:47:09 +02:00
Helen Foster
77fc81f3ee MDL-40439 Merge English strings from the en_fix language pack 2013-07-02 11:42:10 +02:00
Petr Škoda
cd79930e4d MDL-39088 migrate module uninstallation to plugin_manager 2013-06-27 22:20:35 +02:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Frederic Massart
fbe9f668b2 MDL-38597 forum: Reformat the module settings form 2013-04-23 14:52:09 +08:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
David Mudrák
15f83171f5 MDL-33996 Remove the nopostscontaining string from the forum module
After Mark's improvements at the search results display page, the string
is not needed any more.
2013-02-21 14:50:15 +01:00
Frederic Massart
506522d582 MDL-5875 forum: Option to display post word count 2013-02-11 12:08:46 +08:00
Mark Nelson
737aefb454 MDL-30377 forum: do not allow users to view not yet started or expired discussions 2012-11-20 12:17:21 +08:00
Rex Lorenzo
1659b1d1a8 MDL-33166 Forum: Adding capability mod/forum:allowforcesubscribe
Conflicts:

	mod/forum/version.php
2012-09-17 10:06:26 +08:00
Dan Poltawski
93df0f0f31 MDL-34745 mod_forum: remove throttlingapplies string
Its no longer used
2012-08-06 15:31:16 +08:00
Rajesh Taneja
37b5e8fee8 MDL-19430 My Moodle: Polished course_over view code of netspot 2012-07-19 15:30:37 +08:00
Andrew Robert Nicols
8635302e54 MDL-33675 Add updated help texts for modules to appear in activity chooser 2012-06-12 13:38:17 +01:00
Andrew Davis
74a37e1deb MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete 2012-06-04 09:16:21 +07:00
Dan Poltawski
1e448fed27 Merge branch 'MDL-33139-master' of https://github.com/mackensen/moodle 2012-05-25 10:08:33 +08:00
Charles Fulton
c2c071a274 MDL-33139 forum: indicate which user's post was edited 2012-05-24 06:14:21 -07:00
Vadim Dvorovenko
5429460127 MDL-26562 2012-05-20 19:44:32 +07:00
Dan Poltawski
7e89cbe0ac Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle 2012-05-18 10:30:22 +08:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
2012-05-18 00:27:04 +08:00
David Mudrak
9a1c075119 MDL-31675 File browsing support for the Forum module
AMOS BEGIN
 CPY [attachments,mod_forum],[areaattachment,mod_forum]
AMOS END
2012-05-09 03:00:16 +02:00
Tim Hunt
88eca3cd26 MDL-19125 module restrictions: addinstance capabilities for all mods 2012-03-15 17:13:43 +00:00
Sam Hemelryk
5199434619 Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle 2011-12-07 14:20:48 +13:00
Charles Fulton
5fad08b4a4 MDL-19147 - forum - Removed single discussions from the pull down menu for moving posts to different forums. 2011-12-01 08:54:46 +08:00
Rajesh Taneja
35b81f27ca MDL-30421 forum: resolved error in single discussion forum, if more then one record is present 2011-11-30 14:38:23 +08:00
Rossiani Wijaya
db8312d23c MDL-27735 Q&A forum: add new caps to add question. By default, teacher, editing teacher and manager role has the capability to add new question 2011-11-22 15:26:44 +08:00
Petr Skoda
bc196cbe21 MDL-30151 finally remove mod/forum:initialsubscriptions and improve perf
The 'mod/forum:initialsubscriptions' was introduced in 1.7 as a workaround for missing enrolment info - the mod_form forum help was not even updated to mention this capability. Now that we have reliable enrolment info we can significantly improve both enrol and unenrol performance. Hopefully majority of users will not miss this capability...
2011-11-06 19:58:16 +01:00
Sam Hemelryk
4b71542394 MDL-28615 mod_forum: Fixed the users page that shows all of the users posts 2011-09-29 14:20:58 +13:00
Eloy Lafuente (stronk7)
715a5bb732 MDL-27829 blocks - lang string fixes. Credit goes to Helen! 2011-07-01 20:38:06 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
Ruslan Kabalin
2f2137fca4 MDL-27171 messages: admin settings reordering
This includes:
 * most email settings go from general admin setings to email plugin settings
 * digestmailtime goes to mod/forum/settings.php
 * supportname, supportemail and supportpage go to Support contact page
 * all jabber settings go from general admin setings to jabber plugin settings

AMOS BEGIN
 MOV [jabberhost,admin],[jabberhost,message_jabber]
 MOV [configjabberhost,admin],[configjabberhost,message_jabber]
 MOV [jabberserver,admin],[jabberserver,message_jabber]
 MOV [configjabberserver,admin],[configjabberserver,message_jabber]
 MOV [jabberusername,admin],[jabberusername,message_jabber]
 MOV [configjabberusername,admin],[configjabberusername,message_jabber]
 MOV [jabberpassword,admin],[jabberpassword,message_jabber]
 MOV [configjabberpassword,admin],[configjabberpassword,message_jabber]
 MOV [jabberport,admin],[jabberport,message_jabber]
 MOV [configjabberport,admin],[configjabberport,message_jabber]
 MOV [digestmailtime,admin],[digestmailtime,forum]
 MOV [configdigestmailtime,admin],[configdigestmailtime,forum]
 MOV [allowusermailcharset,admin],[allowusermailcharset,message_email]
 MOV [configallowusermailcharset,admin],[configallowusermailcharset,message_email]
 MOV [mailnewline,admin],[mailnewline,message_email]
 MOV [configmailnewline,admin],[configmailnewline,message_email]
 MOV [noreplyaddress,admin],[noreplyaddress,message_email]
 MOV [confignoreplyaddress,admin],[confignoreplyaddress,message_email]
 MOV [sitemailcharset,admin],[sitemailcharset,message_email]
 MOV [configsitemailcharset,admin],[configsitemailcharset,message_email]
 MOV [smtphosts,admin],[smtphosts,message_email]
 MOV [configsmtphosts,admin],[configsmtphosts,message_email]
 MOV [smtpmaxbulk,admin],[smtpmaxbulk,message_email]
 MOV [configsmtpmaxbulk,admin],[configsmtpmaxbulk,message_email]
 MOV [smtpuser,admin],[smtpuser,message_email]
 MOV [configsmtpuser,admin],[configsmtpuser,message_email]
 MOV [smtppass,admin],[smtppass,message_email]
AMOS END

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Dongsheng Cai
67fc4f0025 MDL-9376, disallow student to see the other users posts in max editing time, credits to Vlas Voloshin and Charles Fulton 2011-03-11 11:22:13 +08:00
David Mudrak
6f7d65c724 MDL-24561 forum subscription checks sesskey
The only case when sesskey is not available is when we came to
subscribe.php from a link in email. In that case, we display a
confirmation page that redirects back providing the sesskey.
All other links to subscribe.php are fixed now so they provide sesskey
as a parameter.
I also polished $mode parameter handling a bit because the check
against empty string was not correct as the value is cast to PARAM_INT.
2011-01-05 13:01:46 +01:00
David Mudrak
9a3adb2032 NOMDL forum: fixed the string wording to match the current code condition
Previous string was used together with the legacy:guest capability.
However, the current code checks is_enrolled() instead. This led to a
weird situation when non-enrolled admin or manager could not subscribe
to a forum and the error message was completely confusing for them.
2010-12-07 12:34:11 +00:00
Helen Foster
7a35fe4ffd MDL-21250 capital letters removal 2010-12-02 15:42:24 +00:00
David Mudrak
f3cc571af2 MDL-25225 forum: fixed discussion control layout
The display mode selector is supposed to display in the middle of the
row. Move discussion selector should be on the right, portfolio export
selector on the left. Thanks Sam Marshall for the report and testing the
patches.
2010-11-15 14:18:24 +00:00
David Mudrak
f357d2f8eb Fixed portfolio UI integration in forum thread
There was not enough space to put yet another discussion thread control
widget.
2010-11-11 18:04:43 +00:00
Andrew Davis
46505ee75e message MDL-24694 removed references to user->emailstop. the column itself will be removed in a later version 2010-11-05 08:04:40 +00:00
Andrew Davis
14a0e7ddff message MDL-24771 another big commit of messaging fixes 2010-10-26 08:00:29 +00:00
Andrew Davis
a813a74843 message MDL-24771 a big commit that fixes a whole bunch of small issues with messaging 2010-10-25 09:29:34 +00:00
Andrew Davis
6ee2611c63 message MDL-24563 altered messaging so that forum post notifications aren't so overwhelming when viewed on /message/index.php 2010-10-15 06:59:02 +00:00
Andrew Davis
07f05a04b1 rating MDL-23933 Removed a bunch of no longer used strings and moved rating strings into the rating lang file.
AMOS BEGIN
 MOV [couldnotdeleteratings,mod_forum],[couldnotdeleteratings,core_rating]
 MOV [aggregatenone,mod_forum],[aggregatenone,core_rating]
 MOV [aggregateavg,mod_forum],[aggregateavg,core_rating]
 MOV [aggregatecount,mod_forum],[aggregatecount,core_rating]
 MOV [aggregatemax,mod_forum],[aggregatemax,core_rating]
 MOV [aggregatemin,mod_forum],[aggregatemin,core_rating]
 MOV [aggregatesum,mod_forum],[aggregatesum,core_rating]
AMOS END
2010-09-17 06:32:46 +00:00
Andrew Davis
d4514e46fc forum MDL-23388 altered the logic around making users exempt from the forum post threshold 2010-08-26 07:36:23 +00:00
Andrew Davis
cae4e0781d rating MDL-23908 moved a string
AMOS BEGIN
 MOV [aggregatetype_help,mod_forum],[aggregatetype_help,core_rating]
AMOS END
2010-08-25 08:03:23 +00:00