Commit Graph

1384 Commits

Author SHA1 Message Date
Damyon Wiese d4609de200 Merge branch 'w41_MDL-42047_m24_cohortdel' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-09 14:44:25 +08:00
Damyon Wiese 786538f74f Merge branch 'MDL-32570-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-08 13:46:42 +08:00
Petr Škoda 8f3702ee1a MDL-42047 fix cohort method name error after deleting cohort 2013-10-04 11:33:23 +02:00
Marina Glancy d7788d69f6 Merge branch 'MDL-32592-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-01 20:49:41 +10:00
Marina Glancy a033a6b4c1 Merge branch 'MDL-39653-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE 2013-10-01 20:44:07 +10:00
Dan Poltawski 756fbd91fd MDL-32570 enrol_imsenterprise: don't hardcode default category id 2013-10-01 11:52:46 +08:00
Dan Poltawski 3d986cf8cd MDL-39653 enrol_imsenterprise: only mail admins on change
The existing beavhiour was sending useless emails to admins and
generating warnings.

Thanks to Matthew Orlando for the suggested fix.
2013-09-27 12:23:37 +08:00
Dan Poltawski aaf95d0161 MDL-32592 enrol_imsenterprise: fix error when category not defined
thanks to Henrik Thorn for the fix
2013-09-26 14:59:08 +08:00
Dan Poltawski 473aab4ffb MDL-26408 enrol_imsenterprise: fix invalid component 2013-09-26 12:21:42 +08:00
Sam Hemelryk c88b113c1f Merge branch 'MDL-41528_MOODLE_24_STABLE' of https://github.com/nitzo/moodle into MOODLE_24_STABLE 2013-09-11 09:26:02 +12:00
Rajesh Taneja 1e557db89d MDL-41590 Enrolments: If course is deleted, then use courseid for reference 2013-09-11 08:47:04 +12:00
Damyon Wiese a77864208e Merge branch 'MDL-41497-24' of https://github.com/willylee/moodle into MOODLE_24_STABLE 2013-09-10 12:23:17 +08:00
Nitzan Bar 2dd8a44c20 MDL-41528 enrol/ldap course default settings when no course template is selected 2013-09-06 02:14:20 +03:00
Damyon Wiese 3caeaa448e MDL-41259 ldap: Move on to the next course when create_course fails 2013-09-04 16:16:15 +08:00
Damyon Wiese 3e230a757c MDL-41259 enrol_ldap: Fix for backport branch
Use error_log instead of the newer progress trace.
2013-09-04 12:48:42 +08:00
Nitzan Bar 1fdb431dfe MDL-41259 when duplicate course shortname exists an exception is thrown and sync is aborted 2013-09-02 15:09:06 +08:00
Willy Lee c959f27415 MDL-41497 enrol_database: Added help text for using odbc dsn names instead 2013-08-30 09:03:41 -05:00
Sam Hemelryk fef821d726 Merge branch 'm24_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-08-21 10:59:34 +12:00
Dan Marsden 1fc4e2b414 MDL-41144 enrol_flatfile: ignore deleted users 2013-08-16 09:33:12 +12:00
Dan Poltawski 376ba9f726 MDL-41191 enrol: unit tests for enrol_get_shared_courses 2013-08-14 21:40:36 +08:00
Tim Hunt 712bcc3e09 MDL-40527 enrol meta: respect $CFG->courselistshortnames
Thanks to James Henestofel for working this out in MDL-37558. That issue
got complex, so I am just submitting this simple part of it for
integration.
2013-07-05 15:37:09 +01:00
Helen Foster c3f4867a41 MDL-40439 Merge English strings from the en_fix language pack 2013-07-02 11:51:45 +02:00
Petr Škoda d04e51bd18 MDL-39802 ignore deleted users in meta enrolments 2013-05-28 10:05:15 +08:00
Petr Škoda 6134a1f844 MDL-39802 ignore deleted users in cohort enrolments 2013-05-28 10:05:11 +08:00
Petr Škoda 5ffd03ea74 MDL-39802 ignore deleted users in category enrolments 2013-05-28 10:05:08 +08:00
Damyon Wiese 4fffc06f65 Merge branch 'w22_MDL-39802_m24_deletedusers' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-05-28 09:55:50 +08:00
Petr Škoda cd9dab04b9 MDL-38408 validate PayPal dates and costs always 2013-05-25 22:16:45 +02:00
Petr Škoda 7934b786a9 MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin 2013-05-24 21:18:23 +02:00
Petr Škoda b795853f5b MDL-38753 tweak count SQL to make stupid Oracle happy 2013-04-08 12:34:46 +02:00
Petr Škoda 8cdc6bfc4f MDL-38180 do not add links for enrol and other users candidates 2013-03-19 18:03:13 +01:00
Eloy Lafuente (stronk7) e9d41cebe5 Merge branch 'MDL-38031-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE 2013-02-19 12:50:25 +01:00
Rossiani Wijaya 4086097935 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:30:33 +08:00
Rossiani Wijaya 53a054c8dd MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu 2013-02-18 10:27:38 +08:00
Frederic Massart b4d0144d09 MDL-38301 usability: Fixed wrong icon size 2013-02-15 10:05:20 +08:00
Petr Škoda 1b2ab57a92 MDL-37767 allow empty host in enrol_database which is required for default pg socket 2013-01-30 00:42:37 +01:00
Andrew Robert Nicols 584eca0871 MDL-37350 Detach listeners when hiding the 'Add roles' popup
If the submit event listener is not correctly closed, then the submit event
calls the relevant callback multiple times incorrectly.

