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
Marina Glancy
013620aad3
Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle
2013-12-10 11:40:54 +11:00
Marina Glancy
332d9ec84b
MDL-43279 block_blog_recent: fixed undefined property notice
2013-12-10 09:28:05 +11:00
Sam Hemelryk
fd0281dfc3
Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle
2013-12-10 10:27:45 +13:00
Sam Hemelryk
a88c1ca91a
Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle
2013-12-10 09:52:08 +13:00
Sam Hemelryk
176521e560
Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
2013-12-10 09:25:51 +13:00
Sam Hemelryk
830299fe4f
Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle
2013-12-10 09:21:10 +13:00
Sam Hemelryk
f9fb9826be
NOBUG: rebuilt shifted files
2013-12-10 09:18:16 +13:00
Sam Hemelryk
8f2bd073aa
Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle
2013-12-10 09:09:06 +13:00
Sam Hemelryk
c8d6ee9870
Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle
2013-12-10 09:07:11 +13:00
Sam Hemelryk
437fd401f9
Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle
2013-12-10 09:06:54 +13:00
Sam Hemelryk
b78f0294bb
Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle
2013-12-10 08:48:33 +13:00
Sam Hemelryk
822f529014
Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle
2013-12-10 08:43:50 +13:00
Sam Hemelryk
e3f7ac09e7
Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle
...
Conflicts:
config-dist.php
2013-12-10 08:36:39 +13:00
Eloy Lafuente (stronk7)
d073a5f118
Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle
2013-12-09 16:24:26 +01:00
sam marshall
4c31243fc7
MDL-43252 Group menu in wrong order when groupings used
2013-12-09 13:02:12 +00:00
Sam Chaffee
262075ce02
MDL-40003 mod_assign: Fixed submission comments not being restored
2013-12-09 11:01:34 +01:00
Marina Glancy
95971ae99e
Merge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle
2013-12-09 18:54:53 +11:00
Marina Glancy
895d3050e0
Merge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle
2013-12-09 18:45:27 +11:00