mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 10:58:38 +01:00
Code Issues Projects Releases Wiki Activity
58,279 Commits 36 Branches 523 Tags
Commit Graph

58279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle 
Conflicts:
	user/view.php
 2013-01-09 09:34:22 +13:00
Andrew Robert Nicols
60fb0ef8a9 MDL-36600 user: improve course messaging checks 2013-01-09 09:21:35 +13:00
Eloy Lafuente (stronk7)
4f90540e0c Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle 2013-01-08 18:01:43 +01:00
Jean-Michel Vedrine
d55399a098 MDL-28183 fix for problem during integration 
Conflicts:
	question/type/multianswer/question.php
 2013-01-08 12:03:48 +01:00
Eloy Lafuente (stronk7)
f9ba4fd83b Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle 2013-01-08 11:54:19 +01:00
Eloy Lafuente (stronk7)
a74c3851f7 Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle 2013-01-08 11:39:23 +01:00
Eloy Lafuente (stronk7)
783a51ba48 Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle 2013-01-08 10:51:49 +01:00
Eloy Lafuente (stronk7)
cf78070a63 Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle 2013-01-08 10:34:04 +01:00
Eloy Lafuente (stronk7)
b315a45274 Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle 2013-01-08 10:21:50 +01:00
Dan Poltawski
6c8d7fed66 Merge branch 'w51_MDL-7537_m25_paypalcur' of git://github.com/skodak/moodle 2013-01-08 16:49:47 +08:00
Dan Poltawski
6d0a62bc37 MDL-3941 - version bump for TLS support in ldap 2013-01-08 16:42:47 +08:00
Dan Poltawski
6c74a228f3 Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iarenaza/moodle 2013-01-08 16:40:50 +08:00
Dan Poltawski
655b566b9e Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle 2013-01-08 15:08:05 +08:00
Dan Poltawski
1a12cbd9df Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle 2013-01-08 14:50:29 +08:00
Dan Poltawski
bfb5580f92 Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle 2013-01-08 14:46:14 +08:00
Dan Poltawski
81a38f50fb Merge branch 'wip_master_mdl-28585_ldap_auth_doesnt_handle_password_expiration' of https://github.com/iarenaza/moodle 2013-01-08 14:40:15 +08:00
Dan Poltawski
c37c9e760d Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle 2013-01-08 14:29:32 +08:00
Dan Poltawski
397e4ecf76 Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle 2013-01-08 14:26:52 +08:00
Dan Poltawski
df0b14c3b5 Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle 2013-01-08 14:22:11 +08:00
Dan Poltawski
7f3e944aa1 Merge branch 'w51_MDL-37304_m25_authdbcleanup' of git://github.com/skodak/moodle 2013-01-08 14:15:22 +08:00
Jason Fowler
21c3b51e27 MDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs 2013-01-08 14:06:32 +08:00
Ankit Agarwal
7a216229ab MDL-37106 calendar: Proper capability checks should be done before processing an ical request 2013-01-08 14:03:38 +08:00
Dan Poltawski
d161e37488 Merge branch 'MDL-36738-master' of git://github.com/ankitagarwal/moodle 2013-01-08 13:57:47 +08:00
Ankit Agarwal
7af294352b MDL-36738 calendar: Display events imported details 
We should display a the status of events when a new subscription is added. Although this means we need to redirect through an itermediate page.
 2013-01-08 13:47:49 +08:00
Ankit Agarwal
8c84f374c0 MDL-36738 calendar: Ical subscription list should display type of event 2013-01-08 13:47:48 +08:00
Dan Poltawski
87ffc3fb69 Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle 2013-01-08 13:01:00 +08:00
Dan Poltawski
3dab21591d Merge branch 'w51_MDL-21116_m52_reversedel' of git://github.com/skodak/moodle 2013-01-08 12:58:16 +08:00
Dan Poltawski
7378493ee9 Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle 2013-01-08 12:50:44 +08:00
Dan Poltawski
4c345a1ed4 Merge branch 'MDL-36955' of git://github.com/jmvedrine/moodle 2013-01-08 12:20:54 +08:00
Mark Nelson
2b9fe87dca MDL-37247 mod_forum: adding webservice function to allow for the retrieval of forum instances 2013-01-08 12:19:49 +08:00
Dan Poltawski
9519d41142 MDL-28183 - fix trailing whitespace 2013-01-08 12:18:49 +08:00
Dan Poltawski
b5b418b2a7 Merge branch 'MDL-28183' of git://github.com/jmvedrine/moodle 2013-01-08 12:17:51 +08:00
Dan Poltawski
f858088cc4 Merge branch 'w51_MDL-37191_m25_plugindelete' of git://github.com/skodak/moodle 2013-01-08 11:16:43 +08:00
Dan Poltawski
cfb209a538 Merge branch 'MDL-31641_drag_drop_help' of git://github.com/davosmith/moodle 2013-01-08 10:54:01 +08:00
Dan Poltawski
f94ed34126 MDL-35130 - remove unused string 2013-01-08 10:52:18 +08:00
Dan Poltawski
230a377474 Merge branch 'MDL-35130-master' of https://github.com/mackensen/moodle 2013-01-08 10:50:46 +08:00
Dan Poltawski
a57ce0fde4 Merge branch 'w51_MDL-37297_m25_enrolcatprogress' of git://github.com/skodak/moodle 2013-01-08 10:48:13 +08:00
Dan Poltawski
00079538b9 Merge branch 'MDL-36456-master' of git://github.com/FMCorz/moodle 2013-01-08 10:30:50 +08:00
Dan Poltawski
a1d9f433ec Merge branch 'w51_MDL-37301_m25_coursecatinfoas' of git://github.com/skodak/moodle 2013-01-08 10:26:44 +08:00
Dan Poltawski
36b6340532 Merge branch 'w51_MDL-37254_m25_courseinfoas' of git://github.com/skodak/moodle 2013-01-08 10:24:01 +08:00
Dan Poltawski
a275bedb38 Merge branch 'w51_MDL-37298_m25_enrolcohprogress' of git://github.com/skodak/moodle 2013-01-08 10:16:19 +08:00
Dan Poltawski
e06c710e87 Merge branch 'w51_MDL-37293_m25_enroldbprogress' of git://github.com/skodak/moodle 2013-01-08 09:52:29 +08:00
Sam Hemelryk
b68fb448ef Merge branch 'wip-mdl-36958' of git://github.com/rajeshtaneja/moodle 2013-01-08 14:07:03 +13:00
Sam Hemelryk
c4c1504b44 Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skodak/moodle 2013-01-08 14:00:44 +13:00
David Mudrák
0ab681d3e7 MDL-36977 Be more picky when it comes to migrating files in moodle1 backups 2013-01-08 08:53:38 +08:00
David Mudrák
7b66137f7b MDL-36977 Add more unit tests for moodle1 backup conversion 2013-01-08 08:53:37 +08:00
Sam Hemelryk
be5a3168df MDL-21342 auth: tidy up pre-integration 2013-01-08 13:41:22 +13:00
Sam Hemelryk
70601b9433 Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle 2013-01-08 10:56:39 +13:00
Eloy Lafuente (stronk7)
17e5c6e8d2 Merge branch 'MDL-35794' of git://github.com/timhunt/moodle 2013-01-07 22:40:00 +01:00
Eloy Lafuente (stronk7)
3cb7609bd6 Merge branch 'MDL-35792' of git://github.com/timhunt/moodle 2013-01-07 22:35:06 +01:00