mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
60,683 Commits 36 Branches 523 Tags
Commit Graph

1452 Commits

Author SHA1 Message Date
Dan Poltawski
fbd90ba191 Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle 2013-04-10 10:37:29 +08:00
Eloy Lafuente (stronk7)
a2027b873b Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle 2013-04-09 20:00:34 +02:00
Eloy Lafuente (stronk7)
c1fc4ba397 Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle 2013-04-09 19:59:45 +02:00
Dan Poltawski
ad84f8f9ac Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle 2013-04-09 14:58:47 +08:00
Petr Škoda
6f55ce1893 MDL-38927 use role->localname to get real role name 2013-04-09 08:31:25 +02:00
Petr Škoda
03216719c3 MDL-38753 tweak count SQL to make stupid Oracle happy 2013-04-08 12:33:49 +02:00
David Monllao
594b5a7f5f MDL-38820 behat: New test 
According to MDLQA-140, a teacher can enable
guest access to a course.
 2013-04-08 09:05:59 +08:00
David Monllao
f61abd1f68 MDL-38822 behat: New test 
According to MDLQA-139, a teacher can
enable self-enrolment in a course.
 2013-04-08 09:04:08 +08:00
Eloy Lafuente (stronk7)
57902e2738 Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle 2013-04-03 13:33:16 +02:00
Damyon Wiese
7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
 2013-04-03 14:32:11 +08:00
Dan Poltawski
881afa48bf MDL-38821 enrol_paypal: fix cost param type 2013-04-02 20:05:39 +08:00
Dan Poltawski
6842ab4455 Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle 2013-04-02 19:54:46 +08:00
Tim Hunt
0e0a980631 MDL-26956 enrol form: add missing setType calls. 2013-04-02 11:57:12 +01:00
David Monllao
1ad8902820 MDL-38821 enrol_self: Fixing setType missing calls 2013-04-02 15:39:44 +08:00
David Monllao
eeb6c4ace8 MDL-38821 enrol_paypal: Fixing setType missing calls 2013-04-02 15:37:21 +08:00
David Monllao
361c4da2fb MDL-38821 enrol_manual: Fixing setType missing calls 2013-04-02 15:37:11 +08:00
David Monllao
3de603a175 MDL-38821 enrol_cohort: Fixing setType missing calls 2013-04-02 15:37:00 +08:00
sam marshall
71638033eb MDL-26956 (3) Enrol: Add filter options to enrolments screen 2013-03-28 10:46:36 +00:00
David Monllao
f0e4cf5e31 MDL-38619 behat: Step definition to add enrolment methods to courses 2013-03-28 11:17:14 +08:00
Eloy Lafuente (stronk7)
4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-26 23:04:48 +01:00
Marina Glancy
4e0b6025ad MDL-38147 deprecated make_categories_list(), change usage to coursecat 2013-03-25 13:20:46 +11:00
Frederic Massart
8819a83601 MDL-26644 course: Remove useless setting completionstartonenrol 
This commit removes any trace of the setting 'Completion tracking
begins on enrolment' as it does not appear to do anything.
 2013-03-25 08:28:01 +08:00
Petr Škoda
77a5c09354 MDL-37742 simplify dirty one-space oracle hack 2013-03-24 13:43:18 +01:00
Eloy Lafuente (stronk7)
66f1870701 Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle 2013-03-19 17:58:55 +01:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	version.php
 2013-03-19 15:18:13 +08:00
Petr Škoda
d2f3c5c58d MDL-38180 do not add links for enrol and other users candidates 2013-03-17 22:21:27 +01:00
Frederic Massart
807cf3d0ae MDL-38005 form: Headers have a proper name 2013-03-15 11:06:25 +08:00
Rajesh Taneja
9a51c3d95c MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting 
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
 2013-03-12 17:14:53 +08:00
Petr Škoda
0f39498480 MDL-38096 fix availability of bulk enrol actions 2013-02-27 16:12:07 +08:00
Petr Škoda
506338d5de MDL-38096 fix availability of enrol button 2013-02-27 16:12:07 +08:00
Damyon Wiese
dbfe8e26ee Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle 2013-02-25 10:50:38 +08:00
Petr Škoda
ce9d54b9f3 MDL-38096 use separate manual enrol and unenrol capabilities in UI 2013-02-24 13:28:48 +01:00
Petr Škoda
f10edc9792 MDL-37963 do request flatfile role mapping when adding new roles 2013-02-24 12:17:16 +01:00
Eloy Lafuente (stronk7)
80ba3a4390 Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle 2013-02-20 00:01:47 +01:00
Eloy Lafuente (stronk7)
a5b1f1e2f2 Merge branch 'MDL-38031-master' of git://github.com/FMCorz/moodle 2013-02-19 12:46:36 +01:00
Dan Poltawski
69898d6b9a Merge branch 'MDL-37396' of git://github.com/rwijaya/moodle 2013-02-18 14:22:02 +08:00
Rossiani Wijaya
62a973cef0 MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js 2013-02-18 13:22:07 +08:00
Rossiani Wijaya
4be3ed4b3d MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu 2013-02-18 10:28:23 +08:00
Frederic Massart
982f4bc40e MDL-38301 usability: Fixed wrong icon size 2013-02-15 10:04:57 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e MDL-38040 Clean core from CRLFs 2013-02-15 02:13:32 +01:00
David Monllao
1f037b3776 MDL-37982 enrol_ims: No filters applied when inserting into DB 2013-02-14 16:27:22 +08:00
Jerome Mouneyrac
909f27acf4 MDL-37410 External PHPunit test: used ->getDataGenerator()->enrol_user instead to manually enrol the user. + improve the unassignUserCapability to remove a capability assigned by getDataGenerator->enrol_users 2013-02-12 11:15:15 +08:00
Andrew Davis
c90e6b4644 MDL-36091 added debugging() calls in blocks of code marked as "should never happen" 2013-02-11 13:24:52 +08:00
Dan Poltawski
7543705d9b Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle 2013-01-30 09:18:57 +08:00
Petr Škoda
47bf916773 MDL-37767 allow empty host in enrol_database which is required for default pg socket 2013-01-30 00:40:03 +01:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files 
YAY!
 2013-01-29 22:34:46 +01:00
Aparup Banerjee
37c68301f9 Merge branch 'w04_MDL-37499_m25_authldaptest' of git://github.com/skodak/moodle 2013-01-29 16:33:37 +08:00
Sam Hemelryk
ab58c6b724 Merge branch 'w04_MDL-37716_m25_enrolexpiry' of git://github.com/skodak/moodle 2013-01-29 14:56:57 +13:00
Andrew Robert Nicols
344936ae48 MDL-37350 Detach listeners when hiding the 'Add roles' popup 
If the submit event listener is not correctly closed, then the submit event
calls the relevant callback multiple times incorrectly.

When hiding the Add role dialogue, we need to detach any event listeners
which are applied to it.
 2013-01-28 09:57:08 +00:00
Petr Škoda
d8f22c49b1 MDL-37716 standardise enrolment expiration code 2013-01-26 14:55:11 +01:00