mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
82,927 Commits 36 Branches 527 Tags
Commit Graph

1972 Commits

Author SHA1 Message Date
Rajesh Taneja
9bb156ee75
MDL-57853 phpunit: Remove use of setExpectedException 2017-02-06 11:44:42 +08:00
Ankit Agarwal
2118859218 MDL-57300 lti: Make tool provider page more readable 2017-02-01 11:40:47 +05:30
Dan Poltawski
ac08d4556a Merge branch 'MDL-57300-master' of git://github.com/ankitagarwal/moodle 2017-02-01 13:01:26 +08:00
Marina Glancy
bbf401bec6 MDL-57782 enrol_self: fix check when email needs to be sent 
Thanks to Leandro for providing a fix
 2017-01-27 14:24:10 +08:00
Eloy Lafuente (stronk7)
ae8e8e6aa1 Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle 2017-01-24 22:03:48 +01:00
Ankit Agarwal
7f38d8f3ee MDL-57300 lti: Rename lti2 as registration url 
AMOS BEGIN
CPY [registrationurl,mod_lti],[registrationurl,enrol_lti]
AMOS END
 2017-01-24 16:40:49 +05:30
Ankit Agarwal
c8b5c793a1 MDL-57300 lti: Fix incorrect variable types in docs 2017-01-24 12:18:21 +05:30
Shamim Rezaie
d636015c8a MDL-55915 enrol_manual: let fullname()know if user has viewfullnames cap 
fullname() relies on its second parameter to determine wheter it should use fullnamedisplay or alternativefullnameformat.
We need to check for moodle/site:viewfullnames capability and pass true as the second parameter to fullname() whereever
the user has this capability.
 2017-01-20 20:30:38 +11:00
Andrew Nicols
59925af580 MDL-57613 enrol_lti: Correct location of upgrade step 2017-01-19 07:56:27 +08:00
John Okely
ab887f8de9 MDL-57613 enrol_lti: Allow longer nonces 2017-01-13 10:52:24 +08:00
Mathew May
a446095f17 MDL-52098 enrol: cohort now looks at instance status 2016-12-16 11:18:52 +13:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Andrew Nicols
3e9f3e30b2 Merge branch 'MDL-56240' of git://github.com/stronk7/moodle 2016-12-07 09:50:16 +08:00
Dan Poltawski
8a08d016ff MDL-56778 enrol: add note about legacy css 2016-12-06 12:31:57 +00:00
Dan Poltawski
94d950601c Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle 2016-12-06 12:30:28 +00:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Eloy Lafuente (stronk7)
e7a1eed154 MDL-56240 upgrade: delete incorrect lines, manually added 
Note that, with MDL-57266, we are changine the comment to be:

// Automatically generated Moodle v3.2.0 release upgrade line

in order to make to make to make it clearer that it's an
automatic (part of the release process) comment and should not
be added manually ever.
 2016-12-05 16:47:33 +01:00
David Monllao
bb8b3ba6f8 Merge branch 'wip-mdl-57229' of https://github.com/rajeshtaneja/moodle 2016-12-01 11:38:59 +08:00
Rajesh Taneja
04bfccdce6
MDL-57229 enrol: Enrol dialog should have relative position 
On clean theme it is absolute position and on small
screen user can't scroll to enrol user
 2016-12-01 11:13:46 +08:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
Rajesh Taneja
d2a44a71ac
MDL-56898 behat: Focus only works with JS 2016-11-25 09:20:52 +08:00
Rajesh Taneja
b3502be320
MDL-56898 behat: Ensure we have button in viewport and page is stable 2016-11-24 07:27:19 +08:00
Nadav Kavalerchik
85dd7c6f7a MDL-56778 Enrollment: Fix enroll users dialog in RTL mode (theme:Boost) 2016-11-21 18:33:52 +02:00
David Monllao
0915860e51 Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle 2016-11-17 10:42:08 +08:00
Jun Pataleta
b62bebbf1c MDL-52186 enrol_meta: Sync only active enrol_meta instances 
Thanks to Peter Klinka for the solution!
 2016-11-17 10:40:54 +08:00
Andrew Nicols
4642a8c593 Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle 2016-11-16 09:52:55 +08:00
Helen Foster
7f6accd448 MDL-56903 lang: Merge English strings from the en_fix language pack 2016-11-15 11:19:48 +01:00
Damyon Wiese
ae9bbd9847 MDL-56193 enrol_manual: Bootstrap styles for assign roles 
Use a bootstrap popover for the assign roles form.
 2016-11-15 11:29:49 +08:00
Damyon Wiese
f10ae4676d MDL-56193 enrol: Modernise the enrol users popup 
This just injects bootstrap classes into the old yui2 thing. It needs
rewriting.
 2016-11-15 11:29:18 +08:00
Jun Pataleta
ac67c97ccb MDL-55825 enrol_lti: Fix display of unenrol count on sync 2016-11-04 09:21:02 +00:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
Dan Poltawski
56f763b1f9 Merge branch 'MDL-55841-master' of https://github.com/xow/moodle 2016-11-02 15:24:33 +00:00
Dan Poltawski
cb2b9a905c Merge branch 'MDL-55825-master' of git://github.com/junpataleta/moodle 2016-11-02 14:41:10 +00:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Andrew Nicols
4e5d96ee3a Merge branch 'MDL-56282-master' of git://github.com/damyon/moodle 2016-10-31 12:18:22 +08:00
Frédéric Massart
77bec234e0 MDL-56282 enrol_meta: Fix error when editing existing instances 
We had a few problems here.

1/ The auto complete element was displaying the picker though the
   field was frozen.
2/ Checking for existing enrolment including the courses chosen was
   not checking if the courses found were in the instance we edit.
3/ Upon creation we support multiple courses but when editing we
   should not expect more than the course in the instance being edited.
 2016-10-31 12:15:02 +08:00
Andrew Nicols
c86fb21789 Merge branch 'MDL-56573-master' of git://github.com/junpataleta/moodle 2016-10-31 12:03:00 +08:00
Jun Pataleta
5a3f6ceb57 MDL-55825 enrol_lti: Unit tests for upgraded memberships sync 
* sync_members tests
* data_connector tests for new methods
 2016-10-31 09:09:43 +08:00
Jun Pataleta
08237c3aa8 MDL-55825 enrol_lti: Upgrade member sync to use the new LTI library 2016-10-31 09:09:06 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Jun Pataleta
826ee7370e MDL-55825 enrol_lti: Added context type column to enrol_lti_lti2_context 2016-10-28 10:10:43 +08:00
Jun Pataleta
f30f627501 MDL-56339 enrol_lti: Force page layout to embedded from custom setting 2016-10-28 10:05:02 +08:00
Jun Pataleta
59eb63612b MDL-56573 enrol_lti: Non-null default for tool_consumer_instance_name 2016-10-28 10:03:19 +08:00
Eric Merrill
0e8b51607b MDL-47162 core_message: Cleanup of messaging course ids code 2016-10-27 18:12:42 +02:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
John Okely
3a5e14a5d0 MDL-55841 mod_lti: Improve interface usability & consistency 
* Always say "Tool URL"
* Add help strings to cartridge interface
 2016-10-27 17:13:22 +08:00
Simey Lameze
0ab8b33754 MDL-29110 enrol_self: improve send course welcome message setting 
This commit change send course welcome message to a drop-down that now supports sending emails from:
- Course contact
- Enrolment key holder
- No reply address
Also moves part of the logic of handling send welcome email from to a new method get_welcome_email_contact() and unit test for this new method.
 2016-10-26 09:38:09 +08:00