Matthew Hodgson
17cf2fc745
Merge pull request #470 from matrix-org/matthew/right-panel-collapse
...
Matthew/right panel collapse
2016-09-13 19:09:18 +01:00
Matthew Hodgson
eadcc5e2b9
repin linkify
2016-09-13 19:02:44 +01:00
Matthew Hodgson
91b90aa1fd
Merge pull request #460 from aviraldg/fix-linkify
...
Fix linkification and bump linkifyjs dep
2016-09-13 19:01:56 +01:00
Matthew Hodgson
eb6a4f97ba
make it work
2016-09-13 19:00:35 +01:00
David Baker
283e1ccf4c
Merge pull request #468 from matrix-org/dbkr/create_room_modal
...
Add modal dialog on new room button
2016-09-13 17:05:24 +01:00
David Baker
5450e93df1
Verbiage
2016-09-13 16:56:53 +01:00
David Baker
f82629aed0
Merge pull request #463 from matrix-org/dbkr/flag_incoming_dms
...
Flag incoming DMs as such
2016-09-13 16:42:24 +01:00
David Baker
3741768a3a
Add modal dialog on new room button
...
https://github.com/vector-im/vector-web/issues/2178
2016-09-13 16:40:15 +01:00
Matthew Hodgson
8bb9422907
Merge pull request #466 from aviraldg/feature-autocomplete-behaviour
...
Improve autocomplete behaviour
2016-09-13 16:17:23 +01:00
Aviral Dasgupta
79e5e6f6fe
Fix force completion and hide rooms with no alias
2016-09-13 18:02:33 +05:30
Matthew Hodgson
32b1b6f58a
WIP
2016-09-13 13:12:45 +01:00
Matthew Hodgson
c8def540c4
Merge pull request #464 from remram44/remove-mdown-breaks
...
Remove markdown line breaks
2016-09-13 13:11:18 +01:00
Matthew Hodgson
ed2595e300
Merge pull request #465 from matrix-org/dbkr/fix_unset_dm
...
Fix un-marking rooms as DM rooms
2016-09-13 13:08:31 +01:00
Aviral Dasgupta
9a991a4dfd
Autocomplete fixes and improvements
2016-09-13 17:30:29 +05:30
Matthew Hodgson
3b52081092
wip for collapsable RHS
2016-09-13 12:18:22 +01:00
Aviral Dasgupta
fbf2d5f96c
Fix tests (wip)
2016-09-13 16:46:20 +05:30
Aviral Dasgupta
b62622a814
Improve autocomplete behaviour
...
Fixes vector-im/vector-web#1761
2016-09-13 15:46:02 +05:30
David Baker
d19686b96d
Fix un-marking rooms as DM rooms
2016-09-13 11:06:07 +01:00
Matthew Hodgson
ce40fa1a8f
add missing dialog
2016-09-12 23:43:00 +01:00
Matthew Hodgson
9b7ab46a72
dedicated dialog box for E2E messages
2016-09-12 23:42:24 +01:00
Remi Rampin
8cab40d987
Disable markdown line breaks
...
Stop combinations of - and _ turning into a line break.
2016-09-12 17:51:59 -04:00
Matthew Hodgson
5a548c3d12
add an onclick to the e2e icons
2016-09-12 18:50:52 +01:00
David Baker
2943db1072
Flag incoming DMs as such
...
* Add the 'is_direct' flag to rooms created for DMs
* For invites, look for the DM flag when getting the DM user ID for a room
* When accepting an invite, look for the flag and mark the room as a DM room if appropriate.
2016-09-12 18:32:44 +01:00
David Baker
e49547eb3e
Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms
...
Don't re-use parted rooms for DMs
2016-09-12 18:30:55 +01:00
David Baker
f6478f111a
Merge pull request #458 from matrix-org/dbkr/createdoom_dm
...
Update createRoom to support creating DM rooms
2016-09-12 18:29:43 +01:00
Matthew Hodgson
13eed6cd39
fix NPE in EventTile
2016-09-12 17:29:26 +01:00
Matthew Hodgson
97976939bd
Merge pull request #462 from matrix-org/matthew/e2e
...
First wave of E2E Visuals
2016-09-12 17:20:18 +01:00
Matthew Hodgson
92b4107174
fix tests
2016-09-12 17:19:58 +01:00
Matthew Hodgson
9eae1c5bb7
final e2e icons
2016-09-12 16:51:19 +01:00
David Baker
937e195157
Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm
2016-09-12 16:44:44 +01:00
Matthew Hodgson
fb639da128
Merge branch 'develop' into matthew/e2e
2016-09-12 16:32:39 +01:00
Matthew Hodgson
90fea6c389
unbreak video thumbs
2016-09-12 16:28:56 +01:00
Matthew Hodgson
8e7b1820b9
unbreak video thumbs
2016-09-12 16:28:39 +01:00
David Baker
6ffa7c23cd
Don't re-use parted rooms for DMs
2016-09-12 16:05:51 +01:00
Matthew Hodgson
3fc657bce4
Merge pull request #450 from matrix-org/matthew/notif-panel
...
FilePanel, NotificationPanel and EventTimelineSet support
2016-09-12 15:57:13 +01:00
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
