Commit graph

2231 commits

Author SHA1 Message Date
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Mary Evans
fe4848110a MDL-40244 forms: added setType() for groupinfo in forum and wiki 2013-11-06 12:23:18 +11:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
b53c155276 Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle 2013-11-01 08:57:38 +08:00
Damyon Wiese
3b4ace3ec8 Merge branch 'MDL-41251_c' of git://github.com/rwijaya/moodle 2013-11-01 08:55:24 +08:00
Adrian Greeve
5450ed4347 MDL-42599 forum rss: Update the sql statements to return all user name fields. 2013-10-30 11:25:59 +08:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
Conflicts:
	login/change_password.php
2013-10-28 15:37:05 +08:00
Marina Glancy
b6affde2cb MDL-42400 generator: Add function testing_module_generator::create_content()
also implement it for mod_book and mod_forum to call existing create_page, create_discussion/post functions
2013-10-26 14:00:24 +11:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Frederic Massart
268bd2fe77 MDL-42534 mod_forum: Fix issue because cm_info is read only 2013-10-25 11:34:10 +08:00
rwijaya
5639454509 MDL-41251 forum_mod: add aria label and role to forum discussion page for accessibility purpose.
Thanks to Nate Baxley for creating the original patch.
2013-10-23 12:43:35 +08:00
Andrew Davis
54eb02a45c MDL-26170 RSS: fixed RSS cache clearing when items are deleted 2013-10-22 10:29:05 +07:00
Rajesh Taneja
bafcd3f17a MDL-41811 navigation: Load site admin navigation
Go to notification page before following links within site admin
navigation, ensuring site admin navigation is loaded

With no js, test should follow site admin link and not expand it.
2013-10-21 14:17:55 +08:00
Damyon Wiese
031a28ce7f Merge branch 'MDL-34612-master' of https://github.com/mackensen/moodle 2013-10-14 14:12:57 +08:00
Adrian Greeve
dda60f88cd MDL-42238 - mod_forum: Alternate name sql update to forum_print_recent_activity. 2013-10-10 14:02:23 +08:00
Damyon Wiese
604fc45ee0 Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle 2013-10-09 11:48:14 +08:00
Damyon Wiese
869dd1fc6c Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle 2013-10-09 09:39:09 +08:00
Charles Fulton
3ed2c6e50c MDL-34612 forum: convert default format value during restore 2013-10-08 09:56:04 -07:00
Eric Merrill
bd8f5d459d MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED
Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.

FORUM_TRACKING_ON retained but marked depreciated.
2013-10-08 08:04:55 -04:00
Eric Merrill
20e6782f10 MDL-29663 forum: Option to allow Forced for read tracking.
Converts the use of Read Tracking On to Forced. Adds new admin setting
forum_allowforcedreadtracking. If set, Forced will be available when
adding or editing forums. In this state the forced forum overrides the
user preference of off.

With forum_allowforcedreadtracking not set (default) behavior is the
same as now, except forums previously set in the On state are treated
as Optional.

The side effect of forum_allowforcedreadtracking being on, is that users
cannot speed up the loading of course pages with lots of forums by
setting their personal forum read tracking option to off.
2013-10-08 08:03:54 -04:00
Marina Glancy
04a4de20e8 Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle 2013-10-08 12:03:15 +11:00
Adrian Greeve
94b1577a5a MDL-42098 - mod_forum: Update webservice sql query to include all name fields. 2013-10-07 10:02:44 +08:00
David Monllao
8b30d05557 MDL-42013 behat: Fixing related tests
We had no false positives because of this
issue, but some checking have been restricted
to specific DOM parts.
2013-10-04 14:38:11 +08:00
Eric Merrill
46691973b3 MDL-25176 forum Redirects for new discussions shouldn't use SESSION
Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
2013-10-01 21:17:57 -04:00
Eloy Lafuente (stronk7)
164e90dd70 Merge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle 2013-10-01 19:36:37 +02:00
Frederic Massart
6ee51daf6b MDL-42003 mod_forum: Convert handlers to observers 2013-09-26 16:08:13 +08:00
Eric Merrill
8b73bac647 MDL-41933 Forum: Make a admin level option to set the default value of Read Tracking. 2013-09-23 17:32:47 -04:00
Dan Poltawski
e3a1fa4be8 MDL-40733 forum: fix duplciate headings
two integration patches collided..
2013-09-11 16:14:37 +08:00
Dan Poltawski
261dc01734 Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle 2013-09-10 17:35:40 +08:00
Damyon Wiese
bfcc07504e MDL-23335 forum: Fix whitespace 2013-09-10 12:59:49 +08:00
Damyon Wiese
6aca3fc419 Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle 2013-09-10 12:56:40 +08:00
Marina Glancy
44ddd2a115 MDL-41219 course: Make properties of course_modinfo read-only
added phpdocs and unittests
2013-09-10 14:11:37 +10:00
Sam Hemelryk
3eb032d743 NOBUG: fixed whitespace 2013-09-10 13:02:35 +12:00
Sam Hemelryk
a775f2c96d Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 11:22:04 +12:00
Petr Škoda
5e95223e86 MDL-28094 keep subdirs in content upgraded from 1.x 2013-09-07 11:30:19 +02:00
David Monllao
93a8bc8283 MDL-41568 lang: Fix behat features after changes 2013-09-04 15:16:59 +08:00
Damyon Wiese
3516b82c9d Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle 2013-09-04 11:45:07 +08:00
Eloy Lafuente (stronk7)
f82a082ae2 Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle 2013-09-03 15:12:19 +02:00
Helen Foster
86698a4c72 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:31:35 +02:00
Michael de Raadt
02d10ca0ba MDL-23335 mod_forum: allow multi-lang filtering of shortened messages 2013-09-03 13:42:06 +08:00
Rajesh Taneja
bb78e249cd MDL-39961 Events: Replace Legacy events - User
This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event
2013-09-02 16:10:05 +08:00
Andrew Davis
66e2b9f8c2 MDL-38856 reposition activity group control and fixed titles in chat, database and forum 2013-09-02 11:49:39 +07:00
Andrew Davis
82cf581693 MDL-40733 mod_forum: added the forum name to some pages that were missing it 2013-08-30 14:58:40 +07:00
Rajesh Taneja
3b908929c1 MDL-41456 Events: Fixed existing events to respect base event access specifier and return data type 2013-08-30 11:07:48 +08:00
Dan Poltawski
d7d2f263dd Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle 2013-08-22 10:32:54 +08:00
Frederic Massart
7fb35af658 MDL-41125 forum: Missing include of repository lib 2013-08-22 09:50:05 +08:00
Damyon Wiese
52ec2a60f6 Merge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle 2013-08-21 15:43:23 +08:00
Dan Poltawski
a9e6a73173 MDL-41191 mod_forum: avoid DISTINCT on TEXT columns
It is not supported by all db engines
2013-08-21 14:38:22 +08:00
Dan Poltawski
72c2c0bb09 MDL-41191 add more test data to trigger duplicate course records 2013-08-21 14:17:12 +08:00