OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,410 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

2410 Commits (8160613e010808686e88233b5f862834c881ef4b)

Author SHA1 Message Date
Matthew Hodgson 8160613e01 Merge pull request #457 from matrix-org/dbkr/dont_crash_if_no_dm_rooms 
Don't crash if no DM rooms with someone
 2016-09-09 18:09:40 +01:00
David Baker 8e518af96c Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms 2016-09-09 17:38:13 +01:00
David Baker f1ed750246 Don't crash if no DM rooms with someone 
...when opening MemberInfo.

getDMRoomsForUserId should always return a valid list, since it's a list of what DM rooms you have with somebody.
 2016-09-09 17:35:35 +01:00
David Baker 9cff4d59ca Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section 
Don't always show DM rooms in Direct Messages
 2016-09-09 17:35:02 +01:00
David Baker 78f53bd403 Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms 
Add DM rooms with that person to the MemberInfo panel
 2016-09-09 17:30:32 +01:00
David Baker 4c5db7cc9f Don't always show DM rooms in Direct Messages 
Favourites belong in favourites & parted ones belong in Historical, etc.
 2016-09-09 17:23:15 +01:00
Matthew Hodgson fed3f48297 Merge pull request #452 from aviraldg/test-rte 
Add some tests for the rich text editor
 2016-09-09 17:16:04 +01:00
David Baker 6f2e0a4cdf Make rooms in MemberInfo update when necessary 
Factor out the chunk of code that looks through a read receipt event
to see if it contain a read receipt from a given user, now we use it
in 2 places.
 2016-09-09 16:59:59 +01:00
David Baker 590d6d3ee8 Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms 2016-09-09 16:22:48 +01:00
Kegsay 2078f81f33 Merge pull request #454 from matrix-org/kegan/get-room-on-first-load 
Fix bug whereby refreshing Vector would not allow querying of membership state
 2016-09-09 16:15:11 +01:00
David Baker aa0f15c46e List common rooms in MemberInfo 2016-09-09 16:15:01 +01:00
Kegan Dougal 9c290c4b8d Return after sending an error 2016-09-09 16:14:41 +01:00
Kegan Dougal a306a5e694 Fix bug whereby refreshing Vector would not allow querying of membership state 
This was caused by Vector only sending a room alias with the `view_room` action.
We now resolve this to a room ID if we don't have a room ID.
 2016-09-09 16:06:19 +01:00
Matthew Hodgson 4de0e19ef3 Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators 
Wmwragg/one to one indicators
 2016-09-09 15:08:48 +01:00
wmwragg a6b0a7d5dc Should supply the roomId 2016-09-09 15:01:40 +01:00
wmwragg 17b75a589f Added the little green men for direct message rooms 2016-09-09 14:36:51 +01:00
Richard van der Hoff 17e763e8e6 Merge pull request #451 from matrix-org/rav/deviceinfo 
Update MemberDeviceInfo display
 2016-09-09 14:08:42 +01:00
Aviral Dasgupta fec1e4d4c1 Add some tests for the rich text editor 2016-09-09 18:07:42 +05:30
Richard van der Hoff b724b0c6b6 Update MemberDeviceInfo display 
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
 2016-09-09 11:41:56 +01:00
Matthew Hodgson dce2dd36ec Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat 
Wmwragg/one to one chat
 2016-09-09 10:46:11 +01:00
Luke Barnard 6ddc31fb66 Merge pull request #443 from matrix-org/luke/post-messages 
Scalar Messaging: Expose join_rules and restrict to currently viewed room
 2016-09-09 09:57:48 +01:00
wmwragg 840bfe84c1 Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters 2016-09-09 06:57:30 +01:00
Luke Barnard f605b172a7 Better log 2016-09-08 17:38:51 +01:00
David Baker c9475e2ae5 Merge pull request #449 from matrix-org/dbkr/toggle_dm_room 
API for (un)marking rooms as DM rooms
 2016-09-08 14:11:22 +01:00
David Baker ee7c064690 I can't spell 'likely' 2016-09-08 13:56:45 +01:00
Matthew Hodgson b0a4b017c3 Merge pull request #440 from aviraldg/feature-rte-formatbar 
Formatting toolbar for RTE message composer.
 2016-09-08 13:54:26 +01:00
wmwragg d1974a75fd Only Direct Message rooms, that aren't parted or forgotten are used 2016-09-08 13:09:54 +01:00
wmwragg d0523cae70 If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one 2016-09-08 11:45:09 +01:00
Aviral Dasgupta 8da7b98ad0 RTE: Remove dead code, fix <del> styling 2016-09-08 11:21:39 +05:30
Aviral Dasgupta c11232742b Fix focus and toggling issues in formatting bar 2016-09-08 02:46:56 +05:30
Aviral Dasgupta 8974442084 Hide empty autocomplete and remove word counter 2016-09-08 00:43:10 +05:30
Aviral Dasgupta 802ec1169f Fix Markdown conversion to not add extra \n 
Fixes vector-im/vector-web#2094
 2016-09-08 00:03:55 +05:30
Aviral Dasgupta f0f20beae0 RTE format bar enhancements 2016-09-08 00:03:54 +05:30
Aviral Dasgupta 0c0c44b050 Formatting toggle, markdown indicator, quoting 
Fixes vector-im/vector-web#1825
 2016-09-08 00:02:55 +05:30
Aviral Dasgupta 71251293e4 RTE formatbar (wip) 
Fixes vector-im/vector-web#2024
 2016-09-08 00:02:16 +05:30
David Baker ec4086c5fc API for (un)marking rooms as DM rooms 2016-09-07 17:46:45 +01:00
wmwragg 7dfb8857d8 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-07 17:22:10 +01:00
Luke Barnard ce68a5bfc8 clean up 2016-09-07 17:08:02 +01:00
Luke Barnard 31d2a819f0 Get power levels before setting them 2016-09-07 17:06:57 +01:00
wmwragg ca3910f5a8 Mouse actions on the queryList added, as well as better queryListElement styling 2016-09-07 16:18:50 +01:00
Richard van der Hoff 603bf8c194 Merge pull request #447 from matrix-org/dbkr/refactor_matrixtools 
Refactor MatrixTools to Rooms
 2016-09-07 11:56:00 +01:00
David Baker 66b2944011 Convert Rooms.js to ES6 2016-09-07 11:45:32 +01:00
David Baker 8a4606cfbf Remove unused import 2016-09-07 11:34:55 +01:00
David Baker df1cc8748f Change references to MatrixTools to Rooms 
or remove where they were unused
 2016-09-07 11:33:58 +01:00
David Baker db42d629aa Rename MatrixTools to Rooms 
Since all the functions therein are to do with rooms, so this name is probably more helpful
 2016-09-07 11:30:09 +01:00
David Baker bed5aa8c83 Merge pull request #446 from matrix-org/dbkr/m_direct_dm_rooms 
Track DM rooms in account data
 2016-09-07 11:28:35 +01:00
wmwragg dd186dd612 Fixed wrong type to justified prop 2016-09-07 10:59:06 +01:00
wmwragg 7e60012bd4 Added justification for the AddressTile, when requested 2016-09-07 10:55:44 +01:00
David Baker 094080629d Actually commit changed path 2016-09-07 10:19:39 +01:00
David Baker 8f6d413ebd Move DMRoomMap to a util subdir 2016-09-07 10:07:43 +01:00