mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
75,538 Commits 36 Branches 527 Tags
Commit Graph

1772 Commits

Author SHA1 Message Date
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
Marina Glancy
1165cab2b3 MDL-51095 enrol_meta: add missing include 
Thanks to Shaun Meyer for providing a patch
 2015-08-13 12:29:24 +08:00
Skylar Kelty
e074ef4c52 MDL-50920 enrol: Remove pointless DB update in enrol_meta 2015-08-12 11:52:24 +01:00
Marina Glancy
afc6a26938 MDL-49746 course: sorting users by last access 2015-08-11 16:15:58 +08:00
Simey Lameze
dcee0b9447 MDL-49360 core_lib: add new method get_local_referer() 
This commit also replace all usages of $_SERVER['HTTP_REFERER'] and get_referer().
 2015-07-27 11:11:24 +08:00
Davo Smith
0c9d8172b5 MDL-48074 enrol: option to filter by users 'not in any group' 2015-07-03 09:35:57 +01:00
Dan Poltawski
4bd7eb6117 Merge branch 'MDL-50092_master' of git://github.com/dmonllao/moodle 2015-05-18 13:58:14 +01:00
Adrian Greeve
1fc2bb35e6 MDL-49742 lib: Removed additional names on tables for sorting. 
When additional names are disabled, they are no longer shown as
sortable headings in the enrolment and admin user tables.
 2015-05-15 15:29:52 +08:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
David Monllao
709314447b MDL-50092 enrol_imsenterprise: Fixing wrong field name 
Thanks to JD for the fix.
 2015-05-11 14:55:02 +08:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Andrew Nicols
43ef409276 Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle 
Conflicts:
	mod/forum/post.php
 2015-05-06 11:11:21 +08:00
Eloy Lafuente (stronk7)
15005d91f0 MDL-50102 versions: coding style cleanup. 2015-05-05 18:23:21 +02:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
Mark Nelson
9542b15671 MDL-49985 core_enrol: direct user to appropriate URL 2015-05-05 01:17:23 -07:00
Mark Nelson
b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309 
This reverts commit 6601690202764d786a5ee4b7bbd9afb5b91dd0ec.

This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
 2015-05-05 01:09:20 -07:00
Andrew Nicols
e8cf6330c2 MDL-50055 enrol: Stop requiring javascript for behat tests 2015-05-05 10:23:18 +08:00
David Monllao
dc9b229d7a MDL-49232 enrol_self: Adapting unit test to new can_self_enrol() output 2015-05-01 15:43:09 +08:00
Andrew Nicols
04cb1103a6 Merge branch 'MDL-49232_master' of git://github.com/markn86/moodle 2015-05-01 09:27:11 +08:00
Andrew Nicols
e89c5c203c MDL-49232 enrol_self: Add behat test for non-guest self-enrolment 2015-04-29 18:04:29 -07:00
Mark Nelson
9c54a0abad MDL-49232 enrol_self: display continue button 2015-04-29 18:04:28 -07:00
Neill Magill
ccd3dd5bc9 MDL-49583 enrol: enrol/index.php page doesn't handle direct access well 
Before this patch if a user who is not logged in to Moodle accesses the
enrol/index.php page directly they were redirected to the Moodle front
page after login, rather than back to a page that would allow them to
self enrol, if it is enabled on the course.

This change will cause a user who directly accesses the page to be
redirected back to it after they have logged in, unless the course has guest
access enabled.

Thanks to Marina Glancy for suggesting the use of get_referer()
 2015-04-29 09:22:14 +01:00
David Monllao
1d47b81928 Merge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle 2015-04-28 10:11:18 +01:00
Marina Glancy
f99fe11045 MDL-17929 enrol_meta: unittest for unenrolment from group 2015-04-23 15:08:07 +08:00
Dan Poltawski
296a428776 Merge branch 'wip-MDL-49953-master' of git://github.com/marinaglancy/moodle 2015-04-22 12:06:46 +01:00
Marina Glancy
9c1561ef83 MDL-17929 groups: function to sync groups with enrolments 2015-04-22 14:36:38 +08:00
Marina Glancy
bacb7b1f6e MDL-17929 enrol_meta: allow to edit instance 2015-04-22 14:36:38 +08:00
Marina Glancy
e284e1792c MDL-17929 enrol_meta: create new group if selected 
AMOS BEGIN
  CPY [creategroup,enrol_cohort],[creategroup,enrol_meta]
AMOS END
 2015-04-22 14:36:38 +08:00