ae7b2d54bb
Merge branch 'develop' into kegan/guest-access
2016-01-05 11:39:36 +00:00
a6e735dbde
Merge pull request #76 from matrix-org/kegan/bugfix-read-receipt
...
Null guard getMember
Fixes https://github.com/vector-im/vector-web/issues/566
2016-01-05 11:26:04 +00:00
2b169b06f5
Make ScrollPanel.isAtBottom more reliable
...
Given we want to use isAtBottom to figure out whether to show 'unread messages'
counts, we ought to return the current scroll state, rather than the saved one.
This fixes vector-im/vector-web#576
2016-01-05 11:02:18 +00:00
722c7033bc
Merge pull request #73 from matrix-org/rav/on_highlight_click
...
Expose onHighlightClick on the event tiles
2016-01-04 15:23:45 +00:00
75ad96c8ba
Null guard getMember
2016-01-04 10:11:42 +00:00
441a9540ca
sync CSS classnames with current react component names
2016-01-03 00:11:11 +00:00
424540e57a
fix NPE if messagePanel isn't yet defined
2015-12-28 02:40:17 +00:00
50ac0ab4cf
wire up RoomAlias's homeserver as intended
2015-12-28 02:36:28 +00:00
bd498b47b3
fix 'this' scoping bug that could never have worked...
2015-12-28 02:36:18 +00:00
b0adb1945f
Expose onHighlightClick on the event tiles
2015-12-24 13:51:14 +00:00
5d490841bc
Review comments
2015-12-24 10:50:47 +00:00
5286ec170f
Wrangle CSS to get avatar in right place
2015-12-24 09:20:16 +00:00
05d1d7c82d
Better error message for failing to set avatars with no connection
2015-12-23 17:30:25 +00:00
abb170ebde
Keep one source of truth (the Notifier) when toggling notification state. Fixes notifications.
2015-12-23 17:06:30 +00:00
a279dce027
Get avatar display and uploads working
2015-12-23 16:52:59 +00:00
19bd39b066
More random tweaks
...
- Make onBlur reset the EditText to show that it hasn't submitted it.
- Add the user ID of the logged in user to Advanced.
- Remove remnants of the Save/Cancel buttons.
2015-12-23 16:02:18 +00:00
72b8cf1be2
Refactor ChangePassword to get it working. Add 'Account' section because trying to make ChangePassword divs part of the same table as the display name is nigh impossible. Feels okay though
2015-12-23 15:38:28 +00:00
6295cf2ec9
Merge branch 'develop' into matthew/settings
2015-12-23 14:19:42 +00:00
e657b40a7e
Use ChangeDisplayName for implict display name saving on enter
2015-12-23 14:14:25 +00:00
1af5018597
General code cleanup / tweaks / fixes
...
- Swap Phases enum to be using string literals
- Swap roomId prop on UserSettings for a more sane onUserSettingsClose and
make MatrixChat responsible for swapping the room.
- s/then/done/ when terminating Promise chains to avoid subtle errors.
- Rejig render() of UserSettings so we don't need to indent quite so much.
2015-12-23 11:47:56 +00:00
810e8993d6
Merge branch 'develop' into kegan/tab-complete
2015-12-22 17:44:04 +00:00
452c265e6a
Implement automatically entering tab complete mode after a short delay
...
This seems to work. Manually tested for sanity.
2015-12-22 16:49:58 +00:00
460f68caef
Move RoomMember[] -> MemberEntry[] conversion somewhere sensible
...
This is required for automatically entering tab-complete mode because
onKeyDown is NOT called in that case, so we need to make sure to have a
membership list hanging around.
2015-12-22 15:38:23 +00:00
cdd539c3cd
Factor out a separate 'ScrollPanel'
...
Create an intelligent scrolling list, which doesn't care what it contains, to
try and clean up some of the logic in RoomView.
2015-12-22 15:18:50 +00:00
a20cabb06f
Merge branch 'develop' into kegan/tab-complete
2015-12-22 15:16:39 +00:00
e541ddb060
Auto-complete clicked suggestions
2015-12-22 11:14:36 +00:00
cc90f4c0c6
Merge pull request #64 from matrix-org/rav/fix_date_separator
...
Fix bug with date separator flashing up on scrollback
2015-12-22 11:05:26 +00:00
360806a8f1
RoomView: add whitespace for disambiguation
2015-12-22 11:04:39 +00:00
6b07de05f3
Merge pull request #65 from matrix-org/rav/marker_at_top_of_search_results
...
Add a 'top-of-search' marker
2015-12-22 11:00:00 +00:00
0dbb8d5294
Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic
2015-12-22 10:00:30 +00:00
ea2405ab3a
escape double-slash commands
2015-12-22 00:57:57 +00:00
618978d955
add appropriate CSS for the TabCompleteBar
2015-12-22 00:47:04 +00:00
c8aaee46d7
Mark a TODO for timeout handling
2015-12-21 17:58:36 +00:00
ba63b5dfff
Add image URLs to TabComplete.Entry objects
2015-12-21 17:28:04 +00:00
4e79c3c4c8
Add allowLooping opt for tab completion. Make peeking work.
2015-12-21 17:16:49 +00:00
41d4c1d14e
Add TabComplete.Entry so we can render images AND text(!) - Add peek() option, all broken.
2015-12-21 14:34:25 +00:00
400b5196bb
Add TabCompleteBar. Hook up display to whether we are currently tab completing.
2015-12-21 14:11:34 +00:00
7c285f9ad0
Add a 'No results' marker when there are no search results at all.
...
Also reword the 'no more results' marker.
2015-12-21 13:46:27 +00:00
b9ba4475b8
Merge branch 'develop' into matthew/settings
2015-12-21 13:09:33 +00:00
765e5bdeb1
Add a 'top-of-search' marker
...
Ugly as hell, pending better suggestions.
This fixes https://github.com/vector-im/vector-web/issues/547
2015-12-21 12:39:10 +00:00
26dc3cc553
Push up instantiation of TabComplete to RoomView
...
RoomView is the parent component which creates MessageComposer AND the status
bar. By making RoomView instantiate TabComplete we can scope instances
correctly rather than relying on singleton behaviour through dispatches. This
also makes communication between status bar and the MessageComposer infinitely
easier since they are now sharing the same TabComplete object.
2015-12-21 10:59:10 +00:00
afadb23f89
Fix bug with date separator flashing up on scrollback
...
Refactor the event-tile generation loop to go forwards rather than backwards,
which makes it easier to figure out whether we are displaying a continuation of
the previous event, and whether we need a date separator.
Also only display the date separator at the top of the room if there's no more
scrollback to be shown.
This fixes vector-im/vector-web#431
2015-12-21 10:49:00 +00:00
c6d02b2c26
Move tab-complete logic out from MessageComposer
...
Moved to a `TabComplete` class. Make it more generic (list of strings rather
than RoomMembers) and sort the member list by last_active_ago. Everything still
seems to work.
2015-12-21 10:38:37 +00:00
ff6d9454fd
Merge pull request #63 from matrix-org/rav/paginate_search
...
Pagination for search results
2015-12-21 09:16:42 +00:00
d1baf5854c
Only display the MessageComposer if you're joined and not viewing search results
2015-12-18 17:23:46 +00:00
fa99c1fc59
make it clear result count is approx
2015-12-18 17:18:08 +00:00
f0ff62166b
Remove bottommost prop - can't DND on the bottom list anymore
2015-12-18 17:13:26 +00:00
a2872deb53
Merge branch 'develop' into kegan/archived-rooms
2015-12-18 16:59:25 +00:00
461e3f46dc
Show an ErrorDialog when failing to forget a room
2015-12-18 16:56:37 +00:00
44c42394ae
Fix scroll for search results
...
Make sure that we save scroll position when searching, and use it to preserve
offset when backfilling.
2015-12-18 16:42:46 +00:00
Kegan Dougal