Commit graph

93626 commits

Author SHA1 Message Date
Shamim Rezaie
a31194800b MDL-64988 mod_quiz: Fix questions always being added to the last section 2019-05-03 18:39:13 +10: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
Damyon Wiese
7444ba743f MDL-63262 badges: More changes for badgr.io
This commit combines several changes:
* Show authentication errors.
* Show more detailed authentication errors
* When the site backpack is different to the user backpack, show a warning
* Do not duplicate the apiversion and backpackurls in each user backpack.
* Do not support different issuer information for each badge with Open Badges v2.
* Add obversion to assertion url
* Combine separate badges upgrade steps and bump the version number.
* Don't show private collections.
* Push the larger image size to backpacks (512x512).
* BADGE_BACKPACKURL is deprecated
* Don't use property alignments, only alignment
2019-05-03 15:00:01 +08:00
Damyon Wiese
1837b1d5fd MDL-63262 badges: Coding style 2019-05-03 15:00:00 +08:00
Damyon Wiese
aae219acce MDL-63262 badges: Add badgr.io
Upgrade the support for Open Badges 2 to support a real open badges 2 backpack.
Moodle can only talk to one backpack at a time, so after switching backpacks, users
will have to manually disconnect and then reconnect their backpack to the new one.

This commit combines several changes:
* Split classes into badges namespace
* Publish expiry data with a badge
* Publish badge alignments in badges exported to the backpack.
* Export the criteria for a badge to the backpack.
2019-05-03 15:00:00 +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
zpottie
7a02f020c3 MDL-58315 core: Add support for custom block classes 2019-05-03 16:12:29 +12:00
Jake Dallimore
55e5530f97 Merge branch 'MDL-64910-master' of git://github.com/peterRd/moodle 2019-05-03 12:09:47 +08:00
Ryan Wyllie
c70ddc335d MDL-65474 forum: adjust forum post html structure
Move around the HTML structure for the forum post to better match
the previous structure for the author pictures, groups, and
rating HTML
2019-05-03 11:50:56 +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
Mihail Geshoski
b4a1bbbb6a MDL-65071 forum: Sort starred discussions 2019-05-01 22:51:14 +08:00
Mihail Geshoski
28c2f2b266 MDL-65071 forum: Fix webservice unit tests 2019-05-01 22:20:35 +08:00
Mihail Geshoski
121ccf1593 MDL-65071 forum: Include starred discussions info in the web service 2019-05-01 22:10:12 +08:00
Mihail Geshoski
d39a50dc8a MDL-65071 forum: Unit test sorting of starred discussions 2019-05-01 22:10:12 +08:00
Mihail Geshoski
1a9c60e931 MDL-65071 forum: Add sorting in discussion list 2019-05-01 22:10:12 +08:00