Matthew Hodgson
|
3a1159ce12
|
e2e look & feel
|
2016-09-12 01:37:51 +01:00 |
|
Matthew Hodgson
|
e6b4b8c1cb
|
bring back small avatars for info msgs otherwise the design breaks
|
2016-09-11 23:01:20 +01:00 |
|
Aviral Dasgupta
|
8db2a4d46f
|
Fix linkification and bump linkifyjs dep
|
2016-09-12 03:30:00 +05:30 |
|
Matthew Hodgson
|
46205ad83c
|
back out small avatars for emotes for now as they conflict with the E2E artwork.
they will be reintroduced once we have lozenges
|
2016-09-11 22:49:05 +01:00 |
|
Matthew Hodgson
|
83209197f4
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-11 02:38:16 +01:00 |
|
Matthew Hodgson
|
34bb37aaba
|
layout for file & notif panel
|
2016-09-11 02:14:27 +01:00 |
|
Matthew Hodgson
|
bae6409edb
|
show badge menu on RoomTile hoverover
|
2016-09-11 00:30:43 +01:00 |
|
Matthew Hodgson
|
be33c35876
|
use new onRoomTimelineReset API to let notif timeline reset itself
|
2016-09-10 10:46:30 +01:00 |
|
Matthew Hodgson
|
6f270fd621
|
remove debug
|
2016-09-10 01:39:19 +01:00 |
|
Matthew Hodgson
|
86da0e0d63
|
Merge pull request #459 from VShell/fix-cas
Fix CAS support by using a temporary Matrix client
|
2016-09-09 21:19:19 +01:00 |
|
Shell Turner
|
1380bf705a
|
Fix CAS support by using a temporary Matrix client
Signed-off-by: Shell Turner <cam.turn@gmail.com>
|
2016-09-09 21:01:10 +01:00 |
|
David Baker
|
96fabe09d2
|
Update createRoom to support creating DM rooms
* Make ChatInviteDialog and MemberInfo createRoom use it
* Fix bug in setDMRoom
|
2016-09-09 19:25:00 +01:00 |
|
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
|
904348e62a
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-09 11:12:52 +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 |
|
Matthew Hodgson
|
db61d8e8ad
|
another null check
|
2016-09-09 02:28:14 +01:00 |
|
Matthew Hodgson
|
f4d939da81
|
null checks on room in onRoomTimeline
|
2016-09-09 02:09:12 +01:00 |
|
Matthew Hodgson
|
4aef352a5c
|
update to use new API based on js-sdk PR input
|
2016-09-08 22:48:44 +01:00 |
|
Luke Barnard
|
f605b172a7
|
Better log
|
2016-09-08 17:38:51 +01:00 |
|
Matthew Hodgson
|
3c7864a7ad
|
remove unused _gatherTimelinePanelRef
|
2016-09-08 14:52:08 +01:00 |
|
Matthew Hodgson
|
f88ba9df11
|
fix comment & use room.getUnfilteredTimelineSet()
|
2016-09-08 14:38:34 +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 |
|
Matthew Hodgson
|
c882d66b0d
|
make NotificationPanel work
|
2016-09-08 03:02:31 +01:00 |
|
Matthew Hodgson
|
27b3f5f6b1
|
create a global notif timeline set for each client
|
2016-09-08 03:02:26 +01:00 |
|
Matthew Hodgson
|
7174648f94
|
don't show RRs if manageRRs is false
|
2016-09-08 03:01:38 +01:00 |
|