When hiding the Add role dialogue, we need to detach any event listeners
which are applied to it.
2013-01-28 09:58:39 +00:00
Petr Škoda 55fc886ea7 MDL-37559 fix display of multiple roles of other users
Credit goes to Tyron Delean, thanks.
2013-01-19 16:51:29 +01:00
Eloy Lafuente (stronk7) c7e4ebf3f3 Merge branch 'MDL-37354-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE 2013-01-15 21:51:00 +01:00
Eloy Lafuente (stronk7) 9b7b6fa33c MDL-37420 rework pg schema (partial backport of 92b00c3) 2013-01-11 10:33:33 +01:00
Jerome Mouneyrac ada5df1069 MDL-37354 clean return value for each externallib PHPUnit tests 2013-01-09 13:55:54 +08:00
Petr Škoda a668f57e75 MDL-37420 add support for db schemas in enrol test 2013-01-08 17:35:59 +01:00
Petr Škoda f923f7aefe MDL-xxxx show appropriate instance status on user enrolments page 2013-01-08 14:22:28 +08:00
Eloy Lafuente (stronk7) f849d1f6fc Merge branch 'w51_MDL-36807_m24_mysocket' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 11:44:54 +01:00
Sam Hemelryk 192cb8f894 Merge branch 'w51_MDL-37281_m24_othersnav' of git://github.com/skodak/moodle into MOODLE_24_STABLE 2013-01-07 13:35:04 +13:00
Petr Škoda e6a3c6e1a1 MDL-37315 fix connection reopening in ldap paging 2012-12-30 00:58:20 +01:00
Petr Škoda 2a39a4e01c MDL-37281 fix other users current navigation node 2012-12-22 14:59:12 +01:00
Petr Škoda a48b376978 MDL-36807 use our mysql socket logic in adodb tests 2012-12-20 22:41:57 +01:00
Thanh Le 53f7c0c641 MDL-36259 course short names: ensure it displays when enabled in admin
Fixed 5 Moodle pages that does not display the course short name even if "Display extended course names" setting is on.  In fixing this, search.php also included related minor code to change to minimise DB calls to improve performance.
2012-12-18 14:26:02 +08:00
David Monllao 0409483d5f MDL-30899 moodle-core-notification Adding focus to non modal windows 2012-12-17 16:26:56 +08:00
Sam Hemelryk 7a4b7c5e18 MDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget 2012-12-12 09:37:36 +08:00