1917 Commits

Author SHA1 Message Date
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
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
Jun Pataleta
9191a94143 MDL-53832 enrol_lti: Add data_connector
Original subtask: MDL-55529.
2016-10-19 11:14:25 +08:00
John Okely
9161e71515 MDL-53832 enrol_lti: Add LTI2 tables to enrol_lti 2016-10-19 11:14:25 +08:00
John Okely
9a709cd5a5 MDL-53832 enrol_lti: Add interface for proxies 2016-10-19 11:14:24 +08:00
Janek Lasocki-Biczysko
0bb7f79d31 MDL-51401 enrol: ensures correct order of roles in UI components
Role sort order was not available in the UI (in JavaScript) due to
the use of PHP assoc arrays and JSON encoding/decoding. This patch
addresses this by sending the roles in a json array, rather than
json object.
2016-10-07 08:30:25 +01:00
Dan Poltawski
e90cef839c MDL-55168 css: ignore some stylelint complains
1) Legacy css where it would not be a good use of time to
   update.

2) Ignored some long lines and added todo

3) Fixed some line length issues
2016-09-30 09:25:24 +01:00
Dan Poltawski
bc33e9bd3f MDL-55168 css: reformat plain css with stylefmt 2016-09-30 09:25:23 +01:00
Dan Poltawski
14d6945e65 Merge branch 'MDL-56102-master' of https://github.com/xow/moodle 2016-09-28 08:16:28 +01:00
John Okely
8e55ffc6c3 MDL-56102 enrol_lti: Removed unused lines in unit test 2016-09-28 14:54:04 +08:00
Frederic Massart
113efed5b0 MDL-51948 admin: Make admin settings RTL friendly
Part of MDL-55071
2016-09-23 10:54:22 +01:00
Frederic Massart
69b06947d6 MDL-55377 output: Minor adjustments for automatic RTL support
Part of MDL-55071
2016-09-23 10:53:29 +01:00
Eloy Lafuente (stronk7)
73b2a94c7f MDL-55405 enrol_paypal: Fix set_context() call
Note that setting the page context more than once is not ideal
but as far as system->course switches are allowed, this should
not hurt, while providing more accurate messages than keeping
system context.
2016-09-20 12:27:35 +02:00
Eloy Lafuente (stronk7)
43f53ded83 Merge branch 'MDL-55405-master' of git://github.com/cameron1729/moodle 2016-09-20 12:21:37 +02:00
Cameron Ball
4abbb4180b
MDL-55405 enrol_paypal: Create utility class
Some helper functions were in the IPN file. They really should be
in their own utility class to facilitate better testing.
2016-09-20 12:38:31 +08:00
Ruslan Kabalin
8292fa8184 MDL-55776 enrol: Optimise enrolled users listing.
Here we optimise SQL queries for enrolled users list. Expensive subquery is
replaced with faster LEFT JOIN and the whole groups filtering component is
aded on demand.
2016-09-19 23:46:28 +02:00
Ruslan Kabalin
d76749b42c MDL-55776 enrol: Add unit tests for enrolment manager. 2016-09-19 23:46:20 +02:00
Simey Lameze
02d6873ff0 MDL-55122 enrol: remove duplicated updown variable 2016-09-09 08:48:00 +08:00
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
Andrew Nicols
ccfd62a1ca MDL-54680 enrol_lti: Coding Style fixes 2016-08-16 14:48:17 +08:00
Andrew Nicols
88a0cdada4 Merge branch 'MDL-54680-master' of https://github.com/xow/moodle 2016-08-16 14:45:33 +08:00
John Okely
3e9ab40361 MDL-54680 enrol_lti: Offer cartridges in LTI provider 2016-08-16 14:15:02 +08:00
Dan Poltawski
fb8723d9f5 MDL-52105 enrol_self: fix upgrade savepoint 2016-08-15 12:12:24 +01:00
Simey Lameze
6fdd61a073 MDL-52105 enrol_self: Behat test for key holder feature 2016-08-15 12:56:52 +08:00
Simey Lameze
33b6da5327 MDL-52105 enrol_self: Fix wrong holdkey cap restriction for manager
This commit add an upgrade step to remove wrong CAP_PROHIBIT on enrol/self:holdkey for manager role.
Also remove the restriction from the self enrolment access file.
2016-08-15 12:56:51 +08:00
Jun Pataleta
fe15136d37 MDL-55323 enrol_lti: Remove unused required parameter 2016-07-28 14:44:58 +08:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
Conflicts:
	lib/upgrade.txt
2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
Serge Gauthier
cc6b92483a MDL-31356 enrol_imsenterprise: Continue development for added features
* Add the possibility to make it works as before (with categrory name or idnumber).
    * Add possibility to specify nested categories by name or idnumber.
    * Fix error in core_course_courselib_testcase::test_course_created_event because dependency with imsenterprise
2016-07-14 09:36:03 -04:00
Serge Gauthier
08b29336b9 MDL-31356 enrol_imsenterprise: merge with moodle3.2 2016-07-14 09:36:03 -04:00
Dan Poltawski
81e849bc71 MDL-31356 enrol_imsenterprise: add additional test coverage 2016-07-14 09:36:03 -04:00
Dan Poltawski
ecf6a0ab5b MDL-31356 enrol_imsenterprise: Fix behaviour with course idnumber
When not set we shouldn't throw a warning
2016-07-14 09:36:03 -04:00
Brian Biggs
93fdbb4292 MDL-31356 enrol_imsenterprise: New Features
* Feature 1: Allow nested categories when creating courses.
* Feature 2: Allow updates to course Full Name and Short Name.
* Feature 3: Allow setting authentication type for users.
* Feature 4: Allow updates to users.

Also added tests and updated course update routines so it doesn't
muck with DB directly.
2016-07-14 09:36:02 -04:00
Dan Poltawski
d7f2176fd8 MDL-54671 css: fix lint errors 2016-07-08 12:58:54 +01:00