mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
81,922 Commits 36 Branches 519 Tags
Commit Graph

1949 Commits

Author SHA1 Message Date
Dan Poltawski
d60ae73236 MDL-38020 behat: for enrollment management from participants page 2015-12-30 15:25:31 +00:00
Mark Nelson
be6fb6b1a6 MDL-51889 enrol_guest: always check password before re-enabling 2015-12-29 13:42:39 +08:00
Dan Poltawski
b687494f95 MDL-52017 enrol_self: fix incorrect empty statement 
Ironically this was detected by causing a syntax error on php54
 2015-12-22 09:48:56 +00:00
David Monllao
ab429bfa09 Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle 2015-12-22 16:36:29 +08:00
David Monllao
a96bf448b8 Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-12-22 16:23:33 +08:00
Juan Leyva
1e5241a12b MDL-52073 enrol_guest: New Web Service enrol_guest_get_instance_info 2015-12-10 12:32:30 +01:00
Adam Olley
6c9b6685de MDL-52334 enrol_database: Add missing filter to user_enrolment lookup 
Without the user filter, the left join to the user enrolment table
results in a much larger set of data being returned than before
MDL-28420. Which makes login time for users in many busy courses much
worse than before (3x worse on average, observed upto 40x).
 2015-12-09 09:25:09 +10:30
Mark Nelson
d950ba1b3c MDL-52017 enrol_self: always check password before re-enabling 2015-12-03 19:26:22 +08:00
Dan Poltawski
c20577b9f2 Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle 2015-12-03 11:11:03 +01:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Juan Leyva
4bc38ba96a MDL-51925 enrol: Support ordering in get_enrolled_users WS 2015-11-17 09:49:03 +01:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release 
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
 2015-11-10 12:33:52 +01:00
Eloy Lafuente (stronk7)
ed4e707577 MDL-51861 enrol: added missing external cleanup for formal compliance 2015-11-06 10:58:28 +01:00
Dani Palou
b036215acc MDL-51861 enrol: Don't get all parts in get_enrolled_users with groups 2015-11-06 15:07:24 +08:00
Andrew Nicols
af8472a91f Merge branch 'MDL-51861' of git://github.com/stronk7/moodle 2015-11-06 15:01:20 +08:00
Andrew Nicols
1d1f08a045 MDL-51685-master Fix unit tests following change 
These unit tests were modifying the PAGE and other globals in the middle of
tests and were failing as a result.

Broke the tests up into separate tests where the functionality is now
tested individually.
 2015-11-06 10:36:06 +08:00
Eloy Lafuente (stronk7)
f076ce2834 MDL-51861 enrol: new unit test to verify all conditions and filters 
This unit test does not verify contents, details, but only
that the returned users for every group mode, for every
filtering (active, groupid and withcapability) together
with permissions are correct.
 2015-11-06 02:26:02 +01:00
David Mudrák
e8b75e6292 MDL-52018 lang: Fix behat tests to use the new strings 2015-11-02 22:30:46 +01:00
Helen Foster
da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Rajneel Totaram
494fec0071 MDL-51923 enrol: Enrolment list filter 'No Group' shows incorrect count 
With contributions from John Okely
 2015-10-28 17:34:16 +08:00
Eloy Lafuente (stronk7)
e326fbeea2 MDL-30674 enrol_guest: version bump in case it's needed for something 2015-10-23 13:31:59 +02:00
Eloy Lafuente (stronk7)
2ee8636553 Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle 2015-10-23 12:46:53 +02:00
Andrew Nicols
5164b76e75 MDL-30674 enrol_guest: Respect 2015-10-23 10:40:42 +08:00
Andrew Hancox
0c93dda8af MDL-30674 enrol_guest: Moved settings from course to enrol form 
Added proper enrol settings form with status (enabled or disabled)
and password option in line with other core enrol plugins.
Removed enrol_guest settings from course settings page.
When adding a guest enrol plugin you now get presented with the
edit form as with other core enrol plugins.
 2015-10-22 11:52:18 +01:00
David Monllao
09d62af419 Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle 2015-10-13 10:11:55 +08:00
Juan Leyva
e8ad99ab91 MDL-51568 self_enrol: New Web Service enrol_self_enrol_user 2015-10-12 09:13:51 +02:00
John Okely
d5994d38c9 MDL-51586 enrol: Enrolment table displays fullname properly. 
When the alternatefullnamedisplay was set to something that
didn't contain 'firstname' then nothing would be displayed
for the user's name.
 2015-10-09 15:34:39 +08:00
