Commit graph

1101 commits

Author SHA1 Message Date
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Dan Poltawski
c161e4687c Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-08-20 18:21:17 +08:00
Frederic Massart
2ecd284779 MDL-41143 mod_forum: Prevent unnessary loading of formslib 2013-08-20 17:50:07 +08:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Dan Poltawski
cc8c7eaebd MDL-41191 forum: convert use of deprecated function 2013-08-15 11:50:08 +08:00
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
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
62b3b99784 MDL-39954 mod_forum: Replacing old-style events_trigger 2013-08-12 17:35:29 +08:00
Marina Glancy
2c1bbbc58e MDL-29731, MDL-40843 Correctly access course_modinfo->get_groups() 2013-07-24 21:43:56 +10:00
Marina Glancy
2511a97fd6 MDL-29731 Bugs in recent activity when using separate groups 2013-07-24 21:39:26 +10:00
Andrew Nicols
26f1e036e3 MDL-40787 Forum: Remove old commented-out code from forum 2013-07-19 15:04:13 +01:00
Frederic Massart
2e4c0c9181 MDL-40424 libraries: Deprecate context_instance_preload_sql() 2013-07-12 17:41:49 +08:00
Adrian Greeve
ec71acb798 MDL-31776 - lib: mod/forums - Fixed discussion sql query. 2013-07-10 15:26:05 +08:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields
Add support for additional name fields and flexible formating of
user names.
2013-07-09 11:45:50 +08:00
Sam Hemelryk
407020ef8c Merge branch 'MDL-32253-master' of git://github.com/danpoltawski/moodle 2013-06-18 11:26:23 +12:00
Daniel Neis Araujo
3f213cd321 MDL-32253 - Adding link to forum discussion on text emails 2013-06-12 10:28:55 +08:00
Adam Olley
f985bc4e65 MDL-39947 mod_forum: Add safety check to variable assignment when counting unread posts 2013-05-31 09:45:56 +09:30
Eloy Lafuente (stronk7)
34e8106f5f Merge branch 'MDL-26120' of https://github.com/jacks92/moodle 2013-05-21 00:54:08 +02:00
Sam Hemelryk
0f540591df Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle 2013-04-30 10:08:20 +12:00
Mark Nelson
34e2987118 MDL-39303 mod_forum: prevent user from submitting when post threshold reached 2013-04-29 14:44:04 +08:00
Mark Nelson
f5ad424b11 MDL-39182 mod_forum: display the post threshold warning message in a more noticeable area 2013-04-22 13:33:36 +08:00
Jayesh Anandani
ec123a1966 MDL-26120 mod_forum: use correct object 2013-04-11 19:47:40 +05:30
Rajesh Taneja
9a51c3d95c MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
2013-03-12 17:14:53 +08:00
Gilles-Philippe Leblanc
4a913724d0 MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers 2013-02-28 11:33:51 -05:00
Eloy Lafuente (stronk7)
fe4a6d3c38 Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle 2013-02-12 10:12:01 +01:00
Mark Nelson
8076010d37 MDL-37953 mod_forum: using named parameters to build SQL statement 2013-02-12 10:31:10 +08:00
Matt Oquist
da48404391 MDL-37953 mod_forum: replace hard-coded numbers with defined values
mod/forum/lib.php sets forum_posts.mailed to 0, 1, and 2. What do these numbers
mean? This patch creates defined values for these otherwise-mysterious
numbers.
2013-02-11 15:20:18 +08:00
Frederic Massart
506522d582 MDL-5875 forum: Option to display post word count 2013-02-11 12:08:46 +08:00
Damyon Wiese
183e656eea Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle 2013-02-05 11:23:01 +08:00
Mark Nelson
a9a0cb691c MDL-30102 mod_forum: adding webservice function to allow for the retrieval of forum discussions 2013-02-04 19:28:29 +08:00
Andrew Robert Nicols
c112bc6069 MDL-37697 Use the correct editor format for course forums 2013-01-25 12:30:29 +00:00
Dan Poltawski
361dfe6572 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-17 13:47:25 +08:00
Rajesh Taneja
e9c55e3993 MDL-29534 Forum: Fixed userfrom reference problem 2013-01-17 13:45:01 +08:00
Dan Poltawski
bf5f8a4f60 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-14 14:59:22 +08:00
Rajesh Taneja
a7a1e05ff9 MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress. 2013-01-09 14:50:32 +08:00
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
Isaac Marco Blancas
228e09cdd1 MDL-29534 Forum: If forum_replytouser is not set then don't display from user email" 2013-01-08 16:16:02 +08:00
Sam Hemelryk
b8e551a89e Merge branch 'MDL-4781-master' of https://github.com/mackensen/moodle 2013-01-07 11:14:47 +13:00
Charles Fulton
4a112ec8c5 MDL-4781 forum: show discussion link when user has ability to view discussion 2012-12-20 05:59:41 -08:00
Petr Škoda
a11aa38e80 MDL-37111 copy first post files in single type forum using intro options
This patch also removed the delete button from the first post in single
discussion type forum.

Edit button in the first post leads to the forum edit page now, this should
prevent other problems throwing first post and intro out of sync.
2012-12-15 11:23:42 +01:00
Frederic Massart
99938034df MDL-36782 usability: Adjustments following new mark as read icon 2012-11-27 13:46:21 +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
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Mark Nelson
3774324174 MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:13 +01:00
Dan Poltawski
ec0a080a07 MDL-34527 - fix trailing whitespace 2012-11-05 13:28:16 +08:00
Sam Hemelryk
b3def15507 MDL-34527 forum: Fixed up a couple of SQL queries causing issues in Oracle. 2012-11-02 10:49:50 +13:00
Marina Glancy
722e6ba947 MDL-35339 Deprecate add_mod_to_section(), create new function course_add_cm_to_section()
Function add_mod_to_section() has very confusing arguments when object  looks like record from
table course_modules but field ->section refers to relative section number (course_sections.section).
In table course_modules the field section refers to course_sections.id.
Also add_mod_to_section() does not update table course_modules and does not call rebuild_course_cache()
which developer can forget to do afterwards.

- Added function course_add_cm_to_section()
- In the core code add_mod_to_section() is replaced with course_add_cm_to_section()
- Function add_mod_to_section() is deprecated
2012-10-15 14:08:13 +08:00
Dan Poltawski
a354add4c8 Merge branch 'MDL-33933-master' of https://github.com/mackensen/moodle 2012-10-02 09:43:38 +08:00
Tim Hunt
9695ff811b MDL-34657 user sorting: consistent sorting everywhere.
This commit coverts everything in the codebase to use the new
users_order_by_sql function when sorting lists of users. More details in
the bug.

Note that this does not change places where users are displayed in a
sortable table, and the sort order comes from the table.
2012-09-27 12:41:42 +01:00