79e03597b3
Merge remote-tracking branch 'upstream/vector'
2015-07-22 09:24:13 +01:00
6b44fa7642
Bugfix: Also grey out messages which are in the 'queued' state.
2015-07-22 09:14:39 +01:00
538536eb88
vaguely make room editing prettier
2015-07-21 23:19:51 -07:00
904754b20d
Allow uploading the same file twice
2015-07-21 20:55:23 -07:00
67d3368e1e
fix up some of the modals
2015-07-21 17:02:06 -07:00
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
8dc73cb6cc
finally fix dave's MemberInfo visibility bug, hopefully
2015-07-21 11:03:01 -07:00
2160440ff1
Add and impl resend button. Update UI when failing to send messages.
2015-07-21 18:05:22 +01:00
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
e36ca10e6c
Show banned users in room settings
2015-07-21 16:08:56 +01:00
c5d84562ba
Move logic from view to controller
2015-07-21 15:24:10 +01:00
16846c36fd
Handle default named rooms when editing room names
2015-07-21 14:48:07 +01:00
89f6459915
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 14:14:48 +01:00
76c014b9ef
Deal with the insanity if there are no power levels
2015-07-21 13:33:01 +01:00
2454a71b38
Implement create/remove mod button.
2015-07-21 13:24:59 +01:00
3474f08334
Display the body of unknown message types
2015-07-21 12:01:18 +01:00
13f04f77dc
Tidy up power level logic. Add 'Moderator' label to members.
2015-07-21 11:43:18 +01:00
2e2cecdd4f
Implement kick/ban/[un]mute buttons on member list dialogs.
2015-07-21 11:26:02 +01:00
0b1b6057d6
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-21 10:39:46 +01:00
af190f286c
Add event power levels to room settings
2015-07-21 10:33:41 +01:00
12c824323d
rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory
2015-07-20 20:11:33 -07:00
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
dcecdc8260
lipstick for hangup button and typing notifs
2015-07-20 12:09:24 -07:00
813cf0481e
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 18:18:04 +01:00
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
3a7ebf73eb
Wire up changing of power levels
2015-07-20 17:31:40 +01:00
1b6ca2b0ee
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:31:02 +01:00
eae0972820
Add files. Add power levels to room settings
2015-07-20 16:28:23 +01:00
bb06484732
fix up MemberInfo behaviour
2015-07-20 08:24:53 -07:00
04f17c963c
Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing
2015-07-20 16:03:35 +01:00
0039ccf203
Add ability to edit room settings
2015-07-20 15:07:51 +01:00
0baa2141fc
Wire up Start Chat button.
2015-07-20 13:22:56 +01:00
08c16e0d7a
Hook up presence/last active up (live updating; no ticker for last active).
2015-07-20 11:37:48 +01:00
87dd9e8bb4
Unbreak stuff
2015-07-20 10:38:44 +01:00
46764c3614
Don't set room name if it hasn't changed
2015-07-20 10:23:07 +01:00
0fa7f6cb63
.click() was what I was looking for...
2015-07-19 22:55:17 -07:00
29b4f59982
Basically working upload progress bar.
2015-07-19 22:55:17 -07:00
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
2121ddc295
add a MemberInfo list overlay as a mini user-profile page
2015-07-20 01:51:58 +01:00
85748c09cf
Linkify emote tiles
2015-07-19 10:43:16 +01:00
58907e5842
absolute path thinko
2015-07-19 03:39:13 +01:00
202c155788
absolute path thinko
2015-07-19 03:37:39 +01:00
d239070adb
implement login
2015-07-19 03:19:37 +01:00
1e1f7492d8
basic skin of incomingCallBox
2015-07-19 01:58:04 +01:00
ea8737d957
POWER
2015-07-18 19:06:58 +01:00
db94a93fde
hide events with no text equiv
2015-07-18 19:06:26 +01:00
aa4f9abd5c
basic VoIP lipstick
2015-07-18 02:04:58 +01:00
00d2d82a14
new style badges, hr, notices
2015-07-18 01:21:56 +01:00
4ded74765a
encore du lipstick
2015-07-18 00:48:22 +01:00
15edb9a80b
fix up memberlist a bit more
2015-07-17 21:30:25 +01:00
Erik Johnston