Aparup Banerjee
37c68301f9
Merge branch 'w04_MDL-37499_m25_authldaptest' of git://github.com/skodak/moodle
2013-01-29 16:33:37 +08:00
Sam Hemelryk
ab58c6b724
Merge branch 'w04_MDL-37716_m25_enrolexpiry' of git://github.com/skodak/moodle
2013-01-29 14:56:57 +13:00
Andrew Robert Nicols
344936ae48
MDL-37350 Detach listeners when hiding the 'Add roles' popup
...
If the submit event listener is not correctly closed, then the submit event
calls the relevant callback multiple times incorrectly.
When hiding the Add role dialogue, we need to detach any event listeners
which are applied to it.
2013-01-28 09:57:08 +00:00
Petr Škoda
d8f22c49b1
MDL-37716 standardise enrolment expiration code
2013-01-26 14:55:11 +01:00
Petr Škoda
be094a59ca
MDL-37499 add test ldap debuginfo
2013-01-25 16:04:03 +01:00
Petr Škoda
00c269db37
MDL-37559 fix display of multiple roles of other users
...
Credit goes to Tyron Delean, thanks.
2013-01-19 16:50:38 +01:00
Sam Hemelryk
e17dbeeb1a
MDL-34398 groups: implemented caching of group information.
2013-01-17 09:24:58 +13:00
Dan Poltawski
0883d08fd0
Merge branch 'w02_MDL-37187_m25_flatfile' of git://github.com/skodak/moodle
2013-01-16 11:53:00 +08:00
Dan Poltawski
47ee9f9100
Merge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle
2013-01-16 11:09:21 +08:00
Dan Poltawski
cb598688a8
Merge branch 'w02_MDL-37175_m25_paypalmanage' of git://github.com/skodak/moodle
2013-01-16 10:54:55 +08:00
Dan Poltawski
82420bbb91
Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle
2013-01-16 10:19:57 +08:00
Eloy Lafuente (stronk7)
becb4de707
Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle
2013-01-16 01:58:08 +01:00
Eloy Lafuente (stronk7)
493d8f781c
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Petr Škoda
59e7cc03d7
MDL-37184 document new general enrolment editing page
2013-01-15 21:29:10 +01:00
Dan Poltawski
a85d61e812
Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle
2013-01-15 14:32:22 +08:00
David Monllao
7cd5340f05
MDL-28705 enrol_imsenterprise Quick unit tests fix
2013-01-15 14:24:57 +08:00
Dan Poltawski
5b2d44e9ca
Merge branch 'w02_MDL-37391_m25_enrolconnection' of git://github.com/skodak/moodle
2013-01-15 13:43:20 +08:00
Dan Poltawski
9cbb0944c9
Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle
2013-01-15 12:54:28 +08:00
Sam Hemelryk
ccc89b8235
Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle
2013-01-15 10:12:44 +13:00
Petr Škoda
34183020a7
MDL-37391 add enrol_ldap tests and fix enrolment reviving
2013-01-13 00:41:41 +01:00
Petr Škoda
23f36d50c5
MDL-37391 refactor ldap connection handling
2013-01-12 21:18:25 +01:00
Petr Škoda
b3ef2e519e
MDL-37175 enable PayPal enrolment editing
2013-01-12 16:35:19 +01:00
Petr Škoda
68527e9ef6
MDL-37019 use suspend as default unenrol action for meta enrolments
2013-01-12 16:29:12 +01:00
Petr Škoda
50f1c9e3f5
MDL-36514 add tests for showing of self enrolment link
2013-01-12 16:03:09 +01:00
Petr Škoda
e1fa177cf9
MDL-36514 add new option to prevent only new self enrolments
...
Hopefully this will resolve all confusion around the enrol->status flag in this plugin.
2013-01-12 16:03:08 +01:00
Petr Škoda
a069c3f76a
MDL-35899 fix cohort sorting in enrol UI
2013-01-12 16:00:29 +01:00
Petr Škoda
d9a707adc2
MDL-32387 add paypal enrolment expiration action
2013-01-12 15:59:25 +01:00
Petr Škoda
917dddaafe
MDL-37187 cleanup and improve enrol_flatfile plugin
2013-01-12 15:50:00 +01:00
Petr Škoda
0aaea0d241
MDL-37184 refactor enrolment editing code to be shared by plugins
...
AMOS BEGIN
MOV [editenrolment,enrol_self],[editenrolment,core_enrol]
AMOS END
2013-01-12 15:47:04 +01:00
Petr Škoda
1b20e00828
MDL-35159 fix regressions reported by Iñaki Arenaza
2013-01-12 15:42:21 +01:00
Petr Škoda
e34beca17a
MDL-35159 add support for enrol_ldap restore
2013-01-12 15:31:30 +01:00
Petr Škoda
92b00c32a7
MDL-37420 rework pg schema testing
2013-01-11 02:12:38 +01:00
Jerome Mouneyrac
fb695f6e3d
MDL-37354 clean return value for each externallib PHPUnit tests
2013-01-09 13:47:01 +08:00
Eloy Lafuente (stronk7)
f9f750cecc
Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle
2013-01-09 01:32:09 +01:00
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
Petr Škoda
917fddb5e2
MDL-37420 add support for db schemas in enrol test
2013-01-08 17:20:26 +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
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
df0b14c3b5
Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle
2013-01-08 14:22:11 +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
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
Eloy Lafuente (stronk7)
caf575e2bf
Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle
2013-01-07 11:44:16 +01:00
Sam Hemelryk
68ed412599
Merge branch 'w51_MDL-37281_m25_othersnav' of git://github.com/skodak/moodle
2013-01-07 13:35:25 +13:00
Sam Hemelryk
aedad9fcf3
Merge branch 'w51_MDL-37302_m25_roleedit' of git://github.com/skodak/moodle
2013-01-07 11:58:17 +13:00
Petr Škoda
ed05ee6b99
MDL-37315 fix connection reopening in ldap paging
2012-12-30 00:57:43 +01:00
Petr Škoda
5d549ffc8c
MDL-37299 use progress_trace in enrol_manual and enrol_self sync
2012-12-29 21:50:32 +01:00
