mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity
91,393 Commits 36 Branches 529 Tags
Commit Graph

91393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
01acb1ea90 Moodle release 3.6beta v3.6.0-beta 2018-11-18 12:38:48 +01:00
Jun Pataleta
9d10c33989 Merge branch 'MDL-64066' of git://github.com/stronk7/moodle 2018-11-18 01:02:24 +08:00
Eloy Lafuente (stronk7)
85ad2e6dff MDL-64066 behat: increase data export sizes, we were hitting them 
With MDL-63660 we changed to a bundled moodle.css approach, that
made dowloaded exports size to increase. Although the expected
sizes already were raised in the issue, it seems that some of
them were not enough, so increasing a little bit more.

Side note, we have MDL-63399 about to try to change these tests...
 2018-11-17 12:41:26 +01:00
Eloy Lafuente (stronk7)
6905c1c3fe MDL-64066 behat: more fixes to dialog names, old "add" steps 2018-11-17 12:10:37 +01:00
Eloy Lafuente (stronk7)
1a82729734 MDL-64066 behat: fix missing quote preventing jobs to complete 2018-11-17 00:16:18 +01:00
Eloy Lafuente (stronk7)
8907290a46 on-demand release 3.6dev+ 2018-11-16 12:03:18 +01:00
Eloy Lafuente (stronk7)
303d597523 NOBUG: Fixed SVG browser compatibility 2018-11-16 12:03:16 +01:00
Jun Pataleta
bf3c9536ac Merge branch 'MDL-63999-master' of git://github.com/lameze/moodle 2018-11-16 14:36:14 +08:00
Andrew Nicols
e151cbd971 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-16 14:15:16 +08:00
Ryan Wyllie
d3d95d5dc2 MDL-63303 message: fix bugs in message drawer part 4 
* Add clarification to delete messages lang strings
* Stop message polling when sending a message to fix UI bug
* Publish update last message event when polling finds more messages
* Remove logged in user from group conversation participants list
* Use user object to fetch user preferences to reduce DB calls
* Remove animated slide transitions because the browser breaks when
  showing some conversations
 2018-11-16 14:10:10 +08:00
Simey Lameze
b8c0534515 MDL-63999 calendar: double escape event name on templates 2018-11-16 13:56:54 +08:00
Jun Pataleta
30538dc9c1 Merge branch 'MDL-63660-master' of git://github.com/junpataleta/moodle 2018-11-16 10:54:25 +08:00
Damyon Wiese
ba88292a3d Merge branch 'wip-MDL-63854-master' of https://github.com/kwiliarty/moodle 2018-11-16 10:35:37 +08:00
Jun Pataleta
223e1a6f73 MDL-63660 tool_dataprivacy: Increase expected export file size 2018-11-16 10:30:14 +08:00
Eloy Lafuente (stronk7)
75bedeafe4 Merge branch 'MDL-64012' of https://github.com/timhunt/moodle 2018-11-16 01:02:44 +01:00
Eloy Lafuente (stronk7)
246149f059 Merge branch 'MDL-53035-master' of git://github.com/vmdef/moodle 2018-11-16 00:35:33 +01:00
Kevin Wiliarty
cadec24c48 MDL-63854 competencies, themes: misplaced dropdown arrows 2018-11-15 15:37:15 -05:00
Jun Pataleta
b51b0c6682 Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle 2018-11-15 23:12:14 +08:00
Eloy Lafuente (stronk7)
9ca803a86d Merge branch 'MDL-63303_master-deleteduserfix' of https://github.com/markn86/moodle 2018-11-15 11:20:36 +01:00
Mark Nelson
52beee65b2 MDL-63303 core_message: dont check online status for deleted users 2018-11-15 18:08:12 +08:00
Eloy Lafuente (stronk7)
7a9717f614 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-15 11:04:12 +01:00
Eloy Lafuente (stronk7)
6a7ee95231 Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle 2018-11-15 11:01:24 +01:00
Ryan Wyllie
132626720c MDL-63303 message: add member formatting to conversation 
Make sure the members are formatted when adding to the state in
a conversation so that any missing data is normalised.
 2018-11-15 17:57:44 +08:00
