Eloy Lafuente (stronk7)
263979ebee
Merge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle
2014-02-03 23:58:07 +01:00
Sam Hemelryk
6958c718cc
Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle
2014-02-04 08:28:56 +13:00
Marina Glancy
1b066c06c6
Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle
2014-02-03 13:42:23 +08:00
Marina Glancy
cdb69ddff0
MDL-43828 forum: allow to select single available group when posting
2014-01-31 16:56:48 +08:00
Rajesh Taneja
623a32e50d
MDL-43736 Events: Updated unit test to test context not used in event
2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57
MDL-43736 Events: event->contextinstanceid should be used where possible
...
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
2014-01-29 11:39:44 +08:00
Tomasz Muras
672ce966c6
MDL-43040 Replace $module with $plugin in all mod/*/version.php
...
Conflicts:
mod/quiz/version.php
2014-01-29 00:36:12 +01:00
Kevin Wiliarty
1ec8b1c7ea
MDL-39942: invite only users who can post to discuss
2014-01-27 22:30:47 -05:00
Mark Nelson
50ac4392f3
MDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_test.php)
2014-01-27 19:11:38 -08:00
Russell Smith
74b63eae76
MDL-43440 unit testing: Use cmid in unit tests when it should be used.
...
instance is has been used instead of cmid. This works as all id's are 1
in most cases, but not always.
accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
2014-01-25 08:57:32 +11:00
Dan Poltawski
b901d0e9dd
Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle
2014-01-14 15:26:52 +08:00
Andrew Davis
2b860793a6
MDL-43178 mod_forum: fixed the digest setting confirmation message
2014-01-10 08:33:03 +08:00
Eloy Lafuente (stronk7)
b8a8f3dd01
Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle
2014-01-08 00:39:15 +01:00
Damyon Wiese
5490662ade
Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
course/dnduploadlib.php
2014-01-06 15:48:31 +08:00
Dan Poltawski
73ee2fda6b
MDL-41690 course: remove use of deprecated functions
2014-01-06 10:45:59 +08:00
Sam Hemelryk
a9bd004c8c
Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle
2014-01-06 11:28:34 +13:00
Rajesh Taneja
184afb6b73
MDL-43238 events: Added event other information in event php doc block
2014-01-03 15:03:48 +08:00
Andrew Davis
8f6e47d9c7
MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation
2013-12-31 12:28:09 +08:00
Andrew Davis
e3288953e7
MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum
2013-12-30 18:26:24 +08:00
David Monllao
333db2e9b9
MDL-42625 behat: Editing .feature files
2013-12-06 12:13:39 +08:00
Damyon Wiese
a977fa7b36
Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle
2013-12-03 17:29:39 +08:00
Sam Hemelryk
a59a423926
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
2013-12-03 11:12:34 +13:00
Marina Glancy
6dfd8325f0
MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode
2013-12-02 17:44:32 +11:00
Damyon Wiese
47578dbff4
MDL-42930 Add 2.6.0 upgrade line
2013-11-18 11:47:17 +08:00
Adrian Greeve
e351bed5c1
MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything.
2013-11-12 11:30:16 +08:00
Adrian Greeve
5b1944bbba
MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
...
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
2013-11-11 11:01:14 +08:00
sam marshall
3ef7279f26
MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
...
Exceptions (places where set_time_limit is still left) are:
Third-party libraries:
ADODB
PHPMailer
Moodle core:
PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
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
