mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
57,577 Commits 36 Branches 519 Tags
Commit Graph

1320 Commits

Author SHA1 Message Date
Dan Poltawski
86ebf41545 Merge branch 'MDL-30871-master' of git://github.com/FMCorz/moodle 2012-11-20 11:47:17 +08:00
Dan Poltawski
1ae8e2f963 Merge branch 'MDL-36415-master-int' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2012-11-19 10:51:54 +08:00
Frederic Massart
06b7ed0a45 MDL-36415 usability: Use new up/down and ordering icons 2012-11-16 12:47:09 +08:00
Frederic Massart
c42651d682 MDL-36622 usability: Adaptations following new icons 2012-11-15 19:47:14 +08:00
Petr Škoda
8975ff88cb MDL-36169 fix enrolled users sorting by alphanumerical column 
Credit goes to Nicholas Koeppen, thanks!
 2012-11-09 19:47:35 +01:00
Dan Poltawski
afa23468e9 MDL-36119 - enrol_ldap: fix php error 2012-11-09 14:38:32 +08:00
Dan Poltawski
440021c8a5 Merge branch 'MDL-35349_master' of git://github.com/markn86/moodle 2012-11-08 18:54:58 +08:00
Dan Poltawski
0d90b7e4bc Merge branch 'w45_MDL-36431_m24_selfdefaults' of git://github.com/skodak/moodle 2012-11-08 15:04:19 +08:00
Dan Poltawski
9b70e89fc3 MDL-36436 - remove disabling of setting based on ldap paging support 2012-11-08 10:22:30 +08:00
Dan Poltawski
ee943e7311 MDL-36119 - fix trailing whitespace 2012-11-08 10:18:06 +08:00
Dan Poltawski
809c1bee49 Merge branch 'wip_master_mdl-36119_ldap_paged_results' of git://github.com/iarenaza/moodle 2012-11-08 09:48:36 +08:00
Iñaki Arenaza
c090d7c90e MDL-36119: auth_{ldap,cas}: LDAP Sync - implement paged results 
Thanks to Jerome Charaoui for the original patch.
 2012-11-07 19:13:10 +01:00
Petr Škoda
eac37ff46a MDL-36431 fix multiple problems with self enrol defaults 
This patch adds new method for retrieving of default properties of enrol_self instances and uses it both for automatic adding of instances and add instance form - this will guarantee both are using the same data in the future.
 2012-11-07 18:57:14 +01:00
Dan Poltawski
8f3020558d Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-07 14:17:11 +08:00
Marina Glancy
850acb3560 MDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary 
- If we want to check fields 'numsections' or 'hiddensections' call course_get_format()->get_format_options()
- We still use extended course object in course/edit.php, update_course(), create_course(), and inside course formats
 2012-11-05 11:22:06 +08:00
Petr Škoda
05f6da14f7 MDL-33017 add new function for quickly finding out if user sees at least on course 
This will be used in navigation.
 2012-11-04 11:08:25 +13:00
Mark Nelson
feb1a1beb8 MDL-35349 paypal: Fixing return page so that it now declares page context 2012-11-02 15:35:24 +08:00
Marina Glancy
b5cf83f080 MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options 
- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object
 2012-11-02 10:56:19 +08:00
Marina Glancy
fc79ede5a1 MDL-35768 Added format-specific options to edit course and section forms 
- Course format may define additional fields (format options) to store for course and each section
- Edit course form allows to edit format-specific options and refreshes their list on format change
- Course format may provide it's own form for editing a section
- Default form for editing section allows to edit all format-specific fields
- Class section_info refactored, it defines magic methods such as __get() to access basic section
  information and format-specific options (retrieved only on the first request)
- format_base::update_course_format_options() allows to watch pre-update state of the course,
  format_legacy automatically copies the options with the same names between formats
 2012-11-02 10:55:23 +08:00
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