1591 Commits

Author SHA1 Message Date
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
Marina Glancy
c9e4ade71e Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle 2013-10-01 20:49:03 +10:00
Marina Glancy
815f0ef33c Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle 2013-10-01 20:42:37 +10:00
Dan Poltawski
259e7e6207 MDL-32570 enrol_imsenterprise: don't hardcode default category id 2013-10-01 15:50:47 +08:00
Eloy Lafuente (stronk7)
b1698e9ac5 Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle 2013-10-01 01:52:53 +02:00
Eloy Lafuente (stronk7)
833d1eb0e2 Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle 2013-09-30 16:01:38 +02:00
Dan Poltawski
75e19bf52b 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:21:03 +08:00
Frederic Massart
05549cc5d0 MDL-42004 enrol_cohort: Convert handlers to observers 2013-09-26 16:23:25 +08:00
Dan Poltawski
9977220ae8 MDL-32592 enrol_imsenterprise: fix error when category not defined
thanks to Henrik Thorn for the fix
2013-09-26 15:00:15 +08:00
Frederic Massart
5cec6c2670 MDL-41962 events: Bumping plugin versions to update handlers 2013-09-26 14:56:12 +08:00
Dan Poltawski
ba4612ebdc MDL-26408 enrol_imsenterprise: fix invalid component 2013-09-26 12:22:31 +08:00
Marina Glancy
88a4cb4734 Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle 2013-09-25 12:52:39 +10:00
Petr Škoda
d79d5ac276 MDL-31501 rework user session architecture
List of changes:
 * New OOP API using PHP namespace \core\session\.
 * All handlers now update the sessions table consistently.
 * Experimental DB session support in Oracle.
 * Full support for session file handler (filesystem locking required).
 * New option for alternative session directory.
 * Official memcached session handler support.
 * Workaround for memcached version with non-functional gc.
 * Improved security - forced session id regeneration.
 * Improved compatibility with recent PHP releases.
 * Fixed borked CSS during install in debug mode.
 * Switched to file based sessions in new installs.
 * DB session setting disappears if DB does not support sessions.
 * DB session setting disappears if session handler specified in config.php.
 * Fast purging of sessions used in request only.
 * No legacy distinction -  file, database and memcached support the same functionality.
 * Session handler name included in performance info.
 * Fixed user_loggedin and user_loggedout event triggering.
 * Other minor bugfixing and improvements.
 * Fixed database session segfault if MUC disposed before $DB.

Limitations:
 * Session access time is now updated right after session start.
 * Support for $CFG->sessionlockloggedinonly was removed.
 * First request does not update userid in sessions table.
 * The timeouts may break badly if server hosting forces PHP.ini session settings.
 * The session GC is a lot slower, we do not rely on external session timeouts.
 * There cannot be any hooks triggered at the session write time.
 * File and memcached handlers do not support session lock acquire timeouts.
 * Some low level PHP session functions can not be used directly in Moodle code.
2013-09-21 13:11:56 +02:00
Nitzan Bar
d8a55f59bd MDL-41778 enrol/ldap add settings to allow updating of course fields during sync 2013-09-20 17:30:52 +03:00
Rajesh Taneja
2b503e40f2 MDL-31560 Messages: Deprecated generate_email_supportuser
generate_email_supportuser was not creating user which can
be used by messaging system. core_user::get_support_user()
should be used to get support_user record.
2013-09-13 16:13:26 +08:00
Sam Hemelryk
6b909c759d Merge branch 'wip-mdl-41605' of git://github.com/rajeshtaneja/moodle 2013-09-11 10:50:08 +12:00
Sam Hemelryk
ba5d7f8b1c Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle 2013-09-11 09:26:44 +12:00
Sam Hemelryk
79257da228 Merge branch 'wip-mdl-41590' of git://github.com/rajeshtaneja/moodle 2013-09-11 08:45:22 +12:00
Sam Hemelryk
c02045ddc4 Merge branch 'wip-mdl-41589' of git://github.com/rajeshtaneja/moodle 2013-09-11 08:34:58 +12:00