Andrew Nicols
cfd3b94544 Merge branch 'MDL-51341_enrolled_users_filter' of git://github.com/davosmith/moodle 2015-10-08 09:17:29 +08:00
Davo Smith
bf8f915abc MDL-51341 enrolment: fix 'No group' enrolled user filter 2015-10-07 17:09:15 +01:00
Andrew Nicols
bbad52793b Merge branch 'wip-MDL-41042-master' of git://github.com/marinaglancy/moodle 2015-10-07 10:25:56 +08:00
Marina Glancy
5667e60249 MDL-41042 coursecat: reset course contacts cache more often 2015-10-07 10:23:03 +08:00
Bence Laky
933f0d966e MDL-51578 enrol_self: Improved error message on late/early enrolments 2015-10-06 09:16:18 +01:00
Marina Glancy
7fdc469048 MDL-44640 enrol_meta: sync when enrol method is updated 2015-09-27 17:52:20 +08:00
Marina Glancy
080c7d471d MDL-44640 enrol: trigger events on instances actions 2015-09-27 17:52:20 +08:00
David Monllao
012d14e892 MDL-50332 enrol_self: Setting form url for guests 
Credit to Andrew Nicols.
 2015-09-23 09:52:04 +08:00
Andrew Nicols
7e59e5d2d1 Merge branch 'MDL-50332_master' of git://github.com/dmonllao/moodle 2015-09-21 15:43:02 +08:00
David Monllao
8f338081cc MDL-50332 enrol_self: Formatting unavailable instances error messages 
Many thanks to Andrew Nicols as this patch is based on his
proposal. Thanks Andrew.
 2015-09-21 15:39:42 +08:00
Andrew Nicols
4b65342dba Merge branch 'MDL-51431' of https://github.com/andrewhancox/moodle 2015-09-21 08:09:38 +08:00
David Monllao
ba523bf5c3 MDL-30157 enrol_manual: timestart a few seconds before 
We want to prevent conflicts with get_enrolled_sql trick for db caching
plus users should be able to access the course once enrolled.
 2015-09-17 17:09:36 +08:00
Andrew Hancox
7fca67ee29 MDL-51431 enrol_flatfile: Fix for startdate when updating users 2015-09-16 11:00:41 +01:00
David Monllao
04fadbeda4 Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle 2015-09-16 09:10:28 +08:00
David Monllao
6bc490e270 MDL-50890 enrol_flatfile: Correcting typo and return 
Would be safer to return nothing, execute methods don't have
a return. I understand this return 2 was inherited from the
previous cron function.
 2015-09-16 09:08:34 +08:00
Jun Pataleta
fd1b399527 MDL-50890 enrol_flatfile: Modifications for compliance with standards 
Also changed the scheduled task to run every hour.
 2015-09-16 09:08:34 +08:00
Troy Williams
a771854c46 MDL-50890 enrol_flatfile: Replace cron processing with scheduled task 
Replace enrolment plugin flatfile cron processing with scheduled task
 2015-09-16 09:08:34 +08:00
David Monllao
d005d71881 MDL-30157 enrol_manual: New option to enrol from now 
We set the new now option as the default one, as other enrol
plugins use it as the default enrolment start date. We are keeping
the default to today on upgrades.
 2015-09-15 16:25:25 +08:00
David Monllao
32f1e17a01 MDL-30157 enrol_manual: Setting proper default 
The wrong default value was working because of count starting from 1.
 2015-09-15 16:25:25 +08:00
Marina Glancy
5723dcdd85 MDL-34938 enrol_meta: sync enrolment start/end dates 2015-09-08 10:28:54 +08:00
Marina Glancy
f06d8d94a1 MDL-50744 enrol_meta: fix incorrect role assign 2015-09-07 10:29:02 +01:00
David Monllao
11e1e7cf39 Merge branch 'MDL-50920' of git://github.com/sk-unikent/moodle 2015-09-02 08:44:36 +08:00
Dan Poltawski
d34af71782 Merge branch 'wip-MDL-49746-master' of git://github.com/marinaglancy/moodle 2015-08-19 18:30:34 +02:00