mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 15:29:08 +01:00
Code Issues Projects Releases Wiki Activity
74,341 Commits 36 Branches 523 Tags
Commit Graph

1751 Commits

Author SHA1 Message Date
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
Marina Glancy
9e37d365d8 MDL-17929 enrol_meta: synchronise with groups 2015-04-22 14:36:34 +08:00
Marina Glancy
5894432c50 MDL-49953 enrol_cohort: correction to string 2015-04-22 13:40:03 +08:00
Marina Glancy
42c92eef33 MDL-49953 enrol_cohort: check courseid when looking for group 2015-04-22 13:39:02 +08:00
Daniel Neis Araujo
98177a4510 MDL-17929 enrol: Populate groups from Child Courses in META courses 
This is based on code from the enrol cohort plugin and
on work from Willy Lee available at https://github.com/willylee/moodle-local_metasync

AMOS BEGIN
  CPY [addgroup,enrol_cohort],[addgroup,enrol_meta]
AMOS END
 2015-04-22 12:06:29 +08:00
Andrew Nicols
e28767f414 Merge branch 'MDL-49753-master' of https://github.com/alexmitin/moodle 2015-04-22 11:00:21 +08:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com 
asd.com is a valid domain, we should use reserved domain names for testing
 2015-04-20 11:21:20 +08:00
Dan Poltawski
8da277ea96 Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle 2015-04-16 16:10:23 +01:00
Juan Leyva
6d28e2cfa6 MDL-49894 webservices: Add missing API changes in upgrade.txt 2015-04-16 15:19:42 +02:00
David Monllao
89a6290fb9 Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle 2015-04-16 17:04:34 +08:00
Juan Leyva
b4896308dc MDL-45131 enrol: Add validation for returned parameters in WS tests 2015-04-16 10:25:25 +02:00
Dan Poltawski
75e20c1845 Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle 2015-04-15 09:54:36 +01:00
Dan Poltawski
0627d5802c Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle 2015-04-14 15:32:13 +08:00
Ankit Agarwal
5c94d1ee39 MDL-49412 enrol: Fix behat failures 2015-04-10 17:18:22 +08:00
Gregory Zbitnev
6601690202 MDL-18309 Course: enrol/index.php returnurl improvement 
This patch improves usability of enrolment page in case of course is not
enrollable. 'Continue' button now returns student to referring page instead of
main moodle page (as it used to be). To make this improvement, passing correct
returnurl parameter to enrol/index.php page was implemented for links that may
be accessible for not-enrolled students.
 2015-04-10 09:32:31 +08:00
Barry Oosthuizen
2568347e28 MDL-33328 enrol_manual: use correct parameter in search function 
Searching for user from "Enrol users" panel causes blocks to dock in IE
 2015-04-09 18:52:14 +01:00
Andrew Nicols
647681d4e9 Merge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle 2015-04-08 09:34:37 +08:00
Andrew Nicols
31635bfb63 MDL-49687 enrol: Add behat tests for adding multiple groups 2015-04-08 09:34:16 +08:00
Dan Poltawski
cdc0f4de3f Merge branch 'MDL-49677' of https://github.com/sleperf/moodle 2015-04-07 11:28:35 +01:00
Alex Mitin
af4e80ae69 MDL-49753 enrolments: preselct status filter if needed 2015-04-07 16:19:01 +08:00
Dan Poltawski
c17dc4347e Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle 2015-04-06 13:59:30 +01:00
David Monllao
32b97a03f3 MDL-49380 enrol_cohort: Fixing matches 
Tiny fix as the group name was not properly
generated when incrementing the captured
generated number. Also adding unit test for
this case.
 2015-04-06 10:47:54 +08:00