Petr Škoda
cac367e4a4
MDL-42973 fix MUC caching issue when fetching available updates
2013-12-12 11:43:35 +08:00
Sam Hemelryk
623d49dde4
Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle
2013-12-12 09:13:42 +13:00
David Monllao
c5a1015338
MDL-42625 behat: Fixing ExpectationException::__construct() call
...
Also adding an extra checking to the selector to
ensure it is no updating the list of files.
2013-12-11 17:02:46 +08:00
Andrew Nicols
44b724c374
MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel
2013-12-11 13:29:46 +08:00
Rajesh Taneja
0e72987517
MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context
2013-12-11 13:53:04 +11:00
Rajesh Taneja
e94f6c6572
MDL-40058 Events: added unit test
2013-12-11 13:53:04 +11:00
Rajesh Taneja
86b0e3b308
MDL-40058 Events: Replaced add_to_log for page comments to event
2013-12-11 13:53:00 +11:00
Rajesh Taneja
8b43cf225f
MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event
2013-12-11 13:53:00 +11:00
Rajesh Taneja
a8481a66fe
MDL-40058 mod_wiki: Replaced add_to_log for page created to event
2013-12-11 13:53:00 +11:00
Rajesh Taneja
ff79f49f44
MDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
d6a54be3a6
MDL-40058 mod_wiki: Replaced add_to_log for admin to event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
b3dd79d101
MDL-40058 mod_wiki: Replaced add_to_log for override locks with event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
3e5e78a2c9
MDL-40058 mod_wiki: Replaced add_to_log for page diff view with event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
fb92417b5e
MDL-40058 mod_wiki: Replaced add_to_log for page edit with event
2013-12-11 13:52:59 +11:00
Rajesh Taneja
31383bcdad
MDL-40058 mod_wiki: Replaced add_to_log for version restored with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
d1d555c955
MDL-40058 mod_wiki: Replaced add_to_log for history viewed with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
9307bed8c5
MDL-40058 mod_wiki: Replaced add_to_log on index.php with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
48f871e09b
MDL-40058 mod_wiki: Replaced add_to_log for course_module_viewed with event
2013-12-11 13:52:58 +11:00
Rajesh Taneja
8ac1d22436
MDL-40058 mod_wiki: Replaced add_to_log for page_viewed with event
2013-12-11 13:52:54 +11:00
Sam Hemelryk
445e63ecd8
Merge branch 'wip-MDL-43218-master' of git://github.com/marinaglancy/moodle
2013-12-11 15:32:29 +13:00
Marina Glancy
0967e635ac
MDL-43218 blog: prepare the blog navigation only when needed
2013-12-11 13:27:38 +11:00
Simon Coggins
24f4bfcfcf
MDL-43218 navigation: Remove link to blogs when they are disabled
2013-12-11 12:59:28 +11:00
Marina Glancy
939aedfe30
Merge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle
2013-12-11 12:46:14 +11:00
Sam Hemelryk
e453c70d14
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
2013-12-11 12:30:26 +13:00
Sam Hemelryk
769ed2bd5d
NOBUG: shifter rebuild
2013-12-11 12:26:47 +13:00
Sam Hemelryk
1092f63a80
Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle
2013-12-11 12:25:16 +13:00
Sam Hemelryk
5cc0c2c41d
Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle
2013-12-11 12:25:14 +13:00
Sam Hemelryk
7458012637
Merge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle
2013-12-11 12:25:12 +13:00
Eloy Lafuente (stronk7)
ebc77165a4
Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle
2013-12-10 23:29:06 +01:00
Eloy Lafuente (stronk7)
438ee6ebdc
Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle
2013-12-10 23:24:56 +01:00
Sam Hemelryk
df1498f711
Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle
2013-12-11 11:13:32 +13:00
Sam Hemelryk
87176b481e
Merge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle
2013-12-11 11:03:39 +13:00
Sam Hemelryk
78144bd2e7
Merge branch 'wip-MDL-43279-master' of git://github.com/marinaglancy/moodle
2013-12-11 10:59:21 +13:00
Sam Hemelryk
3f35f367cb
Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle
2013-12-11 10:50:07 +13:00
Eloy Lafuente (stronk7)
7f34773665
Merge branch 'wip-MDL-43150-master' of git://github.com/marinaglancy/moodle
2013-12-10 22:47:15 +01:00
Sam Hemelryk
ebb9daa5e1
Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle
2013-12-11 10:34:17 +13:00
Sam Hemelryk
b6df1b3ab3
Merge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle
2013-12-11 10:32:06 +13:00
Eloy Lafuente (stronk7)
5cf182e39d
Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle
2013-12-10 22:06:39 +01:00
Eloy Lafuente (stronk7)
1c432ae6e1
Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle
2013-12-10 19:43:33 +01:00
Jenny Gray
a080716fa6
MDL-43135 Lang: removed redundant opentoguests
2013-12-10 11:05:22 +00:00
Jenny Gray
0e61547ea9
MDL-43135 Guest Enrol: new language string for with key icon
...
AMOS BEGIN
CPY [pluginname,enrol_guest], [guestaccess_withpassword,enrol_guest]
CPY [pluginname,enrol_guest], [guestaccess_withoutpassword,enrol_guest]
AMOS END
2013-12-10 11:05:04 +00:00
Marina Glancy
8f3e0bf7a5
Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle
2013-12-10 15:20:22 +11:00
Marina Glancy
b3e0bd5225
Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle
2013-12-10 15:15:27 +11:00
Marina Glancy
e762d5a7f2
Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle
2013-12-10 14:47:08 +11:00
Marina Glancy
a98bdfa668
Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle
2013-12-10 14:29:22 +11:00
Marina Glancy
3649bcfa21
Merge branch 'MDL-43215_master' of https://github.com/markn86/moodle
2013-12-10 14:25:24 +11:00
Marina Glancy
2cbcf496c2
Merge branch 'MDL-43131' of git://github.com/timhunt/moodle
2013-12-10 14:10:04 +11:00
Marina Glancy
11ca8227b1
Merge branch 'mdl42487-master' of https://github.com/tlock/moodle
2013-12-10 13:56:49 +11:00
Mark Nelson
8bf0f20795
MDL-42932 core_calendar: introduced calendar type system setting
2013-12-09 18:40:46 -08:00
Marina Glancy
907b98204b
MDL-43044 fix trailing whitespace
2013-12-10 11:52:42 +11:00