736b6dac7a
default labs correctly :/
2016-09-17 00:54:56 +01:00
00d2fd471d
Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom
...
Add 'startAtBottom' flag
2016-09-16 22:38:21 +01:00
c322a191af
turn on E2E and Scalar by default
2016-09-16 18:36:03 +01:00
d0fd6e985f
Document paranoia on the startAtBottom param
2016-09-16 17:48:08 +01:00
67565f88fa
Merge pull request #474 from matrix-org/markjh/olm_version
...
Add the olm version to the settings page.
2016-09-16 17:30:35 +01:00
806ef11fde
Add 'startAtBottom' flag
...
Controls whether a scrollPanel starts off at the bottom.
This may not be necessary and could either be derived from stickyBottom, but
this means I can be sure that the behaviour of ScrollPanel is completely
unchanged for all other uses to avoid breaking any other uses of
ScrollPanel.
2016-09-16 17:18:58 +01:00
1341ffca59
Merge pull request #479 from matrix-org/dbkr/directory_network_selector
...
Pass through config for Room Directory
2016-09-16 17:08:44 +01:00
a28aab42c4
fix NPE in guest access
2016-09-16 16:45:43 +01:00
ff00474aa5
show RightPanel when people click on users
2016-09-16 02:37:06 +01:00
c21309fdf6
remove stale state
2016-09-15 22:56:12 +01:00
44fa851275
Pass through config for Room Directory
2016-09-15 17:18:53 +01:00
c54b9c911f
Add the olm version to the settings page.
2016-09-15 11:31:54 +01:00
8bda0bb095
basic verification UI
2016-09-15 01:55:51 +01:00
8508e006f0
Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite
...
Wmwragg/chat multi invite
2016-09-13 19:30:02 +01:00
17cf2fc745
Merge pull request #470 from matrix-org/matthew/right-panel-collapse
...
Matthew/right panel collapse
2016-09-13 19:09:18 +01:00
eb6a4f97ba
make it work
2016-09-13 19:00:35 +01:00
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
5450e93df1
Verbiage
2016-09-13 16:56:53 +01:00
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
2db8f4ae67
Added pass through of roomId
2016-09-13 14:30:37 +01:00
ca1bb0f700
Added new Invite button in the RHS footer which calls the new 'view_invite' action
2016-09-13 14:28:03 +01:00
524eeaa315
Merge up from develop
2016-09-13 12:37:52 +01:00
3b52081092
wip for collapsable RHS
2016-09-13 12:18:22 +01:00
99dfcb4ed2
It's no longer a onde to one chat dialog, as you can invite multiple people
2016-09-13 10:33:15 +01:00
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
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
83209197f4
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:38:16 +01:00
34bb37aaba
layout for file & notif panel
2016-09-11 02:14:27 +01:00
be33c35876
use new onRoomTimelineReset API to let notif timeline reset itself
2016-09-10 10:46:30 +01:00
6f270fd621
remove debug
2016-09-10 01:39:19 +01:00
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
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
904348e62a
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:12:52 +01:00
f4d939da81
null checks on room in onRoomTimeline
2016-09-09 02:09:12 +01:00
4aef352a5c
update to use new API based on js-sdk PR input
2016-09-08 22:48:44 +01:00
3c7864a7ad
remove unused _gatherTimelinePanelRef
2016-09-08 14:52:08 +01:00
f88ba9df11
fix comment & use room.getUnfilteredTimelineSet()
2016-09-08 14:38:34 +01:00
c882d66b0d
make NotificationPanel work
2016-09-08 03:02:31 +01:00
7174648f94
don't show RRs if manageRRs is false
2016-09-08 03:01:38 +01:00
334564c814
unbreak tests
2016-09-07 22:54:38 +01:00
8f75bce29e
add fixmes
2016-09-07 22:54:37 +01:00
990d84df77
make FilePanel refresh when we switch rooms
2016-09-07 22:54:37 +01:00
e7074ef9af
apply FilePanel css and fix filtering
2016-09-07 22:54:37 +01:00
e5dd2e0b46
make FilePanel work, superficially at least
2016-09-07 22:54:37 +01:00
e22d0a53b6
WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets
2016-09-07 22:54:37 +01:00
c3de035964
filepanel
2016-09-07 22:54:37 +01:00
ae34f2ed5c
placeholder NotificationPanel
2016-09-07 22:53:15 +01:00
d9ffe30a0d
WIP notif panel
2016-09-07 22:53:15 +01:00
7dfb8857d8
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-07 17:22:10 +01:00
df1cc8748f
Change references to MatrixTools to Rooms
...
or remove where they were unused
2016-09-07 11:33:58 +01:00
Matthew Hodgson