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

187 Commits

Author SHA1 Message Date
Dan Poltawski
3280819b20 Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle 2012-12-18 09:10:42 +08:00
Sam Hemelryk
e7335920f3 MDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget 2012-12-12 09:37:27 +08:00
Sam Hemelryk
abb0ce1b42 MDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling users 2012-12-12 09:37:27 +08:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Eloy Lafuente (stronk7)
663dbbc2e6 MDL-36933 Bump everything to 2012112900 
(versions, requires and dependencies)
 2012-11-30 03:30:09 +01:00
Sam Hemelryk
2644c4f33a Merge branch 'MDL-30139_master' of https://github.com/markn86/moodle 2012-11-28 11:14:47 +13:00
David Monllao
f068cac195 MDL-30899 moodle-core-notification Adding focus to non modal windows 2012-11-27 14:40:10 +08:00
Frederic Massart
c42651d682 MDL-36622 usability: Adaptations following new icons 2012-11-15 19:47:14 +08:00
Mark Nelson
fe8a06dc74 MDL-30139 enrol: added search button to AJAX enrolment search 2012-11-13 17:07:22 +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
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
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
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
Sam Hemelryk
4c5f42b400 Merge branch 'MDL-35730' of https://github.com/aolley/moodle 2012-10-08 10:06:30 +13: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
Adam Olley
e3d9426ab5 enrol_manual: Set context correctly in manual enrolment user selector 2012-10-02 14:51:24 +09:30
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
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
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
Petr Škoda
5ddd9921fe MDL-35063 add configurable action on manual enrolment expiration 2012-09-16 11:01:07 +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
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
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
Petr Škoda
5d605db1dc MDL-35064 improve enrol test comments 
Thanks Aparup Banerjee for the feedback.
 2012-08-28 15:28:17 +02: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
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
84bc3773cc MDL-35064 add option to keep enrolments when uninstalling plugin 2012-08-26 12:17:11 +02: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
47c8b9788f MDL-34853 use new duration setting type in enrol_manual 2012-08-22 03:00:11 +02:00
Petr Škoda
cb94adc252 MDL-34776 improve multiple "NOT IN" enrolment and role related queries 2012-08-18 09:56:25 +02:00