Erik Johnston
5835ea0a97
Only display rooms you're currently joined to in recents
2015-07-22 11:33:46 +01:00
Erik Johnston
5fb6ea94b2
Add leave button as per wireframes
2015-07-22 10:59:36 +01:00
Mark Haines
e1aca588b5
Clear local storage *before* creating the client, Otherwise we will blow away anything that the client tried to persist after it was created
2015-07-22 09:43:40 +01:00
Erik Johnston
79e03597b3
Merge remote-tracking branch 'upstream/vector'
2015-07-22 09:24:13 +01:00
Kegan Dougal
6b44fa7642
Bugfix: Also grey out messages which are in the 'queued' state.
2015-07-22 09:14:39 +01:00
Kegan Dougal
772f987489
Unbreak npm start when running on Windows
2015-07-22 08:25:40 +01:00
Matthew Hodgson
663646f845
fix firefox layout
2015-07-22 00:17:20 -07:00
Matthew Hodgson
f6be51bd98
make login page scrollable
2015-07-22 00:17:15 -07:00
Matthew Hodgson
538536eb88
vaguely make room editing prettier
2015-07-21 23:19:51 -07:00
David Baker
c8f3f5841c
Depend on develop js-sdk for now
2015-07-21 22:51:54 -07:00
David Baker
0f8686b8cd
Rename example to vector
2015-07-21 22:46:21 -07:00
David Baker
8c25855f38
Tweak README for vector
2015-07-21 22:45:01 -07:00
David Baker
92e346a842
Merge branch 'vector'
2015-07-21 22:37:14 -07:00
David Baker
904754b20d
Allow uploading the same file twice
2015-07-21 20:55:23 -07:00
David Baker
2eba2280d8
Don't barf if we we can't get a given room ID
2015-07-21 20:34:55 -07:00
Matthew Hodgson
67d3368e1e
fix up some of the modals
2015-07-21 17:02:06 -07:00
Matthew Hodgson
ceb214f192
skin dialogs correctly
2015-07-21 16:48:55 -07:00
Matthew Hodgson
0b3a9baa44
fix CSS on firefox with copious application of black magic. the same trick might help the vertical height problem on chrome which was worked around by turning RoomView into a dummy flexbox
2015-07-21 15:59:11 -07:00
Matthew Hodgson
b2130a5295
remove remotevideo bottom border hack
2015-07-21 15:46:28 -07:00
Matthew Hodgson
a2f5933417
make aux panel behave vaguely intelligently
2015-07-21 15:43:54 -07:00
David Baker
9af09de7d4
Dispatch notifier_enabled when permission given if we don't already have it.
2015-07-21 15:35:30 -07:00
Matthew Hodgson
aaa96f1ac1
vicious rewrite of the CSS to support the notifications toolbar, removing all height: 100%'s and letting the flexbox stuff calculate auto-height instead. may have slowed down the rendering, especially when the toolbar is visible
2015-07-21 15:03:05 -07:00
David Baker
e03809b224
Merge pull request #16 from matrix-org/markjh/end-to-end
...
Add basic support for end-to-end crypto using olm.
2015-07-21 13:21:43 -07:00
David Baker
6fc910a259
Don't try to set page_type if not logged in
2015-07-21 11:12:59 -07:00
David Baker
959c0f0669
Order room members by lastActiveAgo
2015-07-21 11:05:54 -07:00
Matthew Hodgson
8dc73cb6cc
finally fix dave's MemberInfo visibility bug, hopefully
2015-07-21 11:03:01 -07:00
Kegan Dougal
2160440ff1
Add and impl resend button. Update UI when failing to send messages.
2015-07-21 18:05:22 +01:00
Mark Haines
f036a10a7d
Add missing src/encryption.js file
2015-07-21 17:00:57 +01:00
Mark Haines
6bb6eafdc0
Hook up slash commands to enable and disable encryption for a room so that we can experiment with encryption while we wait for the rest of the UI to exist
2015-07-21 16:46:17 +01:00
Kegan Dougal
e0496305aa
Log when presence is set.
2015-07-21 16:23:21 +01:00
Kegan Dougal
2698405e2f
Add MatrixToolbar CSS. Make the toolbar part of RoomView and don't cover the UI (shift it instead)
2015-07-21 16:17:50 +01:00
Kegan Dougal
c1de5e9e95
Factor out logic from EnableNotificationsButton(!) and reuse MatrixToolbar.
...
Added notification logic to Notifier; dispatch notifier_enabled when toggled
so the toolbar can be shown/hidden and the button text can be kept in sync.
Add MatrixToolbar back into MatrixChat for notification nagging.
2015-07-21 16:17:50 +01:00
David Baker
ed738b6398
Merge pull request #15 from matrix-org/erikj/room_editing
...
Show banned users in room settings
2015-07-21 08:14:25 -07:00
Erik Johnston
e36ca10e6c
Show banned users in room settings
2015-07-21 16:08:56 +01:00
David Baker
71f5d1f6cb
Use bind to take variable value rather than reference: make room directory able to join rooms
2015-07-21 08:05:58 -07:00
David Baker
4679e005bf
Merge pull request #14 from matrix-org/erikj/room_editing
...
Room Settings.
2015-07-21 07:38:10 -07:00
Erik Johnston
c5d84562ba
Move logic from view to controller
2015-07-21 15:24:10 +01:00
Erik Johnston
16846c36fd
Handle default named rooms when editing room names
2015-07-21 14:48:07 +01:00
Kegan Dougal
2fe56fd86d
Re-add the notifications button.
2015-07-21 14:45:32 +01:00
Erik Johnston
89f6459915
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 14:14:48 +01:00
Erik Johnston
b8e1927e82
Use getDefaultProps instead of setting porps
2015-07-21 14:14:15 +01:00
Erik Johnston
d81260c92a
Use getDefaultProps instead of setting porps
2015-07-21 14:13:59 +01:00
Erik Johnston
76c014b9ef
Deal with the insanity if there are no power levels
2015-07-21 13:33:01 +01:00
Kegan Dougal
2454a71b38
Implement create/remove mod button.
2015-07-21 13:24:59 +01:00
Mark Haines
726ee7b50b
Hook up the encrypt button when creating rooms
2015-07-21 12:03:15 +01:00
Mark Haines
3474f08334
Display the body of unknown message types
2015-07-21 12:01:18 +01:00
Kegan Dougal
13f04f77dc
Tidy up power level logic. Add 'Moderator' label to members.
2015-07-21 11:43:18 +01:00
Erik Johnston
085e07c5b1
Display error on fail
2015-07-21 11:26:08 +01:00
Kegan Dougal
2e2cecdd4f
Implement kick/ban/[un]mute buttons on member list dialogs.
2015-07-21 11:26:02 +01:00
Erik Johnston
0e9074b0de
Remove console.logs
2015-07-21 11:22:11 +01:00
