576de32ce4
show vaguely accurate default avatar
2016-02-15 22:01:22 +02:00
dfbc88d421
fix keyboard shortcuts on logout prompt
2016-02-15 22:01:05 +02:00
0d153df417
improve registration fail error msg slightly
2016-02-15 21:58:37 +02:00
014acbab1f
restore drag & drop file upload, broken by @richvdh's new timeline stuff
2016-02-15 21:16:04 +02:00
b1a6575b1d
remove ugly join & reject error msgs in favour of modal dialogs
2016-02-15 20:59:44 +02:00
30e9c76089
login as guest button on the login page
2016-02-15 20:44:13 +02:00
e17d77778f
sanitize setting displayname prompt
2016-02-15 19:37:03 +02:00
b766055f2f
Merge branch 'develop' into rav/roomview_works
2016-02-15 17:24:15 +00:00
0c7573629a
spell out that you can invite email addresses
2016-02-15 11:13:37 +02:00
0a37f1c478
improve the fix for https://github.com/vector-im/vector-web/issues/917
2016-02-15 09:52:57 +02:00
9d3b0f6075
fix https://github.com/vector-im/vector-web/issues/913
2016-02-15 00:37:59 +02:00
5e5fdb9b96
fix vector-im/vector-web#921
2016-02-14 13:38:12 +02:00
0e0d0cf4f5
post-review tweaks
2016-02-11 15:38:13 +00:00
f2377fa9fe
Factor out a TimelinePanel from RoomView
2016-02-10 18:41:48 +00:00
c3692378fa
Factor a stateless messagepanel out from RoomView
2016-02-10 18:41:47 +00:00
f016a327b1
Merge pull request #152 from matrix-org/dbkr/fix_room_settings_guest_exception
...
Don't try to fetch push rules if we're a guest: it throws.
2016-02-10 12:34:08 +00:00
1e945cd13b
Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it).
2016-02-10 11:48:35 +00:00
038f613079
Don;t try to fetch push rules if we're a guest: it throws.
2016-02-10 11:16:36 +00:00
0d2b042c0f
Merge pull request #148 from matrix-org/rav/keep_scrolling
...
Don't stop scrolling at the read-up-to mark.
2016-02-10 10:20:03 +00:00
bd73c4e0cc
Merge pull request #151 from matrix-org/dbkr/spinner_while_joining
...
Joining a room can take a while. Show a spinner…
2016-02-09 17:45:09 +00:00
af0597e0c8
Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city.
2016-02-09 16:55:03 +00:00
b4a7124686
Add a null check here since room can be null and this was throwing
2016-02-09 16:48:12 +00:00
f48f28eefe
Kill another scrollToToken
...
Missed a place where we were scrolling the messagepanel manually
2016-02-09 15:50:09 +00:00
576b59be66
Kill off the remains of auto_peek
...
Remove some dead code.
2016-02-09 15:45:41 +00:00
178e99385a
Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling
2016-02-09 14:52:38 +00:00
30b4b91cf3
Show jump-to-bottom icon even when there is other stuff in the status bar
...
Also includes a general simplification of the classes being used in the status
bar.
This should fix vector-im/vector-web#879 . Obviously it needs corresponding
changes in the CSS in vector-web.
2016-02-09 14:45:30 +00:00
7fd56351a9
Fix 'unread messages' in status
...
This got broken in the previous commit
2016-02-09 12:40:11 +00:00
194110dd71
Merge pull request #147 from matrix-org/rav/factor_out_statusbar
...
Factor the statusbar implementation out of RoomView.
2016-02-09 11:38:40 +00:00
81e95ca8c1
Wire up jump-to-bottom knob
...
... which I embarassingly forgot
2016-02-09 11:36:57 +00:00
8641dab756
Don't stop scrolling at the read-up-to mark.
...
We want to keep things scrolling up after the read-up-to mark hits the middle
of the screen. Do this by giving the ScrollPanel a stickyBottom (provided we're
not in old history) instead of updating the scroll position when RRs arrive.
Also, when we switch back to a room, if there was no special scroll state, jump
to the end of the timeline instead of the RR mark.
2016-02-09 11:08:26 +00:00
da81d240e2
Merge pull request #146 from matrix-org/kegan/warning-bars-dom
...
Use constant div nesting when warning bars appear
2016-02-09 11:03:31 +00:00
1d9c88698f
Factor the statusbar implementation out of RoomView
...
... because RoomView must die
2016-02-08 18:08:19 +00:00
ecaa2c1e11
Fix the mess of warning bars so it doesn't trigger remounts of alllll the components
2016-02-08 17:20:52 +00:00
3ca2bbe31e
Drop a redundant 'else' from RoomView.render, and outdent a load of code
...
... in the hope of aiding readability slightly
2016-02-08 16:43:08 +00:00
a2e50eb496
Merge pull request #143 from matrix-org/dbkr/fix_display_name_prompt_when_peeking
...
Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined.
2016-02-08 16:03:37 +00:00
9bf8f37e5f
explicitly check join status as it's clearer
2016-02-08 16:03:04 +00:00
2027ed9f49
Fix bug where clicking on the email tile didn't work
2016-02-08 15:21:23 +00:00
70ed0be389
Merge branch 'develop' into kegan/invite-autocompleting-race
2016-02-08 15:06:13 +00:00
3fa23798ea
Split out invite memberlist logic into its own component
2016-02-08 15:05:35 +00:00
baba500150
Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined.
...
Fixes https://github.com/vector-im/vector-web/issues/885
2016-02-08 14:33:10 +00:00
05f1e1e205
Merge pull request #140 from matrix-org/dbkr/fix_tab_complete
...
Fix tab complete
2016-02-08 14:19:06 +00:00
7ccce1dc91
Reset truncation when the text box is cleared
2016-02-05 16:58:37 +00:00
5dafe1f4a6
Fix canonical alias bug showing the first alias if one was not set.
...
<select> rests on the first value if the defaultValue is null. This first value
should've been 'not set'.
2016-02-05 16:22:24 +00:00
ac67cd556a
Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list
...
Fix vector-im/vector-web#851 by truncating the search results
2016-02-05 15:56:23 +00:00
4ce41f7f6c
Merge pull request #141 from matrix-org/kegan/room-settings-refactor
...
Refactor room settings
2016-02-05 15:50:39 +00:00
b99c6b9a97
camelCasePlease
2016-02-05 15:48:04 +00:00
a0c5b30fd6
Fix vector-im/vector-web#851 by truncating the search results
2016-02-05 15:24:51 +00:00
03f19eba55
Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits.
2016-02-05 14:38:28 +00:00
500c12b1f2
Fix tab complete
...
rate limited functions can't have arguments, so don't pass the room into
_updateTabCompleteList as it's always the room in our state.
2016-02-05 14:32:30 +00:00
0cbf9dba87
Glue more things back together
2016-02-05 11:59:19 +00:00
78354d0bc7
Yank out color settings from RoomSettings to ColorSettings
2016-02-05 11:27:11 +00:00
9525808cd0
Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers
...
Unregister some event handlers we'd registered but never unregister.
2016-02-05 10:48:22 +00:00
0ae548cf5d
Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs
...
Make the function call-rate limiting a generic thing and use it in more places.
2016-02-05 10:15:55 +00:00
63776509a6
Make the function call-rate limiting a generic thing and use it in more places.
2016-02-04 18:06:24 +00:00
5ae532dae2
Merge pull request #138 from matrix-org/rav/update_rr_semantics
...
Tweaks to the semantics for sending RRs and handling room switches
2016-02-04 17:42:15 +01:00
d14c1a82b2
Tweaks to the semantics for sending RRs and handling room switches
...
* Only send read receipts when we are at the bottom of a room; this is a simple
and effective way of stopping the green bar of doom from jumping down the
room slightly behind the scroll.
* Jump to read-up-to mark when switching back to a room if we were following
the live timeline before.
2016-02-04 16:27:49 +00:00
74e16ac83e
Merge branch 'develop' into kegan/room-settings-refactor
2016-02-04 16:20:24 +00:00
73df5a2828
Modify how checked state is passed around
...
Prefer onChange -> setState to ref grabbing so we can expose public setters
and not be tied down to certain element implementations.
2016-02-04 16:18:59 +00:00
c0d93a78bc
Unregister some event handlers we'd registered but never unregister.
2016-02-04 15:55:24 +00:00
75ff4f0f95
Merge pull request #135 from matrix-org/kegan/sync-limit
...
Set the sync limit back to sane levels
2016-02-04 15:47:31 +00:00
d1467d2319
Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join
...
Prompt for display name before joining your first room
2016-02-04 15:32:52 +00:00
4013dae770
Start refactoring RoomSettings
...
- Don't manipulate settings in RoomView. Make it RoomSettings' job.
- Return Promise[] from AliasSettings.save() rather than an allSettled promise
so callers can have more granularity over what to do with it (.all vs .allSettled)
- General refactoring of RoomSettings. Most things are broken now and are not
submitted. Add util methods to grab values out of events.
2016-02-04 15:26:12 +00:00
167da10b8b
address PR comments
2016-02-04 15:07:30 +00:00
6e424780f1
typo
2016-02-04 14:38:05 +00:00
d0c8dadaf6
Merge pull request #134 from matrix-org/dbkr/fix_preview_bar
...
Put the room preview bar back for rooms that aren't peekable
2016-02-04 14:10:18 +00:00
309f1e2c8f
Merge pull request #131 from matrix-org/rav/search_clickthrough
...
Enable clicking on search results to switch to the result in context.
2016-02-04 15:06:39 +01:00
63b50ed230
Merge pull request #132 from matrix-org/rav/fix_404_on_echo
...
Don't try to use local echoes as scroll tokens
2016-02-04 15:05:35 +01:00
8f5c739886
Clean up scrollToken assignment
2016-02-04 14:05:16 +00:00
f3fa5d6a2a
Set the sync limit back to sane levels
2016-02-04 13:30:25 +00:00
b0da54533d
Don't do this check - it's not valid since we set the room in onRoomName
2016-02-04 13:25:45 +00:00
891f4761a0
Add comments and only set a room / init the timeline if we don't already have a room
2016-02-04 13:21:42 +00:00
6c9d48bd3a
Merge pull request #128 from matrix-org/kegan/alias-settings
...
Split out alias settings into its own component: AliasSettings
2016-02-04 13:14:19 +00:00
574560cc05
remove listener on unmount
2016-02-04 13:06:59 +00:00
47fef0896f
Prompt for display name before joining your first room (if you haven't set one).
...
Fixes https://github.com/vector-im/vector-web/issues/758
2016-02-04 11:49:10 +00:00
3c2c2b051b
Listen for Room and use this to init the timeline, not Room.name
2016-02-04 11:29:00 +00:00
c9a3ad31ab
Comment error handling
2016-02-04 11:17:39 +00:00
5c430395ea
init timeline when we get the room, as otherwise we never load it after joining
2016-02-04 10:50:21 +00:00
164c9b9031
Check error to see if it's actually a failure to peek
2016-02-03 16:53:48 +00:00
8b96af4ccb
Display the version in UserSettings. Change MatrixChat.onNewVersion to onVersion
2016-02-03 16:51:53 +00:00
cebc2f5306
Put the room preview bar back for rooms that aren't peekable (since we always tried to peek, it would fail which would reject the promise and cause loadingTimeline to stay true forever).
2016-02-03 16:23:57 +00:00
7bdd9f57a5
Add MatrixChat.onNewVersion to trigger the new version bar
2016-02-03 16:16:52 +00:00
d7576d223d
Don't try to use local echoes as scroll tokens
...
Local echoes don't have a (usable) event id, so don't use them when remembering
the scroll state of a room.
2016-02-03 15:34:20 +00:00
11df2fc285
Merge remote-tracking branch 'origin/develop' into dbkr/no_auto_join
2016-02-03 15:18:18 +00:00
e747beac58
Enable clicking on search results to switch to the result in context.
2016-02-03 15:06:52 +00:00
e01d61dfeb
Merge branch 'rav/timeline_window' into rav/link_to_event
...
Conflicts:
src/components/structures/MatrixChat.js
src/components/structures/ScrollPanel.js
2016-02-03 14:12:28 +00:00
2479c81cf6
Merge remote-tracking branch 'origin/develop' into rav/timeline_window
2016-02-03 14:09:50 +00:00
c82b364ca8
Address review comments
...
Mostly renaming things and adding comments.
2016-02-03 08:03:10 +00:00
3b1ed3a014
Fix react warnings when a RR animation is happening during room switch
...
If the animation of an RR removal is active when we change room, we end up
getting a callback after the RoomView has been unmounted. Guard against this to
avoid getting React warnings.
2016-02-02 17:59:11 +00:00
b0f0d5f6d0
Null check room because those events will be emitted before the room is stored.
2016-02-02 16:34:41 +00:00
20f77d1224
Merge pull request #125 from matrix-org/kegan/trailing-slash
...
Strip trailing slashes on HS/IS URLs on register/login
2016-02-02 16:04:19 +00:00
1cabe2ec37
Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join)
2016-02-02 15:50:15 +00:00
4e4e5be9a1
Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818 .
2016-02-02 14:14:18 +00:00
ce789ba962
Split out alias settings into its own component: AliasSettings
2016-02-02 12:46:14 +00:00
c187eda832
Don't assert that we're not logged in before starting registration because uprading is now a thing.
2016-02-01 16:53:39 +00:00
d9e13780b8
Implement direct-to-event linking.
...
This adds support for links to particular event ids: add /<eventId> to the URL
for a room.
This commit also ensures that we scroll to the 'read marker' when switching to
a room which has no previous scroll state, as well as preventing that marker
from going past the middle of the screen.
This also reinstates the preservation of scroll state when switching rooms,
which was disabled previously.
2016-02-01 16:31:12 +00:00
e6c93530e2
Strip trailing slashes on HS/IS URLs on register/login
2016-02-01 14:19:20 +00:00
f0cf5c0aff
Update onRoomTimeline comment
2016-02-01 12:35:41 +00:00
2c04b9cb5b
Merge pull request #124 from ajohnson23/messages_scrolldown_fix
...
Fix improper scrolldown button display issue.
2016-02-01 11:38:14 +01:00
fe9d7d10b9
Fix improper scrolldown button display issue.
...
This fixes an intermittent issue where the scrolldown button
or "new messages below" button would display even when the messages
panel was scrolled to the very bottom. Furthermore, when new messages
arrived, the messages panel would not automatically scroll down to show
the new messages.
Fixes https://github.com/vector-im/vector-web/issues/805
2016-01-29 22:32:32 -05:00
7301f53807
Merge pull request #121 from matrix-org/dbkr/fix_registration_guest_access
...
Fix registration: don't auto-log in as a guest if we have a URL from …
2016-01-28 16:21:16 +00:00
6bb69ef2d1
Merge pull request #120 from matrix-org/kegan/bulk-email-invite
...
Support bulk invitations via text separators
2016-01-28 16:21:05 +00:00
401d18bcc6
Fix registration: don't auto-log in as a guest if we have a URL from sydent.
2016-01-28 15:42:14 +00:00
640e87e7c5
Merge pull request #117 from matrix-org/dbkr/guest_warning_bar
...
Add warning bar for guest users.
2016-01-28 13:44:06 +00:00
83119d21d6
New style guest warning bar
2016-01-28 12:59:51 +00:00
12463aec4d
Merge pull request #115 from matrix-org/kegan/fix-3pid-signup
...
Redirect to the registration page when landing with ?email=
2016-01-28 12:00:06 +00:00
bdc1028a7e
Support bulk invitations via text separators
...
Valid separators are , ; <space>
2016-01-28 11:56:20 +00:00
796a2e5e3a
Revert e5f4fa8c46 as it's no longer what's desired.
2016-01-28 11:15:43 +00:00
a4f4bb9e72
Convert RoomView to using a TimelineWindow
...
Instead of using the Room's active timeline directly, use a
TimelineWindow. This shouldn't (yet) have much effect, beyond maybe making
scrollback after a gappy sync slightly more efficient.
For now, I have disabled the 'restoreScrollState' functionality. This will be
reinstated once I land the link-to-event code.
2016-01-28 10:53:43 +00:00
81cc30bab2
Null guard because this may not exist in the DOM.
2016-01-28 10:52:08 +00:00
e017559765
New line
2016-01-28 09:58:51 +00:00
f745e941ec
Fix exception thrown if any custom tags are set
2016-01-28 09:41:46 +00:00
7ea45f9888
Move message count to suffix in title, as requested by @ara4n
2016-01-27 18:03:01 +00:00
e5f4fa8c46
Add warning bar for guest users. Fixes https://github.com/vector-im/vector-web/issues/770
2016-01-27 17:58:47 +00:00
4661bb0942
Don't show a spinner while we're waiting for the user to do something
2016-01-27 15:44:12 +00:00
8360c112fb
Put the favicon badge call in a try block, as per comment
2016-01-27 15:19:25 +00:00
db8fab8019
Redirect to the registration page when landing with ?email=
...
Fixes "Missing access token" error.
2016-01-27 10:47:54 +00:00
c1f28bb6b9
hide 'unknown screen' warning
2016-01-24 19:14:14 +00:00
6eea1f7f83
try for a simpler invite placeholder look & feel
2016-01-24 19:02:18 +00:00
872b9be17a
increase truncatelist size to match INITIAL_LOAD_NUM_MEMBERS
2016-01-24 18:24:26 +00:00
bc60435750
improve settings layout and fix FF bugs
2016-01-24 18:15:08 +00:00
3da76192a1
title attr
2016-01-24 02:01:45 +00:00
f15564074c
track whether we're scrolled to bottom or not and display UI for warning & jumping there if needed.
2016-01-24 01:51:01 +00:00
9a6f33861f
Merge pull request #112 from matrix-org/kegan/email-invite-tile
...
Add a tile to the invitee list which represents an email tile
2016-01-22 17:35:17 +00:00
437280020c
Turn off autocomplete for search list
2016-01-22 17:32:43 +00:00
e78c1fba87
Hide 'Email: ' is the first char is @
2016-01-22 17:28:23 +00:00
b19a318b2d
put a black badge on unread notifications, and a red one for unread highlights
2016-01-22 17:22:49 +00:00
c3f786cc5e
Add a tile to the invitee list which represents an email tile
2016-01-22 17:20:52 +00:00
4631648f26
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2016-01-22 17:01:28 +00:00
24225af416
work around history visibility roomsetting UI some more
2016-01-22 17:01:15 +00:00
2e154c7478
Merge pull request #110 from matrix-org/kegan/3pid-invite-refresh-mlist
...
Refresh the membership list on 3PID invites
2016-01-22 16:13:42 +00:00
99da0ef656
Fix vector-im/vector-web#694 - Empty invitee list
...
The invitee list is lazy-loaded 50ms after the first render. We were relying
on setState from the member lazy-load to also kick the invitee list. However,
setState is synchronous and we were loading the invitee list afterwards, which
meant that the SearchableEntityList wouldn't have any invitees until the next
render().
2016-01-22 16:11:09 +00:00
38d5c7d5c5
Filter out undefined/null children which won't render
2016-01-22 15:57:42 +00:00
1dd2cbed63
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2016-01-22 15:51:34 +00:00
0bef94a6ce
fudge around https://github.com/vector-im/vector-web/issues/731
2016-01-22 15:51:27 +00:00
675e0f176f
Add onShowMoreRooms prop for kicking gemini
2016-01-22 15:46:38 +00:00
0bdd674f7f
fix invalid powerlevel setting
2016-01-22 15:29:57 +00:00
366a24bbe4
Refresh the membership list on 3PID invites
2016-01-22 15:11:36 +00:00
7ef1ba0b44
Unbreak RoomHeader
2016-01-22 11:48:26 +00:00
f213901e29
Return early when calculating one-to-one room avatars
...
Object.keys() is O(n) and is wasted because we only care if the keys are 1 or 2.
Use `for .. in` instead and return early if there are >2 keys.
Profiling indicates this cuts wasted time from ~74ms to ~32ms for me (who has
a large number of rooms with large numbers of people in them).
2016-01-22 11:11:56 +00:00
a627ee7ef6
Fixed ternary operation
2016-01-22 08:54:40 +01:00
8ccc3f04c3
correct layout for truncated lists
2016-01-21 17:39:12 +00:00
b45e5e6eb5
Merge pull request #108 from matrix-org/kegan/member-list-perf
...
Add "and X more" overflow tile to joined member list
2016-01-21 16:15:12 +00:00
dfab32394d
Set truncation to 10 for now.
2016-01-21 16:03:32 +00:00
d72ab641d0
Expand the list when the overflow element is clicked
...
Negative truncateAt values means "do not truncate".
2016-01-21 15:57:59 +00:00
c5099a837b
doh - anyone can set their own tags...
2016-01-21 15:08:14 +00:00
eed83f982e
Add a suitable overflow tile for the member list
2016-01-21 11:41:28 +00:00
9f362e488c
Add a TruncatedList component, which truncates children passed to it.
2016-01-21 11:30:37 +00:00
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
Matthew Hodgson