Commit graph

1371 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f7a506fb87 Merge branch 'master_MDL-35557' of git://github.com/danmarsden/moodle 2012-10-02 20:26:32 +02:00
Eloy Lafuente (stronk7)
b94ffc6d8c Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle 2012-10-02 15:54:32 +02:00
Adam Olley
e3d9426ab5 enrol_manual: Set context correctly in manual enrolment user selector 2012-10-02 14:51:24 +09:30
Dan Poltawski
f7b3ac9427 Merge branch 'w40_MDL-35619_m24_otheravatars' of git://github.com/skodak/moodle 2012-10-02 10:41:47 +08:00
Petr Škoda
e66827464a MDL-35619 fix invalid avatars on other users page 2012-10-01 09:53:11 +02:00
Petr Škoda
d156ec9cea MDL-35701 bump up version and requirements of enrol_database
This should hopefully prevent attempts to blindly backport this to older stable branches.
2012-09-30 14:37:04 +02:00
Petr Škoda
7fa34d1066 MDL-35701 add enrol_database restore support 2012-09-30 14:36:57 +02:00
Petr Škoda
d2f26cec9d MDL-35701 add parameter for sync of one course only 2012-09-30 14:36:50 +02:00
Petr Škoda
f34518d956 MDL-35701 fix inline docs 2012-09-30 14:36:39 +02:00
Petr Škoda
9bb3a168cf MDL-35701 respect case of external column names in enrol_database
This fixes a regression which prevents referencing of uppercase columns in databases with case sensitive column names. Unfortunately users that relied on this incorrect behaviour may need to lowercase the column names in plugin settings.
2012-09-30 14:36:31 +02:00
Petr Škoda
13a2366cad MD-35701 implement enrol_database unit tests and fix minor issues
Includes fixes for minor problems discovered during testing:
* Removed invalid role->fullname sync option, there was never such fields in roles table and the name column is now usually empty.
* Empty category column now means use default category.
2012-09-30 14:36:23 +02:00
Petr Škoda
d34770032c Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle into w40_MDL-35701_m24_enroldb 2012-09-30 14:35:57 +02:00
Petr Škoda
7881024ec4 MDL-31437 add group sync option to enrol_cohort
This patch includes following changes and new features:
* Group sync in enrol_cohort plugin.
* Option for editing of role in existing cohort sync instance.
* Group memberships are now restored after enrolments.
* New enrol method for restore of protected group membership.
* New component callback 'restore_group_member' for restore of general plugin group membership.
* New component callback 'restore_role_assignment' for restore of general plugin role assignments.
* Implemented group membership protection in enrolment UI.
* Other minor fixes and cleanup.

Notes:
* The YUI base enrolment page is not reimplemented yet - see MDL-35618.
2012-09-28 21:00:00 +02:00
Dan Marsden
c70590245d MDL-35562 enrol_database: enrolment_sync - don't halt sync on failed search for course. 2012-09-28 09:06:44 +12:00
Dan Marsden
d7e8f95b74 MDL-35557 enrol/database: use distinct call when getting list of courses that should be added. 2012-09-28 09:05:28 +12:00
Petr Škoda
08403f9e31 MDL-31437 add enrol_cohort tests 2012-09-27 14:40:24 +02:00
Tim Hunt
9695ff811b MDL-34657 user sorting: consistent sorting everywhere.
This commit coverts everything in the codebase to use the new
users_order_by_sql function when sorting lists of users. More details in
the bug.

Note that this does not change places where users are displayed in a
sortable table, and the sort order comes from the table.
2012-09-27 12:41:42 +01:00
Eloy Lafuente (stronk7)
ba6d56c202 Merge branch 'WIP-MDL-35481' of git://github.com/nadavkav/moodle 2012-09-27 00:06:17 +02:00
Jerome Mouneyrac
12fc8acf5b MDL-35198 replace key_exists by array_key_exists 2012-09-26 15:20:18 +08:00
Dan Poltawski
21d3bfb39a MDL-31859 - fix more trailing whitespace 2012-09-26 14:44:42 +08:00
Dan Poltawski
ac994d5a8a Merge branch 'MDL-31859' of git://github.com/Lightwork-Marking/moodle 2012-09-26 14:16:55 +08:00
Dan Poltawski
32441f0c51 Merge branch 'MDL-34778_accessibility' of git://github.com/rwijaya/moodle 2012-09-25 13:43:25 +08:00
Nadav Kavalerchik
9fe40de660 MDL-35481 - Invert "search option" listbox "open" arrow, when in RTL mode (page: manual user course registration ) and Personal Blog page 2012-09-22 21:05:14 +03:00
Paul Charsley
b6b6c7acb6 MDL-31859 added get_enrolled_users_with_capability web service function 2012-09-21 09:37:06 +12: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