1248 Commits

Author SHA1 Message Date
Dan Poltawski
32441f0c51 Merge branch 'MDL-34778_accessibility' of git://github.com/rwijaya/moodle 2012-09-25 13:43:25 +08:00
Eloy Lafuente (stronk7)
58e4214b95 Merge branch 'w38_MDL-35331_m24_verboseenroldb' of git://github.com/skodak/moodle 2012-09-18 19:20:05 +02:00
Eloy Lafuente (stronk7)
5fe658fca9 Merge branch 'w38_MDL-35062_m24_selfaction' of git://github.com/skodak/moodle 2012-09-18 18:57:39 +02:00
Eloy Lafuente (stronk7)
8f75ffeba1 Merge branch 'w38_MDL-35063_m24_manualaction' of git://github.com/skodak/moodle 2012-09-18 17:41:49 +02:00
Rossiani Wijaya
b5e2c24ad8 MDL-34778 enrol: add a space 2012-09-17 12:13:20 +08:00
Rossiani Wijaya
c4ede87628 MDL-34778 enrol: convert to html_writer 2012-09-17 12:13:20 +08:00
Rossiani Wijaya
75b226b665 MDL-34778 accessibility compliance for enrol: add label tag for input text 2012-09-17 12:13:20 +08:00
Nadav Kavalerchik
8e04747b8c MDL-35248 - Left justify CLOSE button on users modal dialog, when in RTL mode 2012-09-17 12:12:12 +08:00
Petr Škoda
5ddd9921fe MDL-35063 add configurable action on manual enrolment expiration 2012-09-16 11:01:07 +02:00
Petr Škoda
90bd89651e MDL-35062 add configurable action on self enrolment expiration 2012-09-16 10:57:57 +02:00
Petr Škoda
085bf0c9fb MDL-35331 add description of invalid enrolment records in enrol_database sync 2012-09-15 14:24:01 +02:00
Eloy Lafuente (stronk7)
9549090df0 MDL-27856 Fix incorrect instanceid assignment. 2012-09-14 01:52:04 +02:00
Eloy Lafuente (stronk7)
b01c955fef Merge branch 'w37_MDL-27856_m24_cohortrestore' of git://github.com/skodak/moodle 2012-09-14 01:19:50 +02:00
Eloy Lafuente (stronk7)
2bc620b363 Merge branch 'w37_MDL-35071_m24_enrolrestore' of git://github.com/skodak/moodle 2012-09-14 01:08:49 +02:00
Aparup Banerjee
55fcd5678e Merge branch 'MDL-34967' of git://github.com/mouneyrac/moodle 2012-09-12 14:26:34 +08:00
Petr Škoda
7fc9433c87 MDL-35270 fix ambiguously defined column
Credit goes to Sara Arjona, thanks.
2012-09-08 10:49:00 +02:00
Petr Škoda
e7193380d8 MDL-27856 coding style cleanup 2012-09-07 11:13:34 +02:00
Petr Škoda
94335e5a97 MDL-27856 support restore of cohort in the same site 2012-09-07 11:13:27 +02:00
Petr Škoda
7a7b8a1f19 MDL-35071 redesign enrol restore
Includes option to convert all enrolments to enrol_manual instances, support for mapping of custom fields and fixes for several other problems. This does not include support for custom enrol tables, it will be addressed in another issue.
2012-09-07 11:11:28 +02:00
Aparup Banerjee
c43f715d42 Merge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle 2012-09-04 17:31:50 +08:00
Jerome Mouneyrac
566596abd7 MDL-34967 PHPunit test: enrol/externallib.php and enrol/manual/externallib.php 2012-09-04 12:26:21 +08:00
Tim Lock
c3a0938e79 MDL-35092: Add proxy support to enrol/paypal IPN 2012-09-04 10:55:09 +08:00
Aparup Banerjee
8be5407bc1 Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle
Conflicts:
	enrol/manual/locallib.php
2012-08-29 13:46:04 +08:00
Eloy Lafuente (stronk7)
238f7761af Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle
Conflicts:
	lib/db/upgrade.php
