Commit graph

94061 commits

Author SHA1 Message Date
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
Mihail Geshoski
3f9ed16e56 MDL-65071 forum: Add unit tests 2019-05-01 22:10:12 +08:00
Ryan Wyllie
9be6dc2de6 MDL-65134 core_message: Introduce event specific function
Introduced an event specific formatting function.
Additional catch on render fn calls
2019-05-01 19:46:52 +08:00
sam marshall
ef3f92c70a MDL-65459 Logging: Missed two points relying on non-JSON log format 2019-05-01 12:11:17 +01:00
Jun Pataleta
a7d496b684 Merge branch 'MDL-65273-master' of https://github.com/lucaboesch/moodle 2019-05-01 17:28:16 +08:00
Paul Holden
38cb434ba6 MDL-65197 editor: handle empty user preference in privacy export. 2019-05-01 09:48:06 +01:00
Ryan Wyllie
1457229295 MDL-65394 forum: fix get_move_discussion_html return signature 2019-05-01 16:27:34 +08:00
Ryan Wyllie
ebe3110dff MDL-65394 filter: only do mathjax parsing on strings that need it 2019-05-01 16:27:34 +08:00
Ryan Wyllie
76fbbf7e7e MDL-65394 portfolio: add cache for portfolio_add_button 2019-05-01 16:27:34 +08:00
Ryan Wyllie
8353770743 MDL-65394 forum: add context id to author export 2019-05-01 16:27:34 +08:00
Adrian Greeve
f2e0dab7f7 Merge branch 'MDL-65388-master' of https://github.com/ryanwyllie/moodle 2019-05-01 16:06:24 +08:00
Jun Pataleta
0bce27bae4 Merge branch 'MDL-65250' of git://github.com/stronk7/moodle 2019-05-01 16:04:02 +08:00
Jake Dallimore
cee7444332 Merge branch 'MDL-65426_master' of git://github.com/markn86/moodle 2019-05-01 15:38:44 +08:00
Luca Bösch
78d9ec8890 MDL-65273 roles: Roles permissions buttons styles. 2019-05-01 09:30:10 +02:00
Mark Nelson
7280b38dd2 MDL-65426 message_email: clean up messages that have already been read 2019-05-01 15:17:48 +08:00
Adrian Greeve
f9da72b63e Merge branch 'MDL-65149-master' of git://github.com/damyon/moodle 2019-05-01 14:58:21 +08:00
Adrian Greeve
53c792b119 Merge branch 'MDL-64959_master' of https://github.com/abhimanyuZ/moodle 2019-05-01 14:30:00 +08:00
Jake Dallimore
1ba1bb79e8 Merge branch 'MDL-65236-master' of git://github.com/marinaglancy/moodle 2019-05-01 14:23:16 +08:00
Ryan Wyllie
69e9190038 MDL-65450 tinymce: fix full screen mode 2019-05-01 14:20:10 +08:00
Adrian Greeve
6120920c2c Merge branch 'MDL-65031-master' of git://github.com/damyon/moodle 2019-05-01 14:02:58 +08:00
Damyon Wiese
edf3f4d14f MDL-65031 theme_boost: gradebook notifications
Tell the gradebook page to stack things vertically so that notifications
take the correct amount of space.
2019-05-01 13:47:43 +08:00