David Baker
904754b20d
Allow uploading the same file twice
2015-07-21 20:55:23 -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
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
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
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
Erik Johnston
2bec7ec981
Add spinner while uploading state
2015-07-21 11:02:36 +01:00
Erik Johnston
0b1b6057d6
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 10:39:46 +01:00
Erik Johnston
af190f286c
Add event power levels to room settings
2015-07-21 10:33:41 +01:00
Matthew Hodgson
12c824323d
rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory
2015-07-20 20:11:33 -07:00
Matthew Hodgson
fe71f69f0a
rename EditableText's placeHolder parameter to be 'label' to avoid colliding with the HTML5 placeholder parameter
2015-07-20 20:11:33 -07:00
Matthew Hodgson
dcecdc8260
lipstick for hangup button and typing notifs
2015-07-20 12:09:24 -07:00
Erik Johnston
813cf0481e
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 18:18:04 +01:00
Kegan Dougal
5d59a5b297
Change opacity of member list entries when their presence changes.
...
This is done by attaching a single room listener at the member list level and
then forceUpdate()ing the individual tiles as presence changes come in from
the JS SDK. This is more efficient than having hundreds of listeners attached
directly to the JS SDK (if we were to add a listener per tile).
2015-07-20 17:42:19 +01:00
Erik Johnston
3a7ebf73eb
Wire up changing of power levels
2015-07-20 17:31:40 +01:00
Erik Johnston
1b6ca2b0ee
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:31:02 +01:00
Erik Johnston
eae0972820
Add files. Add power levels to room settings
2015-07-20 16:28:23 +01:00
Kegan Dougal
6fe842e130
Add ErrorDialog class. Use it for VoIP/command errors.
2015-07-20 16:26:53 +01:00
Matthew Hodgson
bb06484732
fix up MemberInfo behaviour
2015-07-20 08:24:53 -07:00
Erik Johnston
04f17c963c
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:03:35 +01:00
Erik Johnston
0039ccf203
Add ability to edit room settings
2015-07-20 15:07:51 +01:00
Kegan Dougal
f2bd802bdc
Wire up invite button on the member list.
2015-07-20 15:07:19 +01:00
Kegan Dougal
0baa2141fc
Wire up Start Chat button.
2015-07-20 13:22:56 +01:00
Kegan Dougal
08c16e0d7a
Hook up presence/last active up (live updating; no ticker for last active).
2015-07-20 11:37:48 +01:00
Kegan Dougal
87dd9e8bb4
Unbreak stuff
2015-07-20 10:38:44 +01:00
Erik Johnston
46764c3614
Don't set room name if it hasn't changed
2015-07-20 10:23:07 +01:00
David Baker
0fa7f6cb63
.click() was what I was looking for...
2015-07-19 22:55:17 -07:00
David Baker
29b4f59982
Basically working upload progress bar.
2015-07-19 22:55:17 -07:00
David Baker
a477c8be4c
Mostly wire up the send file button, except I can't figure out the js magic to make a file input open the prompt.
2015-07-19 22:55:17 -07:00
David Baker
b82d932a51
Logout button
2015-07-19 22:55:17 -07:00
Matthew Hodgson
2121ddc295
add a MemberInfo list overlay as a mini user-profile page
2015-07-20 01:51:58 +01:00
David Baker
337e6b329f
Don't lose username & password on login failure
2015-07-19 18:00:46 -04:00
David Baker
e1f3c80f19
Display who's typing
2015-07-19 16:38:56 +01:00
David Baker
5aa913f201
Fix label in register screen
2015-07-19 10:56:12 +01:00
David Baker
85748c09cf
Linkify emote tiles
2015-07-19 10:43:16 +01:00
Matthew Hodgson
58907e5842
absolute path thinko
2015-07-19 03:39:13 +01:00
Matthew Hodgson
202c155788
absolute path thinko
2015-07-19 03:37:39 +01:00
Matthew Hodgson
2d25414b57
fix up registration page too
2015-07-19 03:30:41 +01:00
Matthew Hodgson
d239070adb
implement login
2015-07-19 03:19:37 +01:00
Matthew Hodgson
1e1f7492d8
basic skin of incomingCallBox
2015-07-19 01:58:04 +01:00
Matthew Hodgson
ea8737d957
POWER
2015-07-18 19:06:58 +01:00
Matthew Hodgson
db94a93fde
hide events with no text equiv
2015-07-18 19:06:26 +01:00
Matthew Hodgson
aa4f9abd5c
basic VoIP lipstick
2015-07-18 02:04:58 +01:00
Matthew Hodgson
00d2d82a14
new style badges, hr, notices
2015-07-18 01:21:56 +01:00
Matthew Hodgson
4ded74765a
encore du lipstick
2015-07-18 00:48:22 +01:00
Matthew Hodgson
b685e784f1
oops, unbreak selectedRoom. sorry dave
2015-07-18 00:48:17 +01:00
Matthew Hodgson
10cdf46c2c
s/that/self/g
2015-07-17 21:59:48 +01:00
Matthew Hodgson
15edb9a80b
fix up memberlist a bit more
2015-07-17 21:30:25 +01:00
Matthew Hodgson
d4541f54a3
fix up memberlist a bit more
2015-07-17 21:29:54 +01:00
Matthew Hodgson
d09ddc48e0
lay out topic updates correctly
2015-07-17 20:09:56 +01:00
Matthew Hodgson
aa70dd7b67
alt tags for avatars; improve header spacing; improve roomview margin
2015-07-17 19:09:27 +01:00
David Baker
5c7bef3107
Add topic changes to timeline by adding a tile that just uses TextForEvent
2015-07-17 18:49:48 +01:00
David Baker
214ef4b4ce
Tidy up profile picture setting & fix notification bug
2015-07-17 17:13:51 +01:00
Matthew Hodgson
7bef6245f7
'ended the call' kinda handles both cancelled and 'hung up'
2015-07-17 17:08:38 +01:00
Kegan Dougal
827e777079
Implement ringing audio. Add other audio tags.
2015-07-17 16:42:26 +01:00
David Baker
ff567faeaa
Profile picture setting and notifdications thereof.
2015-07-17 16:41:46 +01:00
Matthew Hodgson
328d5004d8
it's spelt 'hung up'
2015-07-17 16:15:23 +01:00
David Baker
6a76d8ace8
Update room header when room name changes
2015-07-17 13:48:24 +01:00
David Baker
37108ac56c
Make notifications sensible again and have information once and only once.
2015-07-17 11:57:26 +01:00
David Baker
1b03aa8119
Display nick changes and factor out getting text for events into a common place.
2015-07-17 11:57:26 +01:00
Matthew Hodgson
891ba40114
basic date separator support
2015-07-17 00:12:54 +01:00
Matthew Hodgson
1a95148dae
basic date separator support
2015-07-17 00:12:53 +01:00
Matthew Hodgson
a2ca5f2847
improve badges and room tile layout
2015-07-17 00:12:53 +01:00
David Baker
8ccce4d702
Make new login style work
2015-07-16 21:46:39 +01:00
David Baker
cfbef0177e
Fix custom server or registration & do some of new login UI
2015-07-16 19:30:27 +01:00
David Baker
8feeb93215
Merge pull request #10 from matrix-org/editable_room_name
...
Make room name editable
2015-07-16 19:29:49 +01:00
Erik Johnston
789e70f2d6
Remove old atoms
2015-07-16 18:07:28 +01:00
Erik Johnston
ce3dab3c5b
Make room name editable
2015-07-16 17:42:33 +01:00
David Baker
03733e6a0f
Merge pull request #9 from matrix-org/create_room
...
Wire in create room.
2015-07-16 17:37:48 +01:00
Kegan Dougal
59ca26ee93
Use target not sender when displaying member text.
2015-07-16 17:37:35 +01:00
Erik Johnston
98160c3947
Add ability to remove people from invite list
2015-07-16 17:30:10 +01:00
Erik Johnston
68d60aadd1
Make Presets stateless
2015-07-16 17:24:33 +01:00
Erik Johnston
aa1b763518
Make CreateRoom remember what the values of its fields were. Remove some fairly pointless atoms
2015-07-16 17:20:03 +01:00
David Baker
3a6423dd0a
Merge branch 'master' into vector
2015-07-16 16:52:19 +01:00
David Baker
9b6060a363
Decouple login view & controller
2015-07-16 16:49:40 +01:00
Kegan Dougal
6b81022e28
Move position of incoming call buttons.
2015-07-16 16:32:21 +01:00
Erik Johnston
47f4c0dfff
Use Loader
2015-07-16 16:20:00 +01:00
Erik Johnston
95968bf619
Make server_name magix in RoomAlias optional
2015-07-16 16:14:55 +01:00
Erik Johnston
cd26d1323f
Wire together checkboxes and presets and use new /createRoom api
2015-07-16 15:55:46 +01:00