Andrew Nicols
5e47224a62 MDL-63303 message: Stop WS from removing optional keys 2018-11-15 17:56:31 +08:00
Jun Pataleta
ac6cdcea06 Merge branch 'MDL-62287-master' of git://github.com/andrewnicols/moodle 2018-11-15 17:10:54 +08:00
Jun Pataleta
7a99ff70b9 Merge branch 'MDL-63811' of git://github.com/aolley/moodle 2018-11-15 17:09:28 +08:00
Damyon Wiese
f4ccea6f52 Merge branch 'MDL-64009-master' of git://github.com/abgreeve/moodle 2018-11-15 16:30:20 +08:00
Andrew Nicols
705003beae MDL-63303 behat: Behat fixes 2018-11-15 16:26:16 +08:00
Andrew Nicols
f42e85cc86 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-15 16:25:20 +08:00
Andrew Nicols
5d0abf9df6 MDL-63303 behat: Behat fixes 2018-11-15 16:24:00 +08:00
Damyon Wiese
47dc7eb8a4 Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle 2018-11-15 16:10:21 +08:00
Ryan Wyllie
c75559cfff MDL-63303 message: move message drawer to end of <body> 
Fix some of the behat tests that are looking for generic button
names that match some of the buttons in the message drawer which
happen to appear earlier in the DOM.
 2018-11-15 14:43:22 +08:00
Ryan Wyllie
663ccd58ed MDL-63303 message: fix bugs in message drawer part 3 
* Fix bug for newly created conversations being added to overview page
* Fixed bug with use enter to send preference not updating correctly
* Fix unit tests
* Fix race condition loading new messages while conversation resetting
* Fix ordering and rendering of messages with same timestamp
* Fix missing privacy info in get_conversation web service
* Fix linting errors
* Improve bulk message rendering
 2018-11-15 14:43:21 +08:00
Ryan Wyllie
a111ab44af MDL-63303 message: fix bugs in message drawer part 2 
* Added missing icon mappings for font-awesome
* Fixed focus on dialogue button when it opens
* Fixed UI updates on user block / unblock
* Fix jQuery syntax error when sending message with quotes
* Fix message/index.php opening drawer when no conversation found
* Fix placeholders rendered for new requests
 2018-11-15 14:43:21 +08:00
Ryan Wyllie
1d3535f95c MDL-63303 message: fix bugs in message drawer 
* Fix navigation from view_contact to view_conversation on an action
  such as blocking
* Fix default open message section on overview page depending on which
  section has conversations
* Fix message/index.php for users who haven't yet started a
  conversation
 2018-11-15 14:43:21 +08:00
Ryan Wyllie
8c8939c1ae MDL-63303 message: add enter to send user preference 2018-11-15 14:43:21 +08:00
Ryan Wyllie
f074d6f086 MDL-63303 message: remove behat tests for messaging 2018-11-15 14:43:21 +08:00
Ryan Wyllie
142b042c5c MDL-63303 message: message/index.php open conversation in message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
17d982d751 MDL-63303 message: message/edit.php opens setttings in message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
1e3453b7c7 MDL-63303 message: change nav popover to toggle message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
6f96c06374 MDL-63303 theme_bootstrapbase: add message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
5005d8cfb4 MDL-63303 message: add message drawer (boost only) 2018-11-15 14:43:21 +08:00
Ryan Wyllie
3ea46c8e31 MDL-63303 message: add functions to message_repository.js 2018-11-15 14:40:12 +08:00
Ryan Wyllie
0802c38a2f MDL-63303 message: add lastmessagedate to messagearea contact 2018-11-15 14:40:12 +08:00
Ryan Wyllie
ecb4755c91 MDL-63303 message: add count_contacts api function 2018-11-15 14:40:12 +08:00
Ryan Wyllie
b3bbd4a0e1 MDL-63303 message: fix get_conversations external func 2018-11-15 14:40:12 +08:00
Ryan Wyllie
569c0bae9c MDL-63303 message: add get_conversation_between_users external func 2018-11-15 14:40:12 +08:00
Ryan Wyllie
4e3130269c MDL-63303 message: add get_conversation to message api 2018-11-15 14:40:12 +08:00
Ryan Wyllie
6399c7ef14 MDL-63303 message: add count_conversations to api 2018-11-15 14:40:12 +08:00
Ryan Wyllie
886b01783b MDL-63303 message: add fields to send_instant_message 2018-11-15 14:40:12 +08:00