Commit graph

2177 commits

Author SHA1 Message Date
Sam Hemelryk
c5bba2fc2d Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle 2013-08-21 09:59:19 +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
Damyon Wiese
e2f36a71a8 Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle 2013-08-20 16:13:55 +08:00
Andrew Nicols
0ef6f6860d MDL-41258 Forum: Add additional unit tests for forum digest settings 2013-08-18 00:03:06 +01:00
Dan Poltawski
5d5c1bb801 fix permissions 2013-08-15 16:37:27 +08:00
Andrew Nicols
0462b6a1a5 MDL-4908 Forum: Basic maildigest setting tests 2013-08-15 17:20:49 +12:00
Dan Poltawski
cc8c7eaebd MDL-41191 forum: convert use of deprecated function 2013-08-15 11:50:08 +08:00
Dan Poltawski
de31668790 MDL-41191 forum: unit tests for forum_get_courses_user_posted_in 2013-08-15 11:50:08 +08:00
Andrew Nicols
84869cb679 MDL-4908 Forum: Correctly check for appropriate login on maildigest changes 2013-08-15 15:24:15 +12:00
Dan Poltawski
260ea3d9a1 Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle 2013-08-14 15:38:37 +08:00
Frederic Massart
dde244c046 MDL-39954 event: Fixed namespace issue with \coding_exception 2013-08-14 14:53: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
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
0528361cc1 MDL-39954 event: Changing get_legacy_eventname to public static 2013-08-12 17:35:30 +08: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
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Sam Hemelryk
2c5c56e974 Merge branch 'MDL-38758_master' of https://github.com/markn86/moodle 2013-08-05 15:37:37 +12:00
Mark Nelson
ce2d9273b9 MDL-38758 mod_forum: fixed issue where pass by reference removal caused an undefined variable error 2013-07-29 19:14:03 +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
Sam Hemelryk
374f7b1d28 Merge branch 'MDL-40787-m' of git://github.com/andrewnicols/moodle 2013-07-23 11:07:53 +12:00
Andrew Nicols
26f1e036e3 MDL-40787 Forum: Remove old commented-out code from forum 2013-07-19 15:04:13 +01:00
David Monllao
3897608152 MDL-39635 behat: XPath cleanups
- Escaping steps arguments redirected to other steps
- Adding normalized-space() in all contains() assertions
- General xpaths review
- Convering provided xpath text strings to xpath literals
  to avoid problems with arguments containing both single
  quotes and double quotes
2013-07-19 10:02:36 +02:00
David Monllao
dedb973878 MDL-39635 behat: Replacing hardcoded language strings
Using get_string() instead.
2013-07-19 10:02:10 +02: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
Ankit Agarwal
0601e0eef6 MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core 2013-07-04 15:41:06 +08:00
Eloy Lafuente (stronk7)
1203222a3c Merge branch 'MDL-40246_master' of git://github.com/dmonllao/moodle 2013-07-02 14:27:34 +02: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
David Monllao
d0a9a29bd0 MDL-40246 mod_forum: Changing scenario to non-JS
Also replacing hardcoded waits for a
wait to be redirected.
2013-06-27 14:24:00 +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
Dan Poltawski
a22b8a83e7 Merge branch 'MDL-39753' of git://github.com/stronk7/moodle 2013-05-21 10:58:37 +08:00
Eloy Lafuente (stronk7)
34e8106f5f Merge branch 'MDL-26120' of https://github.com/jacks92/moodle 2013-05-21 00:54:08 +02:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
Damyon Wiese
14cd6479de Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle 2013-05-06 22:27:41 +08:00
David Monllao
4d40089d88 MDL-39348 behat: Changing to correct activity names 2013-05-03 10:16:44 +08:00
Damyon Wiese
c9c01f75b1 MDL-39077 maxbytes - fix warnings for cli install 2013-05-02 12:11:08 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
Damyon Wiese
367b977d4d MDL-39077 max_files does not include current option when it is non-standard
Non-standard means php.ini was set to something not in the default list (like 7MB),
then the config was saved to that specific value, and now the value in php.ini has been changed
again so 7MB does not appear in the list.
2013-05-01 12:40:57 +01:00