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
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
eb7144ef85
improve layout
2016-01-18 19:56:56 +00:00
0a79b0f9e2
fix NPE from kegan's memberlist branch
2016-01-18 19:56:47 +00:00
7b91d3c5f8
wording changes from Amandine to settings
2016-01-18 19:56:38 +00:00
765174a600
merge conflict
2016-01-18 19:56:35 +00:00
e68972fb1a
Remove generateClientSecret and use the one the js sdk gives us.
2016-01-18 17:50:27 +00:00
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
a8643ff039
Move power level stuff to EntityTile for now
2016-01-18 17:37:17 +00:00
0465323ca6
Merge branch 'develop' into kegan/invite-search
2016-01-18 17:31:26 +00:00
f1042bd1c4
UI tweaks
2016-01-18 17:21:28 +00:00
36616a97a1
Add ability to click-to-invite
2016-01-18 17:12:35 +00:00
772470a0ee
Merge pull request #97 from matrix-org/push-rules-settings
...
Push rules settings
2016-01-18 18:02:34 +01:00
33edeccb43
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/component-index.js
# src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
165adde0c8
Use EntityTile for 3PID entities rather than munging MemberTile
2016-01-18 16:55:51 +00:00
c758c0f84f
Add invite button JSX
2016-01-18 16:47:31 +00:00
71009d81b6
Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile.
2016-01-18 15:19:49 +00:00
cc3d27bd4b
Merge pull request #98 from matrix-org/message_composer_arrows_keys
...
Fix history scrolling with multiline input
2016-01-18 14:25:57 +00:00
880ae0f3fa
Fix typo
2016-01-18 14:25:23 +00:00
0ac997491e
Clarify comment
2016-01-18 14:23:31 +00:00
795d782410
Merge pull request #100 from matrix-org/matthew/roomsettings2
...
Finish off RoomSettings (part 2)
2016-01-18 14:02:27 +00:00
51648b9bf0
merge develop
2016-01-18 14:02:19 +00:00
17fdfa0c8f
incorporate kegan PR feedback
2016-01-18 14:00:47 +00:00
9fae4d4ecd
Merge pull request #101 from matrix-org/matthew/memberlist
...
MemberInfo and MemberTile UI/UX fixups
2016-01-18 13:39:29 +00:00
aa412bed0f
reindent promises as per dave's PR feedback
2016-01-18 13:38:40 +00:00
d0eedb4faa
merge develop
2016-01-18 13:34:09 +00:00
fd99b260f4
Merge branch 'develop' into kegan/invite-search
2016-01-18 12:07:36 +00:00
2a64d0feb3
Merge branch 'develop' into matthew/roomsettings2
2016-01-18 10:49:45 +00:00
Matthew Hodgson