1609 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
33ce661816 Merge branch 'MDL-43337-master' of git://github.com/FMCorz/moodle 2014-02-18 23:24:45 +01:00
Frederic Massart
457b82f238 MDL-43337 enrol: Missing break in get_enrolled_users WS 2014-02-13 12:06:04 +08:00
Frederic Massart
e06d359917 MDL-43337 enrol: More tests for get_enrolled_users_with_capability 2014-02-13 12:06:04 +08:00
apsdehal
578a39b841 MDL-43337 WebService: Missing break statement added
In function get_enrolled_users_with_capability
2014-02-13 11:37:22 +08:00
Petr Škoda
900b1bf7d1 MDL-43200 fix enrol_manual externallib tests 2014-02-12 16:01:34 +08:00
Sam Hemelryk
1cb3c0facc Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle 2014-02-10 14:11:25 +13:00
apsdehal
f80add6990 MDL-43200 WebServices: Reset Instance variable 2014-02-04 19:38:34 +05:30
Petr Škoda
bfaf4f00cb MDL-43903 prevent adodb error logging output in phpunit execution with
native ms sql driver
2014-01-30 10:39:34 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Mark Nelson
7cbb5070f5 MDL-40909 enrol_imsenterprise: removed 'new' add_to_log call
Here we are replacing the unnecessary code used to create a course with
a call to create_course(), which triggers the event 'course_created'.
Nothing more is needed.
2014-01-27 19:52:55 -08:00
Mark Nelson
f1f4f4fd7b MDL-40909 core_enrol: removed 'enrol' add_to_log calls
Before each of these calls a call to enrol_user() is made, which
triggers the event 'user_enrolment_created'. Nothing more is needed.
2014-01-27 19:52:55 -08:00
Mark Nelson
6324517209 MDL-40909 core_enrol: removed 'unenrol' add_to_log calls
Before each of these calls a call to unenrol_user() is made, which
triggers the event 'user_enrolment_deleted'. Nothing more is needed.
2014-01-27 19:52:55 -08:00
Eloy Lafuente (stronk7)
382addccef Merge branch '23837-27' of git://github.com/samhemelryk/moodle 2014-01-07 23:42:55 +01:00
Damyon Wiese
9673c119f2 MDL-36334 JS: Only print deprecation notices for developers 2014-01-07 16:11:27 +08:00
Damyon Wiese
a66aea5c67 Merge branch 'MDL-36334-master' of https://github.com/andrewnicols/moodle 2014-01-07 16:10:05 +08:00
Andrew Nicols
6fc9488862 MDL-36334 JS: Deprecate YUI galleryversion in enrol 2014-01-07 16:12:55 +11:00
Tony Butler
2b6b37d4f9 MDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times 2014-01-02 17:16:06 +00:00
Sam Hemelryk
3d907759ad MDL-23837 enrol: restyled the role and group controls 2014-01-02 11:39:53 +13:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/upgrade.txt
2013-12-17 16:32:35 +13:00
Sam Hemelryk
063baa62b5 Merge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle 2013-12-16 11:11:38 +13:00
Jerome Mouneyrac
571906e3f7 MDL-42085 Enrol: Always apply enrolment duration.
Before the fix, the startdates and duration fields were integrated to HTML code only
when the user clicked on the collapsible region to see them.
It was wrong because their values were not sent by the form
if ever the user didn't expand this Enrolment options region.
2013-12-12 16:04:52 +08:00
Eloy Lafuente (stronk7)
32a8bcc4a7 MDL-31410 paypal: fix problem on notifications
This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.
2013-12-12 02:27:53 +01:00
Eloy Lafuente (stronk7)
d47d52d531 Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle 2013-12-12 01:09:02 +01:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Eloy Lafuente (stronk7)
1c432ae6e1 Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle 2013-12-10 19:43:33 +01:00
Jenny Gray
0e61547ea9 MDL-43135 Guest Enrol: new language string for with key icon
AMOS BEGIN
CPY [pluginname,enrol_guest], [guestaccess_withpassword,enrol_guest]
CPY [pluginname,enrol_guest], [guestaccess_withoutpassword,enrol_guest]
AMOS END
2013-12-10 11:05:04 +00:00
Sam Hemelryk
c8d6ee9870 Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:07:11 +13:00
Petr Škoda
af549df9df MDL-31410 always send 200 in PayPal IPN response and hide all errors 2013-12-06 10:01:49 +08:00
Andrew Nicols
c0c1b7ac97 MDL-43212 JavaScript: Remove deprecated moodle-enrol-notification 2013-12-05 09:42:31 +08:00
Damyon Wiese
de3e0d20bd Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle
Conflicts:
	enrol/self/db/upgrade.php
2013-12-03 11:10:18 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Rajesh Taneja
95cf93b9f4 MDL-42904 self_enrol: Set customint1 if it's null 2013-11-25 10:01:00 +08:00
Sam Hemelryk
35a1978985 Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle 2013-11-19 12:24:56 +13:00
Petr Škoda
93d31b5d77 MDL-42612 add support for Russian Ruble in PayPal 2013-11-18 11:49:10 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
534c356a87 Merge branch 'wip-mdl-42536' of git://github.com/rajeshtaneja/moodle 2013-10-25 15:55:27 +08:00
Rajesh Taneja
735c3a7b4f MDL-42536 enrol_self: Added groups/lib.php required file 2013-10-25 11:09:43 +08:00
Eloy Lafuente (stronk7)
d0285a0d91 Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle 2013-10-24 23:27:11 +02:00
Dan Poltawski
295e4fa8f4 MDL-29070 enrol_imsenterprise: more code cleanups
Including:
* fix whitespace
* coding style fixes:
* Declare method visibility
* Don't have variable names with underscores
* Comments without .
* if/for loop spacing
* Unused variables
* Split long lines
* Removed outdates files
* moodlecheck warnings
* code checker warnings
2013-10-23 17:10:56 +08:00
Brian Biggs
1ee378bbdc MDL-29070 enrol_imsenterprise: Code cleanup
In preparation for new features.
2013-10-23 17:10:35 +08:00
Petr Škoda
fa151f7a13 MDL-42206 improve course edit performance when use meta courses 2013-10-18 15:17:02 +02:00
Damyon Wiese
c778085550 Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle 2013-10-09 14:42:23 +08:00
Petr Škoda
6cf2091571 MDL-16073 add test for connection to external database for authentication and enrolments 2013-10-08 21:53:51 +02:00
Damyon Wiese
43822d89c5 Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle 2013-10-08 13:47:49 +08:00
Petr Škoda
12c92bca22 MDL-37717 warn teachers before disabling or deleting their enrolment method 2013-10-04 16:02:48 +02:00
Petr Škoda
483916069c MDL-42047 fix cohort method name error after deleting cohort 2013-10-04 11:32:03 +02:00
Eloy Lafuente (stronk7)
da600e5314 Merge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle 2013-10-01 19:43:42 +02:00