93469 Commits

Author SHA1 Message Date
Stephen Vickers
878339017d MDL-62599 mod_lti: Correct documentation 2019-05-06 13:33:42 +08:00
Stephen Vickers
8ca51fa124 MDL-62599 mod_lti: Update documentation
Change documentation for typeconfig property of service_base from stdClass to array.
2019-05-06 13:33:42 +08:00
Stephen Vickers
75f020862a MDL-62599 mod_lti: Replace language string removed in error 2019-05-06 13:33:42 +08:00
Stephen Vickers
408cb8d64c MDL-62599 mod_lit: Missing end of function 2019-05-06 13:33:42 +08:00
Stephen Vickers
1bc7f99bf7 MDL-62599 mod_lti: Merge lti_convert_to_jwt and lti_sign_jwt 2019-05-06 13:33:42 +08:00
Stephen Vickers
f6662ae4de MDL-62599 mod_lti: Correct content-item return
Update method used to verify the JWT version of content-items being returned by a tool.
2019-05-06 13:33:42 +08:00
Stephen Vickers
a464331db2 MDL-62599 mod_lti: Revert service configuration parameters
Code to add configuration settings for LTI services reverted to current release code which injects them directly into the edit form.  This has the risk of name clashes and changes being made to elements not created by the service.
2019-05-06 13:33:42 +08:00
Stephen Vickers
d930ef0491 MDL-62599 mod_lti: Correct parameter name 2019-05-06 13:33:42 +08:00
Stephen Vickers
8a8221f587 MDL-62599 mod_lti: Changes from integration review 2019-05-06 13:33:42 +08:00
Stephen Vickers
27cbb5965e MDL-62599 mod_lti: Add platform support for LTI 1.3 2019-05-06 13:33:42 +08:00
Eloy Lafuente (stronk7)
a411b499b9 on-demand release 3.7dev+ 2019-05-03 17:53:09 +02:00
Jun Pataleta
954ab0e654 Merge branch 'MDL-65475-master' of git://github.com/junpataleta/moodle 2019-05-03 15:52:42 +08:00
Mihail Geshoski
b72780bcbf MDL-65475 forum: Fix discussion locking behat test 2019-05-03 15:52:03 +08:00
Jun Pataleta
0b53f28cf8 Merge branch 'MDL-65475-master-1' of git://github.com/mihailges/moodle 2019-05-03 14:26:40 +08:00
Mihail Geshoski
d8c0f8ea03 MDL-65475 forum: Align items in forum settings menu 2019-05-03 13:39:25 +08:00
Jun Pataleta
27a7632ac2 Merge branch 'MDL-65468-master' of git://github.com/mihailges/moodle 2019-05-03 13:24:43 +08:00
Jake Dallimore
55e5530f97 Merge branch 'MDL-64910-master' of git://github.com/peterRd/moodle 2019-05-03 12:09:47 +08:00
Peter
72bb97843d MDL-64910 block_myoverview: Separate the category name as it's own link
* Separate the link
* Add style to force color inheritance
2019-05-03 11:46:21 +08:00
Jun Pataleta
6178721aa6 Merge branch 'MDL-65418-master' of https://github.com/ryanwyllie/moodle 2019-05-03 11:43:14 +08:00
Jun Pataleta
70c1f17d7b Merge branch 'MDL-65450-master' of https://github.com/ryanwyllie/moodle 2019-05-03 11:23:18 +08:00
Adrian Greeve
958983fd7e Merge branch 'MDL-65458_master' of git://github.com/markn86/moodle 2019-05-03 11:17:39 +08:00
Andrew Nicols
ec59de637a Merge branch 'M65299_boost_theme-colors_override' of https://github.com/Dave-B/moodle 2019-05-03 11:08:00 +08:00
Jun Pataleta
70cbc37755 Merge branch 'MDL-52828-master' of git://github.com/damyon/moodle 2019-05-03 10:59:42 +08:00
Jun Pataleta
5b8a792f24 Merge branch 'MDL-65212-master' of git://github.com/jleyva/moodle 2019-05-03 10:55:05 +08:00
Andrew Nicols
dd457c4fa6 Merge branch 'MDL-65245' of https://github.com/timhunt/moodle 2019-05-03 10:50:32 +08:00
Adrian Greeve
cbe23e7666 Merge branch 'MDL-64851-master' of https://github.com/s-cenni/MDL-64851 2019-05-03 10:43:28 +08:00
Jake Dallimore
41ec00830e Merge branch 'MDL-65134-master' of git://github.com/peterRd/moodle 2019-05-03 10:05:26 +08:00
Andrew Nicols
370acc305f Merge branch 'MDL-65262-master' of git://github.com/lameze/moodle 2019-05-03 10:02:18 +08:00
Mark Nelson
950246a7ae MDL-65458 message_email: fix failing unit test 2019-05-03 10:01:11 +08:00
Bas Brands
b9849c6fac MDL-65458 message_email: improve design of group message digests 2019-05-03 10:01:03 +08:00
Jun Pataleta
64b61c16a3 Merge branch 'MDL-65466-master' of git://github.com/mihailges/moodle 2019-05-03 09:59:30 +08:00
Adrian Greeve
a0f0ed8fbf Merge branch 'MDL-65460-master' of git://github.com/lameze/moodle 2019-05-03 09:09:00 +08:00
Andrew Nicols
ea00cdc79f Merge branch 'MDL-64394-accesslog' of https://github.com/brendanheywood/moodle 2019-05-03 08:49:33 +08:00
Sara Arjona
4d86fce09f Merge branch 'MDL-65169-master' of https://github.com/snake/moodle 2019-05-02 15:29:02 +02:00
Andrew Nicols
d27ac4622e MDL-65447 theme: Apply pendingJS checks to BS transitions 2019-05-02 13:31:41 +02:00
Jun Pataleta
b919ea9299 Merge branch 'MDL-65411-master' of git://github.com/lameze/moodle 2019-05-02 17:02:10 +08:00
Mihail Geshoski
04cfb5c1ac MDL-65468 forum: Check if passed form data is empty 2019-05-02 16:22:00 +08:00
Jun Pataleta
e4fcd07e3e Merge branch 'MDL-65446-master' of https://github.com/ryanwyllie/moodle 2019-05-02 15:00:41 +08:00
Jake Dallimore
3fd575b9f8 Merge branch 'MDL-64439-master' of https://github.com/ilya-catalyst/moodle 2019-05-02 14:47:39 +08:00
Jun Pataleta
78920136bb Merge branch 'MDL-65318-master' of git://github.com/lameze/moodle 2019-05-02 14:22:17 +08:00
Jun Pataleta
ab709ed274 MDL-65318 core_calendar: Additional fixes
* Move 'calendareventtype' property to event_exporter_base and
  rename it to 'normalisedeventtype'
