Commit graph

17563 commits

Author SHA1 Message Date
Dan Poltawski
2dd8e9357f MDL-42407 upgrade.txt clarify description 2013-10-29 15:15:19 +08:00
Dan Poltawski
576abe8f39 Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle 2013-10-29 15:08:13 +08:00
Jason Fowler
1389bcd7e6 MDL-42407 Filepicker: generate a smarter zIndex for the filepicker 2013-10-29 14:55:46 +08:00
Dan Poltawski
76aa53f2d8 Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle 2013-10-29 14:48:27 +08:00
Damyon Wiese
5fb9161b5e Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
2013-10-29 13:57:51 +08:00
Damyon Wiese
afb5f285cd Merge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle 2013-10-29 13:44:34 +08:00
Dan Poltawski
d3428bc93a Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak/moodle 2013-10-29 13:42:56 +08:00
Dan Poltawski
7d3cdcc90d Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle 2013-10-29 13:16:44 +08:00
Dan Poltawski
b6df9f8f55 Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle 2013-10-29 13:09:23 +08:00
Dan Poltawski
e29dcc5a5b Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle 2013-10-29 12:10:44 +08:00
Adam Olley
eed17976dc MDL-42587: calendar: Fix regression that stops dates autocorrecting 2013-10-29 14:19:08 +10:30
Andrew Nicols
dd8e6cd932 MDL-40470 JavaScript: Correct issue when checking select change in Firefox 2013-10-29 10:43:47 +08:00
Marina Glancy
9b5e2461d5 MDL-28463 grades: use get_course() method 2013-10-29 11:33:55 +11:00
Marina Glancy
b85b9b7c29 MDL-28463 grades: inform conditionlib that grades changed 2013-10-29 11:33:21 +11:00
Marina Glancy
9d88b492b1 MDL-42318 coursecat: do not allow to sort if there are invisible children 2013-10-29 10:26:56 +11:00
Matteo Scaramuccia
bc242bbda5 MDL-39810 Files: IE doesn't recognize JSON MIME Type (RFC4627).
Affected versions:
- IE 8+, under Compatibility View.
2013-10-28 23:34:35 +01:00
Rajesh Taneja
abedc1a84c MDL-42556 Events: passing modified user info to user_deleted event
Deleting user modifies few fields and leave rest as un-modified
So passing modified data to event, to keep it small
2013-10-28 16:37:56 +08:00
Rajesh Taneja
0d22c24829 MDL-42557 Events: added idnumber to course_deleted event data 2013-10-28 16:16:25 +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
Rajesh Taneja
726a3be81a MDL-42557 Events: Removed timemodified hack from course_deleted event 2013-10-28 13:01:14 +08:00
Ankit Agarwal
a993b0b93a MDL-42558 events: Enrollment actions are administration not teaching 2013-10-28 11:51:39 +08:00
Dan Poltawski
96d0198b8a Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle 2013-10-28 11:21:26 +08:00
Dan Poltawski
4baf482daa Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle 2013-10-28 11:10:43 +08:00
Andrew Nicols
a65a8f2535 MDL-41504 ActionMenu: Fix block icon sizes 2013-10-28 11:06:51 +08:00
Rajesh Taneja
045d913d11 MDL-42560 Events: Removed use of role->name
role->name is usually empty or localized, so should not be used in events
2013-10-28 11:06:47 +08:00
Damyon Wiese
042e6a47fd Merge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle 2013-10-28 10:52:41 +08:00
Dan Poltawski
c713639b65 Merge branch 'MDL-42511-master' of git://github.com/FMCorz/moodle 2013-10-28 10:43:07 +08:00
Frederic Massart
fe1361fc9c MDL-42511 portfolio: Debugging from deprecated function in cron 2013-10-28 10:28:10 +08:00
Petr Škoda
6ec361c6bc MDL-42485 add session lock acquire timeout to memcached session driver
Credit goes to Eric Merrill, thanks!
2013-10-27 16:05:12 +01:00
Eloy Lafuente (stronk7)
714c4119cd MDL-42551 timezone info: updated to 2013h 2013-10-26 17:14:09 +02:00
Marina Glancy
c24b3f66f1 MDL-42400 generator: unittest for module generator 2013-10-26 14:00:27 +11: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
Petr Škoda
302506e03a MDL-42493 revert nasty DB meta caching hack that was trying to work around shutdown issues
The original problem was resolved via new core shutdown handler support.
2013-10-25 21:20:06 +02:00
Michael Aherne
85e7a92e54 MDL-42517 testing Changed events test to use assertDebuggingCalled() 2013-10-25 09:50:10 +01:00
Frederic Massart
fc203e28d6 MDL-42542 portfolio: Fix handlerfile in portfolio event handler 2013-10-25 16:00:51 +08:00
Frederic Massart
862ca7dbc1 MDL-41041 portfolio: Temporary solution for event portfolio_send
As we have deprecated events_trigger(), the portfolio cannot use it
any more. Though there is no easy solution to get rid of this event
as it is used to register a cron job. MDL-42541 has been raised to
refactor the portfolio code to solve this problem. In the meantime
events_trigger_legacy() will be used.
2013-10-25 14:54:34 +08:00
Dan Poltawski
eb04bc4a86 Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle 2013-10-25 10:05:55 +08:00
Frederic Massart
127816472e MDL-42533 conditionlib: Field name is translated for students 2013-10-25 09:46:36 +08:00
Michael de Raadt
a6989aa6e9 MDL-42491 libraries: add exception for IE11 (and hopefully later versions) 2013-10-25 09:24:47 +08:00
Eloy Lafuente (stronk7)
c783a415dc Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle 2013-10-24 23:33:42 +02:00
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-10-24 15:47:48 +08:00
Dan Poltawski
c6dd6d2eb7 Merge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle 2013-10-24 15:15:07 +08:00
Dan Poltawski
205d507f87 Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle 2013-10-24 12:39:38 +08:00
Dan Poltawski
f76c87151f Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle 2013-10-24 12:33:15 +08:00
Marina Glancy
c7944a72b3 Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle 2013-10-24 15:29:15 +11:00
Andrew Nicols
1607ead74d MDL-42481 Editor: Temporarily unhide the editor to calculate its size 2013-10-24 11:11:11 +08:00
Andrew Nicols
0f965ca901 MDL-42507 JavaScript: Fix alignment of tooltips 2013-10-24 09:58:04 +08:00
Dan Poltawski
d0041fb110 Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle 2013-10-23 13:15:48 +08:00
Marina Glancy
ab864f2c36 Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle 2013-10-23 13:59:50 +11:00