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

1949 Commits

Author SHA1 Message Date
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
Helen Foster
c9636ddd51 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:12:52 +02:00
John Okely
51478048cd MDL-55841 enrol_lti: Make published tool list more user friendly 2016-10-25 16:13:01 +08:00
David Monllao
1d58c301c7 Merge branch 'MDL-56156-master' of git://github.com/damyon/moodle 2016-10-25 15:05:17 +08:00
Damyon Wiese
e56b58e3c9 MDL-56006 theme: Set Boost as the default theme 
Units tests have been adjusted e.g. 'boost' instead of 'clean' in pix urls.

Some places I didn't update the test to reflect the boost markup and reset
the theme to clean. This is because the test was not testing the markup - but the
functionality (e.g. looking for specific structures to indicate an error in a form element).
 2016-10-25 10:15:20 +08:00
David Monllao
48f43096e0 Merge branch 'MDL-55074-master' of git://github.com/damyon/moodle 2016-10-24 12:33:51 +08:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes 
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
 2016-10-21 16:06:54 +08:00
Jun Pataleta
0766dd669b MDL-56529 enrol_lti: Fix for tool_provider_test 
* Use -1 for simulating a non-existent tool for
  tool_provider_testcase::test_constructor_with_non_existent_tool()
 2016-10-21 12:34:00 +08:00
Damyon Wiese
058f2fb68e MDL-56156 theme_boost: enrol_users filter form styles 
Allow wrapping any mform in a "form-inline" div to make it a responsive inline form.
Use this for the enrol users filter for and get rid of a good chunk of custom styles.
 2016-10-19 17:10:22 +08:00
Jun Pataleta
b75d0f0de2 MDL-53832 enrol_lti: Update codes to use the new DB field names 2016-10-19 17:01:34 +08:00
Jun Pataleta
fa015abf7b MDL-53832 enrol_lti: Update data_connector to use the new DB field names 2016-10-19 17:01:30 +08:00
Jun Pataleta
d1e85a0045 MDL-53832 enrol_lti: Make DB column names more moodle-ish 2016-10-19 17:01:22 +08:00
Jun Pataleta
6092bbc07a MDL-53832 enrol_lti: Map consumer to tool and handle instance deletion 2016-10-19 11:14:28 +08:00
Jun Pataleta
c314d6ed8e MDL-53832 enrol_lti: Unit tests for tool_provider 
Original subtask: MDL-55647.
 2016-10-19 11:14:27 +08:00
Jun Pataleta
daebcd2801 MDL-53832 enrol_lti: Improve provider logic 
* onRegister
  - Validate returnUrl and consumer object.
  - Use moodle_url for the returnURL.
  - Set success message on successful registration.
  - Reorganise code.
* Constructor
  - Remove required params we don't need (Original sub-task: MDL-56035)
* onLaunch
  - Validate consumer object.
  - Set appropriate values for OK flag and message.
* Import classes.
 2016-10-19 11:14:27 +08:00
John Okely
0b72caebac MDL-53832 enrol_lti: Allow multiple LTI1 consumers with the same key 2016-10-19 11:14:27 +08:00
John Okely
a618c707f2 MDL-53832 enrol_lti: Support user images 
Original subtask MDL-55718.
 2016-10-19 11:14:27 +08:00
John Okely
8e0038f9ea MDL-53832 enrol_lti: Only allow certain consumers for each shared tool 
Original subtask: MDL-55753.
 2016-10-19 11:14:27 +08:00
John Okely
f8307a4b57 MDL-53832 enrol_lti: Unit test more of helper 2016-10-19 11:14:26 +08:00
John Okely
098ee549ee MDL-53832 enrol_lti: Split launch and proxy registration end points 
Original subtask: MDL-55752.
 2016-10-19 11:14:26 +08:00
John Okely
da65fcf027 MDL-53832 enrol_lti: Separate tool launch and proxy registration logic 2016-10-19 11:14:26 +08:00
John Okely
7edf96e265 MDL-53832 enrol_lti: Add language strings and renderers 2016-10-19 11:14:26 +08:00
Jun Pataleta
d49f57c886 MDL-53832 enrol_lti: Make LTI1 launch URLs work with new library 
Original subtask: MDL-55562.
 2016-10-19 11:14:25 +08:00
Jun Pataleta
0d26a2313c MDL-53832 enrol_lti: Unit tests for data_connector 
Original subtask: MDL-55529.
 2016-10-19 11:14:25 +08:00