* Add a 'normalisedeventtypetext' property to event_exporter_base
  for displaying the human-friendly text for the normalised
  event type.
* Clean up calendareventtype from other exporter/template locations
* Fix template names.
2019-05-02 14:19:28 +08:00
Andrew Nicols
5599d4cbca Merge branch 'MDL-65071-master-new' of git://github.com/mihailges/moodle 2019-05-02 13:53:54 +08:00
Mihail Geshoski
2a80ecb543 MDL-65071 forum: Error handling in web service when forum does not exist 2019-05-02 13:51:14 +08:00
Simey Lameze
a8dcc212be MDL-65262 core_calendar: change location param type 2019-05-02 11:29:42 +08:00
Mihail Geshoski
70ed77c568 MDL-65466 forum: Fix discussion pinning when adding/editing discussion 2019-05-02 09:54:17 +08:00
Andrew Nicols
e1a071322f Merge branch 'MDL-65394-master' of https://github.com/ryanwyllie/moodle 2019-05-02 09:04:47 +08:00
Simey Lameze
4b89c5a8a6 MDL-65460 core_course: fix undefined variable error 2019-05-02 08:29:27 +08:00
Simey Lameze
a67bbe5039 MDL-65318 core_calendar: make event details consistent across pages 2019-05-02 08:05:06 +08:00
Simey Lameze
0ea03be795 MDL-65318 core_calendar: add event details template 2019-05-02 08:05:02 +08:00
Eloy Lafuente (stronk7)
550778cdb6 Merge branch 'MDL-65459-master' of https://github.com/sammarshallou/moodle 2019-05-02 00:24:46 +02:00