29587ec347
No longer persist guest room IDs. Replace with transient peeked room ID.
2016-01-06 17:33:00 +00:00
afbb451d4a
Merge branch 'develop' into kegan/guest-access
2016-01-06 13:59:33 +00:00
49c1d39f93
Merge pull request #71 from matrix-org/rav/new_search_api
...
Use new searchRoomEvents and backPaginateRoomEventsSearch methods
2016-01-05 17:56:13 +00:00
d729dee31d
Make the settings page load for guests. Add checkboxes for guest r/w
2016-01-05 17:34:25 +00:00
a2b7c9ba96
RoomHeader: Make 'undefined' check more explicit
2016-01-05 15:57:58 +00:00
4730179c26
Fix slight mis-merge
...
We need to return 'true' from our promise of search result pagination.
Also inline _backPaginateSearch which mostly served to confuse, and use
debuglog instead of checking DEBUG_SCROLL
2016-01-05 15:51:16 +00:00
583d35e39f
Merge branch 'develop' into rav/new_search_api
...
Conflicts:
src/components/structures/RoomView.js
2016-01-05 15:38:30 +00:00
6c99fab3dd
Highlight the search term in search results
...
Sometimes we don't get the search term back in the highlights list, so make
sure we add it.
2016-01-05 15:28:32 +00:00
a9f7bf63ff
spell out we're doing 3PID invites
2016-01-05 14:24:36 +00:00
355cabb7ee
Merge pull request #70 from matrix-org/rav/scrollpanel_promises
...
Make ScrollPanel keep track of when fill requests are happening
2016-01-05 13:52:04 +00:00
8bd4fdbd5a
Don't set presence
2016-01-05 13:24:05 +00:00
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
7640dd52e3
Merge pull request #78 from matrix-org/rav/fix_unread_messages
...
Make ScrollPanel.isAtBottom more reliable
2016-01-05 11:18:40 +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
e177263d9f
Address review comments
...
Minor fixes post-review
2016-01-04 16:54:27 +00:00
b5eae891b4
Address review comments
...
Make onFillRequest always return a promise
2016-01-04 16:28:32 +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
89fcf019e1
Merge branch 'develop' into rav/scrollpanel_promises
...
Conflicts:
src/components/structures/RoomView.js
2016-01-04 12:56:39 +00:00
75ad96c8ba
Null guard getMember
2016-01-04 10:11:42 +00:00
640aa45956
fix comedy bug where dates in timestamps were spectacularly wrong
2016-01-03 00:40:05 +00:00
3fd5a3a19f
Merge pull request #75 from matrix-org/matthew/css-refactor
...
sync CSS classnames with current react component names
2016-01-03 00:15:07 +00:00
441a9540ca
sync CSS classnames with current react component names
2016-01-03 00:11:11 +00:00
15f19be408
highlight case insensitively
2015-12-28 03:14:50 +00:00
970bc84bb6
explicitly rejoin parted rooms
2015-12-28 02:58:40 +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
93e7f90ae4
ScrollPanel: implement forward-fill
2015-12-24 14:30:49 +00:00
f2a24521dc
Make ScrollPanel keep track of when fill requests are happening
...
The dance to avoid doing repeated fill requests on every update is common, so
add it to ScrollPanel. Let onFillRequest return a promise, which prevents any
updates until it completes.
2015-12-24 14:15:50 +00:00
b0adb1945f
Expose onHighlightClick on the event tiles
2015-12-24 13:51:14 +00:00
cc72f7ec24
Use new searchRoomEvents and backPaginateRoomEventsSearch methods
...
MatrixClient now exposes higher-level search APIs, so use them.
2015-12-24 13:33:58 +00:00
103b0a03b1
Hotfix for tab press bug
...
The bug was that *sometimes* typing in some letters then
pressing tab would flash red and not auto-complete. This was
happening because nextMatchedEntry was being called with 0
because the state of inPassiveMode was wrong.
2015-12-24 11:56:50 +00:00
b941904078
Merge pull request #33 from matrix-org/matthew/settings
...
WIP experiment of turning UserSettings controller into UserSettingsStore
2015-12-24 10:54:26 +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
32c1af54d8
Merge pull request #69 from matrix-org/rav/refactor_body_to_html
...
Refactor bodyToHtml, and allow onHighlightClicked
Factor out a Highlighter class to avoid passing round the static state
everywhere.
Add an optional 'opts' argument which can take an 'onHighlightClick' member.
2015-12-23 23:50:38 +00:00
b4436df5e4
Refactor bodyToHtml, and allow onHighlightClicked
...
Factor out a Highlighter class to avoid passing round the static state
everywhere.
Add an optional 'opts' argument which can take an 'onHighlightClick' member.
2015-12-23 23:50:35 +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
2a0faea838
Merge pull request #67 from matrix-org/kegan/tab-complete
...
Implement tab complete UX
2015-12-23 14:18:48 +00:00
fb151b35c8
Remove debug logging
2015-12-23 14:17:56 +00:00
e657b40a7e
Use ChangeDisplayName for implict display name saving on enter
2015-12-23 14:14:25 +00:00
82ff5c5e52
Factor out handleTabPress and remove passive flag onKeyDown
2015-12-23 13:48:44 +00:00
b80015c69c
More comments; remove redundant if statement
2015-12-23 13:33:44 +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
Kegan Dougal