Commit graph

2159 commits

Author SHA1 Message Date
David Monllao
7a6204ce1d MDL-38823 behat: Fixing related scenarios 2013-04-03 13:56:31 +08:00
Eloy Lafuente (stronk7)
12879418e9 Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle
Conflicts:
	mod/forum/tests/behat/behat_mod_forum.php
2013-04-02 01:47:40 +02:00
Eloy Lafuente (stronk7)
0f8fd3a7eb Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:18 +02:00
Eloy Lafuente (stronk7)
2bb24f16e0 Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:05 +02:00
Eloy Lafuente (stronk7)
55a2081d28 Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:44 +02:00
Eloy Lafuente (stronk7)
c1bccc8ef5 Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:31 +02:00
Eloy Lafuente (stronk7)
9f0700fb6c Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle 2013-04-02 01:03:26 +02:00
David Monllao
be0e1825d3 MDL-38823 behat: New test
According to MDLQA-521, a teacher can set a certain
number of discussions as a completion condition for
a forum.
2013-04-01 17:52:46 +08:00
David Monllao
125765ed18 MDL-38437 behat: Behat feature for mod_forum
Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).
2013-04-01 16:27:16 +08:00
David Monllao
74508a5ddb MDL-38437 behat: Step definition to add a discussion 2013-04-01 16:27:09 +08:00
David Monllao
2d9cbe8807 MDL-38477 behat: New test
According to MDLQA-16, teachers can edit
or delete any forum post.
2013-03-27 16:51:01 +08:00
David Monllao
22d56e46f1 MDL-38476 behat: New test
According to MDLQA-9, in a single
simple discussion forum only teachers
can start discussions.
2013-03-27 16:49:59 +08:00
David Monllao
a394e57849 MDL-38475 behat: New test
According to MDLQA-5, students can choose
from 4 discussion display options and their
choice is remembered.
2013-03-27 16:47:56 +08:00
David Monllao
68834d4a0d MDL-38475 behat: Step definition to reply a discussion 2013-03-27 16:47:55 +08:00
David Monllao
9449cf8e11 MDL-38439 behat: New test
According to MDLQA-3, a teacher can
set one of 3 possible options for
tracking read forum posts.
2013-03-27 16:46:41 +08:00
David Monllao
e6cb6aed64 MDL-38437 behat: Behat feature for mod_forum
Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).
2013-03-27 16:45:01 +08:00
David Monllao
279d86943b MDL-38437 behat: Step definition to add a discussion 2013-03-27 16:45:01 +08:00
Petr Škoda
c3f31a3ded MDL-38581 move forum discussion and post generators to proper place 2013-03-22 13:21:35 +01:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle
Conflicts:
	version.php
2013-03-19 15:18:13 +08:00
Damyon Wiese
7c211f565a Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle 2013-03-18 13:45:41 +08:00
Frederic Massart
807cf3d0ae MDL-38005 form: Headers have a proper name 2013-03-15 11:06:25 +08:00
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
Ankit Agarwal
7a241d8102 MDL-30166 Remove deprecated %fullname% from core
Thanks to Matheus Kautzmann for the initial patch.
2013-03-12 10:38:09 +08:00
Eloy Lafuente (stronk7)
641577eb32 Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle 2013-03-06 17:26:37 +01:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
Aparup Banerjee
11abbe276f Merge branch 'wip-MDL-34775-master' of git://github.com/phalacee/moodle 2013-03-05 17:01:54 +08:00
Eloy Lafuente (stronk7)
5a341e9183 Merge branch 'MDL-31390-m' of git://github.com/andrewnicols/moodle 2013-03-04 18:08:54 +01:00
Andrew Robert Nicols
5251450372 MDL-31390 Convert set_source_sql with order clauses to set_source_table 2013-03-01 11:29:01 +00:00
Gilles-Philippe Leblanc
4a913724d0 MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers 2013-02-28 11:33:51 -05:00
Michael de Raadt
cf626656c6 MDL-34775 - Forum, RSS - Fixing RSS entries option to be disabled if RSS is not enabled 2013-02-26 14:03:00 +08: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
Mark Johnson
b74c9a9fec MDL-33996 Forum search. Stop displaying raw search strings to users 2013-02-21 14:48:56 +01:00
Damyon Wiese
f22bc6d963 Fix permissions 2013-02-14 13:43:58 +08:00
Eloy Lafuente (stronk7)
fe4a6d3c38 Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle 2013-02-12 10:12:01 +01:00
Dan Poltawski
6af8e417c3 Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
Conflicts:
	mod/forum/db/upgrade.php
	mod/forum/version.php
2013-02-12 15:48:33 +08:00
Rajesh Taneja
afd5e85ca8 MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default 2013-02-12 14:57:47 +08:00
Jerome Mouneyrac
909f27acf4 MDL-37410 External PHPunit test: used ->getDataGenerator()->enrol_user instead to manually enrol the user. + improve the unassignUserCapability to remove a capability assigned by getDataGenerator->enrol_users 2013-02-12 11:15:15 +08:00
Mark Nelson
8076010d37 MDL-37953 mod_forum: using named parameters to build SQL statement 2013-02-12 10:31:10 +08:00
Damyon Wiese
234fdc206c Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-02-12 10:09:26 +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
6b219310cf MDL-37122 core get_max_upload_sizes: Include "Course/Site/Activity limit (X)" in list of options
This change removes the "0 bytes" option from the get_max_upload_sizes list
and replaces it with "Course limit (X)" or "Site limit (X)" (whichever is smaller).
This means we can remove all custom handling in the modules that were removing and
adding these options. It only affects pages that pass valid options for sitelimit and
courselimit - so admin pages will work correctly.

It also orders the list so the course/site limit options will be first
(as it will be the largest).

AMOS START
 REM [courseuploadlimit, core] has been parameterized to get [uploadlimitwithsize, core]
AMOS END
2013-02-07 10:50:52 +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
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files
YAY!
2013-01-29 22:34:46 +01: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
73ce4ac996 Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle 2013-01-21 10:53:12 +08:00
Sam Hemelryk
528d2633df Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle 2013-01-21 10:18:33 +13: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