OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
832 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

832 Commits (9bbb9f7b298c0532111fd25d4196cf8bb6ed00a7)

Author SHA1 Message Date
Matthew Hodgson 9bbb9f7b29 pretty invites! 2016-01-21 00:45:22 +00:00
Matthew Hodgson eab0ca8716 fix bottom margin on FF 2016-01-21 00:39:10 +00:00
Matthew Hodgson 4d549304b6 Fix autoshow 2016-01-21 00:26:44 +00:00
Matthew Hodgson 9ce4148925 go splitscreen at the first sign of an invite search 2016-01-21 00:25:47 +00:00
Matthew Hodgson deca90d0a7 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:10 +00:00
Matthew Hodgson 35c141cda9 reduce size of auxpanel when editing roomsettings 2016-01-20 23:09:36 +00:00
Matthew Hodgson 6f6db75ea1 improve banned users layout 2016-01-20 22:47:42 +00:00
Matthew Hodgson 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
Matthew Hodgson c0aa15aa09 now with gemini 2016-01-20 22:11:58 +00:00
Matthew Hodgson 3aaf934c97 implement the correct design for memberlist, modulo gemini 2016-01-20 22:04:49 +00:00
Matthew Hodgson 161cdef36e tint bottom borders 2016-01-20 17:24:09 +00:00
Matthew Hodgson 964e7c3739 fix user_levels some more 2016-01-20 17:15:01 +00:00
Matthew Hodgson 705730d450 fix user_levels 2016-01-20 17:12:55 +00:00
Matthew Hodgson 442e090f37 button layout 2016-01-20 17:09:46 +00:00
Matthew Hodgson 76b7788ba6 usersettings rhs button 2016-01-20 17:07:00 +00:00
Matthew Hodgson c64f08dcc3 fix missing aliases 2016-01-20 16:53:46 +00:00
Matthew Hodgson 76279e2940 fix roomsettings a bit 2016-01-20 16:39:26 +00:00
Matthew Hodgson 14c2d945d6 oops, use right class 2016-01-20 15:58:17 +00:00
Matthew Hodgson dbcbd2aad8 fix badge layout 2016-01-20 15:52:34 +00:00
Matthew Hodgson 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
Matthew Hodgson 4d2608017b fix CSS for ChangeAvatar placeholder 2016-01-20 15:39:56 +00:00
Kegan Dougal b296d05b35 Fix finally NPE 2016-01-20 15:38:34 +00:00
Kegan Dougal 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
Kegan Dougal edb67b778d Merge branch 'develop' into matthew/roompreview 2016-01-20 14:42:04 +00:00
Kegan Dougal fee7ee5dcc Load the user list eventually if we have no Room object 2016-01-20 14:41:48 +00:00
Kegan Dougal a0aaae49dd Merge branch 'develop' into matthew/roompreview 2016-01-20 14:27:25 +00:00
Kegsay 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
Matthew Hodgson 60a084bdbd Merge branch 'develop' into matthew/roompreview 2016-01-20 14:22:09 +00:00
Kegan Dougal 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
Kegan Dougal 91c224aaf4 Review comments: Remove stuff which shouldn't have been there 2016-01-20 13:41:03 +00:00
David Baker 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
David Baker c4d4e9c46e Terminate promise chain 2016-01-19 17:20:23 +00:00
Kegan Dougal bdfd09d893 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-19 17:10:54 +00:00
Kegan Dougal 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
David Baker 4ed130ceac Implement adding email addresses to your profile. 2016-01-19 16:36:54 +00:00
Kegan Dougal 84608ba156 Fix syntax error 2016-01-19 16:18:08 +00:00
Kegan Dougal 3e4c5d7fa3 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-19 16:08:14 +00:00
Matthew Hodgson db7d863ce4 set autoPeekDone on finally 2016-01-19 15:18:16 +00:00
Kegsay 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
Kegan Dougal d2708cf4d4 Filter the membership list in addition to the search area for the input text 2016-01-19 14:51:26 +00:00
Matthew Hodgson 2274cb3f7f fix invite prompt 2016-01-18 20:18:46 +00:00
Matthew Hodgson c29ec28dfd fix layout for blunt join msgs 2016-01-18 20:15:12 +00:00
Matthew Hodgson f22519f10c factor out the peek rule calculation so that we can do it both onNewRoom and if there's a room already. I guess we could do it in react's onStateUpdate too 2016-01-18 20:05:33 +00:00
Matthew Hodgson eb7144ef85 improve layout 2016-01-18 19:56:56 +00:00
Matthew Hodgson 0a79b0f9e2 fix NPE from kegan's memberlist branch 2016-01-18 19:56:47 +00:00
Matthew Hodgson 7b91d3c5f8 wording changes from Amandine to settings 2016-01-18 19:56:38 +00:00
Matthew Hodgson 765174a600 merge conflict 2016-01-18 19:56:35 +00:00
David Baker e68972fb1a Remove generateClientSecret and use the one the js sdk gives us. 2016-01-18 17:50:27 +00:00
Matthew Hodgson 491ba94230 WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted. 2016-01-18 17:39:23 +00:00
Kegan Dougal a8643ff039 Move power level stuff to EntityTile for now 2016-01-18 17:37:17 +00:00