13e70e6956
Merge remote-tracking branch 'origin/develop' into unread_sync
2016-01-21 10:36:29 +00:00
99a491bb0e
Merge pull request #68 from matrix-org/notif_sync
...
Set room highlight from unread_notification_count
2016-01-21 10:31:42 +00:00
acce08194d
Apply patch to the right branch: update for new count format
2016-01-21 10:23:18 +00:00
1c54c64850
Merge pull request #99 from matrix-org/user_settings_on_register
...
Show user settings screen on registration
2016-01-21 10:11:28 +00:00
a0cc3720a9
Merge pull request #106 from matrix-org/dbkr/dont_spam_read_receipts
...
Don't spam the same RR at the server until it acks it.
2016-01-21 10:01:30 +00:00
9bbb9f7b29
pretty invites!
2016-01-21 00:45:22 +00:00
eab0ca8716
fix bottom margin on FF
2016-01-21 00:39:10 +00:00
4d549304b6
Fix autoshow
2016-01-21 00:26:44 +00:00
9ce4148925
go splitscreen at the first sign of an invite search
2016-01-21 00:25:47 +00:00
deca90d0a7
fix up Start Chat behaviour as per Amandine's feedback
2016-01-21 00:16:10 +00:00
35c141cda9
reduce size of auxpanel when editing roomsettings
2016-01-20 23:09:36 +00:00
6f6db75ea1
improve banned users layout
2016-01-20 22:47:42 +00:00
41da05f36a
Merge pull request #102 from matrix-org/matthew/roompreview
...
Try to support non-guest room peek.
2016-01-20 22:30:10 +00:00
c0aa15aa09
now with gemini
2016-01-20 22:11:58 +00:00
3aaf934c97
implement the correct design for memberlist, modulo gemini
2016-01-20 22:04:49 +00:00
161cdef36e
tint bottom borders
2016-01-20 17:24:09 +00:00
548dac2ad9
Use new unread count methods
2016-01-20 17:19:52 +00:00
964e7c3739
fix user_levels some more
2016-01-20 17:15:01 +00:00
705730d450
fix user_levels
2016-01-20 17:12:55 +00:00
442e090f37
button layout
2016-01-20 17:09:46 +00:00
76b7788ba6
usersettings rhs button
2016-01-20 17:07:00 +00:00
c64f08dcc3
fix missing aliases
2016-01-20 16:53:46 +00:00
76279e2940
fix roomsettings a bit
2016-01-20 16:39:26 +00:00
0052fbd6cb
Don't spam the same RR at the server until it acks it.
2016-01-20 16:39:25 +00:00
14c2d945d6
oops, use right class
2016-01-20 15:58:17 +00:00
83634bf930
Update for new unread count format
2016-01-20 15:56:11 +00:00
dbcbd2aad8
fix badge layout
2016-01-20 15:52:34 +00:00
5c105a50e2
Merge branch 'matthew/roompreview' of https://github.com/matrix-org/matrix-react-sdk into matthew/roompreview
2016-01-20 15:49:02 +00:00
4d2608017b
fix CSS for ChangeAvatar placeholder
2016-01-20 15:39:56 +00:00
b296d05b35
Fix finally NPE
2016-01-20 15:38:34 +00:00
8dc21ec837
Fix race condition when joining rooms
...
Problem: Hitting join on a room invite would show spinner, then join room screen
then the messages.
Cause: The UI to show a spinner is set via the "joining" flag. This flag was
only set for the duration of the /join HTTP request. This is insufficient
because it races with actual room info arriving from /sync. If this info does
not arrive before the /join HTTP request returns, "joining" is false but the
current membership state of the user is still invite.
Fix: The "joining" flag is still set when the /join HTTP request is made, but
it is only turned off when the join event arrives from /sync.
Extras: This fix should also work when joining a room not from an invite.
2016-01-20 15:25:40 +00:00
edb67b778d
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:42:04 +00:00
fee7ee5dcc
Load the user list eventually if we have no Room object
2016-01-20 14:41:48 +00:00
a0aaae49dd
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:27:25 +00:00
c3c7c90de0
Merge pull request #103 from matrix-org/kegan/invite-search
...
Add global search with ability to invite from said list
2016-01-20 14:26:17 +00:00
60a084bdbd
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:22:09 +00:00
391c653d24
Lazy-load the user list to improve perf
...
Still slow when typing due to adding 1000 tiles to the DOM, but it is at least
a lot better than before (which would stutter on ANY change to the member list)
2016-01-20 14:14:04 +00:00
91c224aaf4
Review comments: Remove stuff which shouldn't have been there
2016-01-20 13:41:03 +00:00
6d19ce09ab
Merge pull request #105 from matrix-org/dbkr/add_email_address
...
Implement adding email addresses to your profile.
2016-01-19 17:20:35 +00:00
c4d4e9c46e
Terminate promise chain
2016-01-19 17:20:23 +00:00
bdfd09d893
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-19 17:10:54 +00:00
e4e3393232
Temporarily comment out address book until perf can be looked at given other PRs now depend on this PR
2016-01-19 17:09:36 +00:00
4ed130ceac
Implement adding email addresses to your profile.
2016-01-19 16:36:54 +00:00
84608ba156
Fix syntax error
2016-01-19 16:18:08 +00:00
3e4c5d7fa3
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-19 16:08:14 +00:00
db7d863ce4
set autoPeekDone on finally
2016-01-19 15:18:16 +00:00
33bd6e2028
Merge pull request #104 from matrix-org/dbkr/dedup_client_secret
...
Remove generateClientSecret and use the one the js sdk gives us.
2016-01-19 14:57:29 +00:00
d2708cf4d4
Filter the membership list in addition to the search area for the input text
2016-01-19 14:51:26 +00:00
2274cb3f7f
fix invite prompt
2016-01-18 20:18:46 +00:00
c29ec28dfd
fix layout for blunt join msgs
2016-01-18 20:15:12 +00:00
David Baker