Commit graph

423 commits

Author SHA1 Message Date
David Baker
772053713a lightbox image viewing (that needs CSS) 2015-07-22 16:04:29 -07:00
David Baker
7ffd684a9e Merge pull request #3 from vector-im/confirm_on_leave
Prompt if a user really wants to leave the room
2015-07-22 12:00:08 -07:00
Erik Johnston
51d2677525 Prompt if a user really wants to leave the room 2015-07-22 17:53:18 +01:00
Kegan Dougal
fbb6775523 Implement unread message status when scrolled up. 2015-07-22 14:49:32 +01:00
Kegan Dougal
8b0db49b8b Bugfix: Accepting an invite no longer results in a stale membership list. 2015-07-22 14:10:06 +01:00
Kegsay
b8c18130da Merge pull request #1 from vector-im/leave_room_button
Leave room button
2015-07-22 14:01:37 +01:00
Erik Johnston
431c93fc29 Fix invites so they display in room list 2015-07-22 13:57:48 +01:00
Erik Johnston
0016c2ad83 Also change URL when going to next/prev room 2015-07-22 13:47:08 +01:00
Erik Johnston
ed1cb44deb Show Loader while leaving 2015-07-22 13:39:36 +01:00
Erik Johnston
b9fd174f72 Merge branch 'master' of github.com:vector-im/vector-web into leave_room_button 2015-07-22 13:30:34 +01:00
Kegan Dougal
d4147c1315 Don't allow blank messages to be sent. 2015-07-22 13:15:12 +01:00
Kegan Dougal
7e42072952 Scroll to bottom when there are live call updates.
This keeps the latest messages visible when you place or receive a call.
2015-07-22 13:04:18 +01:00
Erik Johnston
6bfc566d9a Switch to another room when we succesfully leave a room 2015-07-22 11:41:32 +01:00
Erik Johnston
5835ea0a97 Only display rooms you're currently joined to in recents 2015-07-22 11:33:46 +01:00
Kegan Dougal
e80cf8a133 Bugfix: Scroll to the bottom more reliably on new incoming messages.
Added some padding to the calculation which means the scrollbar can
be scrolled up a bit and still get bumped down. Scroll a lot though
and it will not keep bumping you down (parity with Angular)
2015-07-22 11:12:45 +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