2012-08-29 00:42:43 +02:00
Eloy Lafuente (stronk7)
af1e3f2828 Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle
Conflicts:
	enrol/self/editenrolment.php
2012-08-28 21:05:26 +02:00
Eloy Lafuente (stronk7)
5298faed69 Merge branch 'w35_MDL-23875_m24_selfcohort' of git://github.com/skodak/moodle 2012-08-28 20:51:37 +02:00
Petr Škoda
5d605db1dc MDL-35064 improve enrol test comments
Thanks Aparup Banerjee for the feedback.
2012-08-28 15:28:17 +02:00
Petr Škoda
af29ef049e MDL-23875 improve cohort only help
Credit goes to Helen Foster.
2012-08-28 08:32:23 +02:00
Aparup Banerjee
9455f48280 Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle 2012-08-28 11:45:11 +08:00
Aparup Banerjee
6d04dc705c Merge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle 2012-08-28 11:35:24 +08:00
Petr Škoda
eef59b1254 MDL-35070 fix incorrect enrol join 2012-08-27 17:20:47 +02:00
Petr Škoda
764094585b MDL-35072 fix bogus left enrol join
Credit goes to Eloy, thanks.
2012-08-27 17:19:07 +02:00
Rajesh Taneja
9e7cd6e7a5 MDL-34537 Enrolments: Assign alternative odd and even class to manual enrol popup 2012-08-27 13:59:09 +08:00
Petr Škoda
6f6c9e5c6a MDL-35072 coding style cleanup in enrol_manual 2012-08-26 16:37:49 +02:00
Petr Škoda
005e57a225 MDL-35052 show all enrolled users in enrol UI included those enrolled via disabled plugins 2012-08-26 16:28:18 +02:00
Petr Škoda
d9669db9b3 MDL-35070 coding style cleanup in enrol_self 2012-08-26 16:02:38 +02:00
Petr Škoda
dd6b1f15cf MDL-23875 add option to limit self-enrol to cohort members only 2012-08-26 15:56:01 +02:00
Petr Škoda
84bc3773cc MDL-35064 add option to keep enrolments when uninstalling plugin 2012-08-26 12:17:11 +02:00
sam marshall
1d1917aeaa MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields 2012-08-24 15:30:13 +01:00
Ankit Agarwal
5fbe2118bc MDL-34549 libraries: Changing strictness of context::instance_by_id() when required 2012-08-24 11:30:35 +08:00
Ankit Agarwal
d197ea4300 MDL-34549 libraries: Replace get_context_instance_by_id() by context::instance_by_id() 2012-08-24 11:30:10 +08:00
Dan Poltawski
d94ef56395 MDL-34870 enrol_cohort - don't need to do useless work 2012-08-22 10:02:53 +08:00
Dan Poltawski
cff2026980 Merge branch 'MDL-34870' of git://github.com/aolley/moodle 2012-08-22 09:52:48 +08:00
Eloy Lafuente (stronk7)
b6b34345ac Merge branch 'MDL-34853' of local stronk7 repo.
(originally w34_MDL-34853_m24_durationsetting @ git://github.com/skodak/moodle.git)
2012-08-22 03:41:14 +02:00
Petr Škoda
ef2737a4df MDL-34853 use new duration setting type in enrol_paypal 2012-08-22 03:00:12 +02:00
Petr Škoda
0bf660cad6 MDL-34853 use new duration setting type in enrol_self 2012-08-22 03:00:12 +02:00
Petr Škoda
47c8b9788f MDL-34853 use new duration setting type in enrol_manual 2012-08-22 03:00:11 +02:00
Eloy Lafuente (stronk7)
a477affda0 Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle 2012-08-22 01:58:13 +02:00
Petr Škoda
8d9b8a4894 MDL-34864 bump up enrol category sync version 2012-08-18 11:39:03 +02:00
Petr Škoda
4b0b9f1d9d MDL-34864 add enrol_category unit tests for sync 2012-08-18 11:34:36 +02:00