mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity
58,757 Commits 36 Branches 519 Tags
Commit Graph

1401 Commits

Author SHA1 Message Date
Frederic Massart
ba4c451f53 MDL-30871 enrol: Flat file does not fail when notifications are enabled 2012-10-30 11:03:12 +08:00
Petr Škoda
8a486fdb7d MDL-35843 implement self enrolment expiry notification 2012-10-19 16:04:00 +08:00
Petr Škoda
8c04252cbf MDL-35843 refactor expiry notifications to core enrol feature 2012-10-19 16:03:48 +08:00
Petr Škoda
8e941204b2 MDL-35843 prepare fox expiry refactoring to core enrol feature 
AMOS BEGIN
  MOV [errorthresholdlow,enrol_manual],[errorthresholdlow,core_enrol]
  MOV [expirynotify,enrol_manual],[expirynotify,core_enrol]
  MOV [expirynotify_help,enrol_manual],[expirynotify_help,core_enrol]
  MOV [expirynotifyall,enrol_manual],[expirynotifyall,core_enrol]
  MOV [expirynotifyteacher,enrol_manual],[expirynotifyenroller,core_enrol]
  MOV [notifyhour,enrol_manual],[expirynotifyhour,core_enrol]
  MOV [expirythreshold,enrol_manual],[expirythreshold,core_enrol]
  MOV [expirythreshold_help,enrol_manual],[expirythreshold_help,core_enrol]
AMOS END
 2012-10-19 16:03:40 +08:00
Sam Hemelryk
8422094d91 Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle 2012-10-16 11:23:24 +08:00
Dan Poltawski
f186ad1f90 Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle 2012-10-15 17:19:44 +08:00
Aparup Banerjee
de5a44eb3a Merge branch 'w42_MDL-36031_m24_messagesink' of git://github.com/skodak/moodle 2012-10-15 14:36:02 +08:00
Marina Glancy
4ede27b253 MDL-35339 deprecate get_course_section() replace with course_create_sections_if_missing() 
By passing course object instead of course id we ensure proper cache reset"
 2012-10-15 14:08:14 +08:00
Dan Poltawski
6bea7da1ab Merge branch 'wip-MDL-35661-master' of git://github.com/marinaglancy/moodle 2012-10-15 13:31:10 +08:00
Petr Škoda
f763b33dba MDL-36031 add unit tests for expiry notifications of manual enrolments 2012-10-13 21:21:53 +02:00
Eloy Lafuente (stronk7)
566682e8e5 Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle 2012-10-10 11:22:22 +02:00
Petr Škoda
9f4a3c73cd MDL-28980 fix notification defaults to use new expirynotify combo logic 2012-10-10 11:19:10 +02:00
Eloy Lafuente (stronk7)
be205a847a Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle 2012-10-10 09:50:25 +02:00
Petr Škoda
da6cf13f00 MDL-28980 use correct instance when informing enroller 2012-10-10 09:45:16 +02:00
Petr Škoda
493057fd27 MDL-28980 fix repeated enroller expiry notification 2012-10-10 09:41:30 +02:00
Aparup Banerjee
e5dba28cca Merge branch 'w41_MDL-35839_m24_enroldeletecleanup' of git://github.com/skodak/moodle 2012-10-10 10:29:33 +08:00
Eloy Lafuente (stronk7)
49b1c61e5e Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle 2012-10-10 00:22:11 +02:00
Petr Škoda
70cae08406 MDL-28980 improve expiry notification inline docs 2012-10-09 10:03:59 +02:00
Aparup Banerjee
84c04ff295 Merge branch 'MDL-35776' of git://github.com/timhunt/moodle 2012-10-09 11:53:12 +08:00
Aparup Banerjee
97512b094d Merge branch 'MDL-35802' of git://github.com/timhunt/moodle 2012-10-09 10:55:26 +08:00
Marina Glancy
79c5c3fa96 MDL-35661 Loading of plugin settings for enrol plugins (plugininfo_enrol) 2012-10-09 09:57:57 +08:00
Petr Škoda
129e6d36a4 MDL-28980 add basic expiry notification support to manual enrolments 
Thanks Helen Foster for the lang string improvements.
 2012-10-08 15:15:51 +02:00
Aparup Banerjee
dbce42a7c2 Merge branch 'w41_MDL-35814_m24_delinstance' of git://github.com/skodak/moodle 2012-10-08 14:59:07 +08:00
Sam Hemelryk
4c5f42b400 Merge branch 'MDL-35730' of https://github.com/aolley/moodle 2012-10-08 10:06:30 +13:00
Petr Škoda
194342144b MDL-35814 improve confirmation when deleting enrol instances 2012-10-07 20:01:14 +02:00
Petr Škoda
125e96f370 MDL-35839 add tests for enrol instance deleting 2012-10-06 19:37:05 +02:00
Tim Hunt
e059c033d9 MDL-35802 enrol other users: should use Show user identity setting. 
As part of fixing this, I refactored some common code out of
get_potential_users and search_other_users. Previously, only one of
those bits of code had been updated.
 2012-10-05 12:07:26 +01:00
Tim Hunt
13bd955e65 MDL-35776 user ajax: fix sort order in chrome. 
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.

This commit fixes the enrol UI.
 2012-10-03 19:06:17 +01:00
Eloy Lafuente (stronk7)
c740703c18 Merge branch 'w40_MDL-31437_m24_cohortsync' of git://github.com/skodak/moodle 
Conflicts:
	lib/upgrade.txt
 2012-10-02 22:00:12 +02:00
Eloy Lafuente (stronk7)
5a2c374326 Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle 2012-10-02 21:27:55 +02:00
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