Commit graph

1165 commits

Author SHA1 Message Date
Dan Poltawski
73a418e3c2 Merge branch 'w30_MDL-34129_m23_enrolinfo' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-24 13:41:45 +08:00
Sam Hemelryk
6fcebf2424 Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-23 12:25:20 +12:00
Petr Škoda
7c87df674e MDL-34129 show course info on enrolment page 2012-07-21 21:34:07 +02:00
Frederic Massart
23371805ea MDL-33560 Enrol: Enrol password can be unmasked 2012-07-17 16:49:31 +08:00
Sam Hemelryk
5320640ccd Merge branch 'MDL-33624-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE 2012-07-16 13:50:56 +12:00
Dan Poltawski
28fc596d03 MDL-33624 lang - remove incosistent use of placeholder 2012-07-16 09:45:11 +08:00
Ashley Holman
bf79f77357 MDL-34309: Fix broken postgres unix sockets in core_adodb_testcase::test_read_table 2012-07-16 09:33:01 +12:00
Michael Aherne
c82d7fc832 MDL-34156 Remove subselect from slow query 2012-07-10 10:53:40 +08:00
Dan Poltawski
d6cf442059 Merge branch 'MDL-32057_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE 2012-07-09 14:14:13 +08:00
Eloy Lafuente (stronk7)
bbe378a63e Merge branch 'w27_MDL-33876_m23_delenrol' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-07-04 04:16:05 +02:00
Adam Olley
b653107b96 MDL-32057: Fix cohort enrolment css for ie7 2012-07-03 09:23:33 +09:30
Andrew Davis
6737eda426 MDL-25476 messages: switched some notification emails to come from the support contact instead of admin 2012-07-02 15:41:29 +08:00
Petr Škoda
4aabce216c MDL-33876 skip deleted users in enrol_database sync 2012-06-30 08:44:55 +02:00
Aparup Banerjee
b574c078a6 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:37:01 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Andrew Robert Nicols
346099f08b MDL-33731 Add exception for closebutton when drag/dropping activity chooser 2012-06-14 11:30:29 +01:00
Dan Poltawski
4413b48000 Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle 2012-06-13 17:45:27 +08:00
Dan Poltawski
93de786561 Merge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle 2012-06-12 17:18:18 +08:00
Petr Skoda
2e297453b8 MDL-33182 fix mnet enrol E_STRICT issue 2012-06-12 11:08:33 +02:00
Jerome Mouneyrac
3297d57528 MDL-33581 missing parameter defaults for some external functions 2012-06-08 11:54:59 +08:00
Andrew Robert Nicols
984ec46e03 MDL-33292 Consume the new ability to move dialogues in chooser dialogues 2012-06-07 14:58:54 +01:00
Andrew Robert Nicols
06a78ea6a4 MDL-33292 Add ability to move (drag) M.core.dialogue 2012-06-07 14:47:33 +01:00
Sam Hemelryk
447ebaa90e Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle 2012-06-06 10:14:00 +12:00
David Monllaó
d7eb773047 MDL-31823 - Remote hosts users created via mnet enrolments marked as confirmed 2012-06-04 10:39:41 +02:00
Jerome Mouneyrac
93ce0e8296 MDL-32581 support additional format field with all text field in extrnal lib function + new possible ws params to decide how format is returned (which are stored in a singleton) 2012-05-31 12:31:27 +08:00
Dan Poltawski
2ffd7f1824 Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle 2012-05-25 10:16:12 +08:00
Jerome Mouneyrac
96d3b93ba3 MDL-33060 remove some get_string from exceptions 2012-05-18 14:45:15 +08:00
Wiktor Wandachowicz
5bd2824a79 MDL-32204 MNet: set auth method to mnet for users enrolled remotely 2012-05-15 15:33:53 +02:00
Dan Poltawski
096c68b585 Merge branch 'w19_MDL-32733_m23_authorizemessage' of git://github.com/skodak/moodle 2012-05-09 10:28:48 +08:00
Sam Hemelryk
70ebfcee6f Merge branch 'w19_MDL-32178_m23_dbenrolignore' of git://github.com/skodak/moodle 2012-05-09 11:17:39 +12:00
Dan Poltawski
007fe3f775 Merge branch 'w19_MDL-32719_m23_enrolstrict' of git://github.com/skodak/moodle 2012-05-07 12:58:40 +08:00
Petr Skoda
bc8926e34b MDL-32178 ignore duplicates in enroL_database external course table 2012-05-06 15:51:25 +02:00
Petr Skoda
cc8cc1df80 MDL-32645 fix enrol_database tests 2012-05-06 14:46:14 +02:00
Petr Skoda
c859433c3d MDL-32735 add missing message provider info for unmaintained enrol_authorize 2012-05-06 12:10:47 +02:00
Petr Skoda
47bd498f6a MDL-32719 fix old enrol UI E_STRICT issue 2012-05-05 10:45:39 +02:00
Dan Poltawski
3869858d3e Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle 2012-05-01 10:59:06 +08:00
Jerome Mouneyrac
4615817d1c MDL-30986 external API, check and update DocBlock
Conflicts:

	group/externallib.php
2012-04-30 15:11:56 +08:00
Sam Hemelryk
3d173c1d38 Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle 2012-04-30 12:33:05 +12:00
Eloy Lafuente (stronk7)
14ffb91959 Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle 2012-04-24 10:37:13 +02:00
Petr Skoda
3932d474e3 MDL-32574 fi sqlsrv adodb test 2012-04-24 09:22:26 +02:00
Dan Poltawski
42b206e47a Merge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle 2012-04-23 10:42:42 +08:00
Petr Skoda
bcecc9ba68 MDL-32574 basic addodb connection tests + improved connection handling in enrol_database
This should allow us to allow connection via dsn which will allow a lot more options in the future.
2012-04-22 11:03:32 +02:00
Andrew Davis
1218879656 MDL-31429 enrol: added db/messages.php for enrolment plugins and added some smarts to messaging so it won't display message settings for disabled enrolment plugins 2012-04-20 11:48:46 +07:00
Chris Follin
b804a56d2c MDL-31429 enrol: Add missing string for PayPal enrolment messages.
Signed-off-by: Andrew Davis <andrew@moodle.com>
2012-04-20 10:47:00 +07:00
Andrew Robert Nicols
b1d45bbbac MDL-32459 Adjust order of remote enrolment help text to suit form order 2012-04-16 11:50:16 +01:00
Sam Hemelryk
3211569a6a Revert "MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag"
This reverts commit f9f281b8fe.
2012-04-11 17:18:58 +12:00
Sam Hemelryk
5bfeb5ffd3 Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle 2012-04-10 12:34:37 +12:00
Rossiani Wijaya
f9f281b8fe MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag 2012-03-30 16:26:58 +08:00
Petr Skoda
e807c0be4f MDL-32095 fix event handler classes to be E_STRICT compatible 2012-03-26 16:04:47 +02:00
Petr Skoda
a12f9825dd MDL-32046 show warning that unenrolment of all users is not allowed in non-verbose mode 2012-03-16 11:03:31 +01:00