David Baker
3b5378fa53
Show canonical alias in URL bar
...
Use https://github.com/matrix-org/matrix-js-sdk/pull/140 to get the canonical alias, because that's a thing now.
2016-06-17 15:17:45 +01:00
Aviral Dasgupta
b9d7743e5a
Emoji provider, DDG working, style improvements
2016-06-17 04:58:09 +05:30
Aviral Dasgupta
769b3f0c2a
Merge branch 'develop' into feature-autocomplete
2016-06-17 00:37:39 +05:30
Richard van der Hoff
0cc4497ef0
Merge pull request #307 from matrix-org/dbkr/fix_peeking
...
Fix peeking and member list vanishing
2016-06-16 11:13:20 +01:00
Aviral Dasgupta
8b1332cd29
Use different keys for new MessageComposerInput
2016-06-16 14:46:09 +05:30
Aviral Dasgupta
3f1b57b35b
Fix cursor bug, persist editor mode & rte default
2016-06-15 00:13:34 +05:30
David Baker
5199cd04a2
Merge pull request #292 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:39 +01:00
Aviral Dasgupta
ba69e4365d
more RTE fixes
2016-06-14 19:28:51 +05:30
Aviral Dasgupta
8cb086ef31
use constants for keycodes in RTE
2016-06-14 19:14:09 +05:30
David Baker
40b1b99c38
underscore prefix internal method
2016-06-14 14:40:03 +01:00
David Baker
a95d8b5ed6
Move init logic into componentWillMount
...
to simplify getInitialState
2016-06-14 14:38:45 +01:00
David Baker
0ef5cc891e
Add currentRoomId / Alias to getInitialState
...
with docs
2016-06-14 14:10:49 +01:00
David Baker
b8eee08d69
Fix member list vanishing
...
Add a callback to RoomView that it can give the room ID to once it's resolved it, since this lookup is now the responsibility of the roomview and only the roomview. The view_room action now has either an alias or an ID, not both. Also fix RoomView to load the room properly and not try to peek when it shouldn't.
2016-06-14 12:56:37 +01:00
Richard van der Hoff
e973d18085
Hide e2e features if not enabled
...
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
David Baker
aaefdf19c5
Fix MatrixChat syntax fail
2016-06-14 11:57:07 +01:00
David Baker
11a38fce48
Fix peeking
...
Sorts out more of the room joining mess. currentRoom which held the room ID is now more appropriately called currentRoomId. RoomView will now take a roomID or alias as before but will now look up the room ID as required if given the alias. Also, now look up the alias every time you click on it so it's never stale, rather than looking in your current rooms for a room that thinks it has that ID.
2016-06-14 11:37:04 +01:00
Aviral Dasgupta
34be17cc7e
use rte labs setting
2016-06-14 00:10:43 +05:30
Aviral Dasgupta
74527a439c
Merge branch 'develop' into feature-rte
2016-06-13 23:57:10 +05:30
Aviral Dasgupta
5831a68e11
Labs improvements
2016-06-13 23:25:31 +05:30
Aviral Dasgupta
727e6daaae
Fix key attr placement in UserSettings
2016-06-13 22:11:21 +05:30
Aviral Dasgupta
c3a9658392
Add experimental "Labs" section to settings
2016-06-13 22:04:12 +05:30
Aviral Dasgupta
4bc8ec3e6d
room, user, ddg autocomplete providers (wip)
2016-06-12 17:02:46 +05:30
Aviral Dasgupta
0df201c483
Merge branch 'develop' into feature-autocomplete
2016-06-12 14:10:23 +05:30
Pedro Ferreira
8f45f168d5
Fix highlighting behaviour on switch
...
Hopefully made the code a little bit clearer.
2016-06-12 01:08:31 +02:00
Pedro Ferreira
a5a3e4e915
Basic Markdown highlighting
2016-06-12 01:07:16 +02:00
Aviral Dasgupta
c0d7629980
get /commands working again
2016-06-12 00:11:27 +05:30
Aviral Dasgupta
b960d220d2
cleanup, better comments, markdown hotkeys
2016-06-11 22:24:09 +05:30
Aviral Dasgupta
e4217c3fb7
rte improvements, markdown mode
2016-06-11 15:52:08 +05:30
David Baker
719928f389
Remove view_room_alias
...
As it was basically the same as view_room. Use view_room instead which will handle whether we pass an ID or an alias into RoomView
2016-06-10 15:12:42 +01:00
Aviral Dasgupta
bf8e56e04c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte
2016-06-10 04:43:44 +05:30
Aviral Dasgupta
4e0720db12
Fix MessageComposerInput.setLastTextEntry
2016-06-10 00:03:40 +05:30
Aviral Dasgupta
29cdd1fc41
user and room decorators, history & typing notifs
2016-06-09 23:53:09 +05:30
David Baker
b60ab9d695
Remove XXX now it's fixed (yay!)
2016-06-09 18:50:18 +01:00
David Baker
72b3ce200d
Make the room directory join rooms by alias
...
Also makes some improvement on the multiple code path mess for joining rooms
2016-06-09 18:49:06 +01:00
David Baker
049e3a968b
Merge pull request #303 from matrix-org/rav/factor_out_createroom
...
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
David Baker
888c0611e8
Merge pull request #302 from matrix-org/rav/guest_device_spinner
...
Fix spinner-of-doom in member info for guests
2016-06-09 11:03:40 +01:00
Richard van der Hoff
de36aa63fb
Factor out common parts of room creation
...
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
Richard van der Hoff
2352661513
MemberInfo: remove spinner if device query fails
...
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
2016-06-09 10:57:19 +01:00
David Baker
98ef793809
Default IS should be vector.im now
2016-06-09 10:56:14 +01:00
David Baker
bb405563c8
Fix default servers
2016-06-09 10:54:56 +01:00
Richard van der Hoff
ef764c112e
Merge pull request #300 from matrix-org/rav/device_verification
...
Support for marking devices as verified
2016-06-09 10:44:42 +01:00
David Baker
05404efa34
Remove if (this.props.config)
...
Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).
2016-06-09 09:53:37 +01:00
Richard van der Hoff
1dfb3f71ae
Merge branch 'develop' into rav/device_verification
2016-06-08 21:34:47 +01:00
Richard van der Hoff
85770feb31
device verification: use a js-sdk event
...
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
David Baker
c123f02842
Make the config optional
2016-06-08 18:45:46 +01:00
Richard van der Hoff
7ce49c752f
Wire up events to update UI on device verification
...
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
Richard van der Hoff
1616431d27
EventTile: add classes to indicate verifiedness
...
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
2016-06-08 17:02:42 +01:00
Richard van der Hoff
f3e66e6fd2
Add device info to member info
...
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00
Richard van der Hoff
086698cd11
Add device info to user settings
...
Requires e81ce23 from matrix-js-sdk
2016-06-08 17:02:42 +01:00
David Baker
7e8c8dd336
Remove SdkConfig
...
just take a config in MatrixChat, pass the individual things down through the chain.
This may become unwieldy: let's see how it goes.
2016-06-08 14:54:34 +01:00
David Baker
b54376aa2a
Add singleton object to hold SDK configuration
2016-06-07 21:49:06 +01:00
David Baker
aca0e060a4
Also change velocity-vector commit & requires
...
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
2016-06-07 20:47:37 +01:00
David Baker
943d7e18e1
Add _ to internal member
2016-06-07 19:55:24 +01:00
David Baker
d5a522fdfe
Second attempt at fixing the Velocity memory leak
...
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
2016-06-07 18:22:01 +01:00
David Baker
15dccd9871
Handle errors with scalar-oauthing
...
Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error).
2016-06-06 17:55:45 +01:00
David Baker
fdcebe1e56
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
2016-06-06 17:19:38 +01:00
Matthew Hodgson
f8b3128645
invite input box wording for amandine
2016-06-02 23:33:55 +01:00
Matthew Hodgson
1b3c8481f6
fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged
2016-06-02 21:07:47 +01:00
Matthew Hodgson
532e93d7cb
fix up trailing whitespace and put the buttons in the right order
2016-06-02 21:07:04 +01:00
Matthew Hodgson
e20a1acb88
label our versions sensibly
2016-06-02 19:22:11 +01:00
Matthew Hodgson
487f3c72dd
fix new 3pid invite UI
2016-06-02 16:59:44 +01:00
Matthew Hodgson
1d31463140
set email branding after registration
2016-06-02 13:14:52 +01:00
Matthew Hodgson
83fd02bdfa
specify a brand when registering accounts
2016-06-02 11:51:26 +01:00
Matthew Hodgson
3b34311e05
implement new UX for 3pid invites
2016-06-01 23:42:34 +01:00
Matthew Hodgson
0747ca3923
ignore @ prefixes when sorting memberlist
2016-06-01 14:00:20 +01:00
Aviral Dasgupta
b979a16199
initial version of autocomplete
2016-06-01 16:54:21 +05:30
Matthew Hodgson
272afe39dc
do not list rooms by default
2016-06-01 02:03:53 +01:00
Matthew Hodgson
c3fc76cdaa
warn guests to register nicely to upload files
2016-05-31 23:59:36 +01:00
Matthew Hodgson
e1ba7df66e
fix the Add button for email addies
2016-05-31 23:50:53 +01:00
Matthew Hodgson
2662ca36f9
fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?!
2016-05-31 23:50:47 +01:00
Matthew Hodgson
b74d690035
Merge pull request #290 from matrix-org/matthew/multipreview
...
multiple URL preview support
2016-05-31 19:42:21 +01:00
Matthew Hodgson
b3638f9169
PR review
2016-05-31 19:42:00 +01:00
Aviral Dasgupta
96526c22c5
Merge branch 'develop' into feature-rte
2016-05-29 20:50:33 +05:30
Aviral Dasgupta
fe76eb9f73
minor improvements
...
- use <p> for unstyled blocks
- fix return key bug
- editor placeholder
2016-05-28 12:02:35 +05:30
David Baker
118eec8cc0
Add a fallback home server to log into
...
If login fail with a credential error on the default HS, try
logging in on the fallback one.
2016-05-27 14:57:43 +01:00
Matthew Hodgson
d5e6e961fd
fix url previews firing incorrectly on Matrix.org
2016-05-27 10:09:17 +01:00
Aviral Dasgupta
001011df27
Initial version of rich text editor
2016-05-27 10:15:55 +05:30
Matthew Hodgson
39a3d6fdd4
multiple URL preview support
2016-05-24 00:54:20 +01:00
Matthew Hodgson
5835948a3d
ignore @ prefixes when sorting memberlist
2016-05-19 23:00:28 +01:00
Matthew Hodgson
c38c57df1e
put integrations manager into a modal
2016-05-19 14:12:08 +01:00
Matthew Hodgson
817a3debec
debug HS & IS
2016-05-18 11:42:51 +01:00
Matthew Hodgson
1459478ee0
use right check for end of timeline
...
and avoid bad interactions with forward pagination. thanks @richvdh
2016-05-17 21:32:20 +01:00
Matthew Hodgson
be5f29d03b
Merge branch 'develop' into dbkr/scalar
2016-05-17 20:37:16 +01:00
Matthew Hodgson
24adf2847e
better comment
2016-05-17 20:32:38 +01:00
Matthew Hodgson
7879be1704
implement basic local echo for resetting unread message count when opening a room without a scroll offset. hopefully largely fixes https://github.com/vector-im/vector-web/issues/967
2016-05-17 20:28:11 +01:00
Matthew Hodgson
fd09d5c570
switch badge count to per-conversation, and add per-room badges
2016-05-17 11:14:12 +01:00
David Baker
ffe892b4b1
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
2016-05-17 10:30:32 +01:00
Matthew Hodgson
62a1100fca
Merge pull request #289 from matrix-org/dbkr/email_notifs
...
Support for enabling email notifications
2016-05-10 16:39:37 +02:00
David Baker
75979786fc
Call it scalar_token for consistency
2016-05-06 15:06:23 +01:00
David Baker
bb9316edfa
Pass the room id to scalar
2016-05-06 14:42:00 +01:00
David Baker
6da4b9d671
Add suport for showing the scalar UI
2016-05-06 14:19:56 +01:00
Matthew Hodgson
b86af8939a
fix usersettings cancel fail on new accounts
2016-05-05 15:30:56 +01:00
David Baker
fab7111fd7
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-29 11:09:02 +01:00
Matthew Hodgson
3cf12f8626
fix typo
2016-04-28 15:43:42 +01:00
Richard van der Hoff
ca0c697b6e
Avoid rerendering during Room unmount
...
might speed up room changing by a few milliseconds
2016-04-22 17:06:53 +01:00
Richard van der Hoff
0fd0b0c5f3
Whitespace fixes
...
Fix some trailing whitespace
2016-04-22 17:05:48 +01:00
David Baker
c3365f993b
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-22 16:25:09 +01:00
Richard van der Hoff
afb301ffb7
Reduce timeline limit to 250 events
...
... maybe this will help improve responsiveness in firefox.
2016-04-22 11:08:39 +01:00
Matthew Hodgson
d72d9260d4
Merge pull request #284 from matrix-org/matthew/hide_preview_heuristics
...
add heuristics to hide URL previews...
2016-04-21 18:54:34 +01:00
Matthew Hodgson
4d399a3640
Refactor out isLinkPreviewable
2016-04-21 18:00:39 +01:00
Matthew Hodgson
ee11838537
fix comment paren
2016-04-21 17:19:24 +01:00
Matthew Hodgson
c5a76dec1c
add heuristics to hide URL previews other than for URLs where the user has explicitly identified the target as a link: i.e. by including a URI scheme prefix, or by including URI path components, or by doing an explicit markdown hyperlink. ignore previews of URLs within pre or code blocks
2016-04-21 17:14:27 +01:00
Richard van der Hoff
30f273c611
Merge pull request #283 from matrix-org/rav/issue_1427
...
Fix bug which stopped us scrolling down after we scrolled up
2016-04-21 14:26:42 +01:00
Richard van der Hoff
2f435f4836
Fix bug which stopped us scrolling down after we scrolled up
...
Make sure that, if we scroll up enough to move the timelinewindow away from the
end of the timeline, we reset the canForwardPaginate flag.
2016-04-21 14:20:12 +01:00
David Baker
3381e2b057
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-21 10:12:27 +01:00
Richard van der Hoff
fa34dee091
Rewrite Read-receipt animation
...
... hopefully fixing https://github.com/vector-im/vector-web/issues/1437 in the
process.
The idea here is that, when we remove a read-receipt from the DOM, we stash its
position in a map. Then, when the read-receipt appears again attached to
another event, we know where to start the transition.
2016-04-20 23:06:53 +01:00
Richard van der Hoff
d953ac4e6b
Don't relayout scrollpanels every time something changes
...
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:25:19 +01:00
Richard van der Hoff
86a5e1f38d
Reduce number of renders on received events
...
TimelinePanel rerenders are expensive, so we want to do as few as possible. So,
when we get a new timeline event, make sure that we update the RM and add the
new event at the same time.
2016-04-19 23:45:51 +01:00
Richard van der Hoff
dcd81da856
Fix test failures introduced by last PR
2016-04-19 21:10:23 +01:00
Richard van der Hoff
568e7aef8b
Avoid rerendering EventTiles when not necessary
...
Each individual eventtile isn't particularly expensive, but when you have 500
of them, they start adding up. Shuffle some of the stuff into MessagePanel, so
that we can shouldComponentUpdate EventTiles properly.
2016-04-19 19:41:43 +01:00
Richard van der Hoff
a6bcbd4f61
Speed up processing of TimelinePanel updates on new events
...
Avoid twiddling state flags, so that we can avoid redundant re-renders.
2016-04-19 18:29:25 +01:00
Richard van der Hoff
683faf571f
Fix syntax error which prevented build
...
Remove a spurious } which was introduced in PR #275
2016-04-19 13:32:14 +01:00
Matthew Hodgson
8517b6558b
Merge pull request #275 from matrix-org/matthew/memberlist-sort
...
Fix many thinkos in sorting the MemberList
2016-04-18 19:15:20 +01:00
Richard van der Hoff
7b405d0d9c
Don't setState after unmounting a component
...
Fix a warning which happens if a LinkPreviewWidget is unmounted before the
preview request completes.
Also add missing .done to promise chain
2016-04-18 14:52:41 +01:00
Matthew Hodgson
a95c45eb96
final(?) PR fixes
2016-04-18 14:48:55 +01:00
Matthew Hodgson
60f92fd15b
PR feedback
2016-04-18 14:07:20 +01:00
Matthew Hodgson
b2d0950a46
oops, remove debug logging
2016-04-18 01:45:46 +01:00
Matthew Hodgson
b949e78683
Improve ordering of memberlist by absolutizing lastActive correctly
...
Change ordering of memberlist to not try to compare lastActive of 'currentlyActive' users, as lastActive may will be a complete lie as it only gets updated when currentlyActive transitions to false (i think?)
Remove order by online/idle/offline in favour of "currently active, ordered by power and then alphabetic name, followed by last active, followed by offline"
Add commented-out code to track last-spoken-within-a-room ordering.
Fix kludges due to SYJS-28 (depends on JS PR landing)
2016-04-18 01:35:40 +01:00
Matthew Hodgson
eeb9abdf81
trailing whitespace
2016-04-18 01:34:45 +01:00
Richard van der Hoff
716eb1eb1b
Drop workaround for object.onLoad
...
https://github.com/facebook/react/pull/5781 has been fixed in React 15.0, so
drop our workaroud for it.
2016-04-17 21:46:27 +01:00
Richard van der Hoff
336d91dadb
Merge pull request #272 from matrix-org/rav/fix_roomname
...
Make sure that we update the room name
2016-04-17 18:12:18 +01:00
Matthew Hodgson
f4573bae49
remove premie optimisation of tintablesvg shouldComponentUpdate
2016-04-17 00:28:20 +01:00
Matthew Hodgson
8db14bde60
switch Tinter from using dispatch to a synchronous update when changing the colourscheme, to avoid CSS getting out of sync with SVG colours
2016-04-16 01:00:10 +01:00
Matthew Hodgson
4fb31662e1
fix tooltip offset
2016-04-15 22:24:12 +01:00
Matthew Hodgson
19770563f4
add cancelButton to simpleHeader
2016-04-15 22:16:19 +01:00
Matthew Hodgson
009781dac7
prep for RightPanel full collapse
2016-04-15 18:45:40 +01:00
Matthew Hodgson
f625e2d693
fix up UserSettings a bit and add fading
2016-04-15 18:30:13 +01:00
Matthew Hodgson
a06b420942
wire up searchbox filtering
2016-04-15 17:55:00 +01:00
Matthew Hodgson
7c8d7e5361
move memberlist bottom into rightpanel
2016-04-15 15:53:14 +01:00
Richard van der Hoff
8680afe46f
Make sure that we update the room name
...
It turns out that RoomState.events is fired before Room.name is updated; make
sure that we pick up the latter and do the update.
2016-04-15 10:01:39 +01:00
Matthew Hodgson
26f135c7b0
fix 'undefined' class bug on TintableSvg
2016-04-14 21:44:05 +01:00
Matthew Hodgson
2d71d4422e
make selected room more skinnable
2016-04-14 21:11:10 +01:00
Matthew Hodgson
0741e8a5c1
fix testing UI hack
2016-04-14 19:11:20 +01:00
Matthew Hodgson
81d5e16225
fix @aviraldg thinko on needing a key on arrays :)
2016-04-14 19:11:09 +01:00
Matthew Hodgson
21fd5078f9
fix NPE on getEventTileOps
2016-04-14 17:39:45 +01:00
Richard van der Hoff
3fd9b29422
Merge pull request #271 from matrix-org/rav/avoid_codepoint_at
...
Hack around absence of String.codePointAt on PhantomJS
2016-04-13 16:37:00 +01:00
Richard van der Hoff
85277a237a
Merge pull request #270 from matrix-org/rav/issue_1314_federated_rooms
...
RoomView: Handle joining federated rooms
2016-04-13 16:36:46 +01:00
Matthew Hodgson
1e294cb10c
fix 'mark all read'
2016-04-13 12:46:36 +01:00
Richard van der Hoff
ec5ca1ca28
s/roomAlias/roomAddress/ to reduce confusion
2016-04-13 12:26:40 +01:00
Matthew Hodgson
6509bc0589
oops, missed another fade
2016-04-13 11:17:09 +01:00
Matthew Hodgson
ead5418214
oops, missed a fade
2016-04-13 11:17:09 +01:00
Richard van der Hoff
047524d093
Merge pull request #269 from matrix-org/rav/stop_client_on_unmount
...
Stop the MatrixClient when the MatrixChat is unmounted
2016-04-13 11:05:02 +01:00
Richard van der Hoff
5706a879d0
Hack around absence of String.codePointAt on PhantomJS
...
I've been trying to get some tests working under PhantomJS, which appears not
to support String.codePointAt (which is, to be fair, an ES6 addition). For our
limited usecase, it's easier to implement the functionality from first
principles than to try to polyfill support.
2016-04-13 10:35:07 +01:00
Richard van der Hoff
93a142480c
RoomView: Handle joining federated rooms
...
This hopefully fixes an issue where joining a federated room via the directory
would get stuck at a spinner of doom, due to us not recognising the room in
question when it came down the /sync. We now catch the room id in the response
from the /join, and use it to match up the room in onRoom.
props.roomAlias, props.roomId, and state.room.roomId were somewhat confusing,
so I've tried to rationalise them:
* props.roomAlias (named thus to stop you assuming it's a room id) is the
thing that the parent component uses to identify the room of interest, and
can be either an ID or an alias (ie, it replaces props.roomId and
props.roomAlias)
* Everything that needs a room ID now has to get it from state.room.roomId.
2016-04-13 08:59:28 +01:00
Matthew Hodgson
f3793b556e
fix super-annoying key warning from react
2016-04-13 02:02:55 +01:00
Matthew Hodgson
92f58b6927
don't try to do preview URLs of matrix IDs (yet :D)
2016-04-13 01:54:06 +01:00
Matthew Hodgson
4b1ff51a42
show a spinner on MemberInfo when updating a member. and label 'disinvite' correctly
2016-04-13 01:46:10 +01:00
Matthew Hodgson
bfec6d4ed9
merge aviral's audio player
2016-04-13 00:00:24 +01:00
Richard van der Hoff
1361333fdc
Stop the MatrixClient when the MatrixChat is unmounted
...
The MatrixClient never gets unmounted in the real app, but I've been working on
some tests which would rather like to be able to create and destroy MatrixChats
and not have the clients hang around forever.
2016-04-12 18:38:10 +01:00
Matthew Hodgson
6a6739e0f3
fix context menu on tiles without widgets
2016-04-12 18:32:55 +01:00
Matthew Hodgson
a01e6d46b9
Merge pull request #268 from matrix-org/matthew/fadable
...
make the UI fadable to help with decluttering
2016-04-12 18:05:10 +01:00
Matthew Hodgson
3a2d5c4ba5
spinner on saving room settings
2016-04-12 18:01:49 +01:00
Matthew Hodgson
11f3d5f993
make the UI fadable to help with decluttering
2016-04-12 17:18:32 +01:00
David Baker
fcab259511
Support for email notifs
...
Add utility funcs in UserSettingsStore and pass threepids to Notifications so it can do email notif stuff
2016-04-12 16:17:04 +01:00
Matthew Hodgson
1d5f234f2c
add 'mark all read' button
2016-04-12 14:29:36 +01:00
Matthew Hodgson
089963b4c7
timestamps are permalinks
2016-04-12 13:33:59 +01:00
Matthew Hodgson
38d27cdbb0
improve 'no known servers' error
2016-04-12 13:00:52 +01:00
Matthew Hodgson
f9785f68af
filter out conference bots from membership list
2016-04-12 01:54:51 +01:00
Matthew Hodgson
bf1e0da598
fix ability to save room settings if you don't have ops
2016-04-12 01:27:12 +01:00
Matthew Hodgson
f9c7ae1ab9
Merge pull request #260 from matrix-org/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:15 +01:00
Matthew Hodgson
9845e5ef0e
move all the localstorage crap to TextualBody
2016-04-11 23:53:36 +01:00
Matthew Hodgson
8e48bed346
apparently we don't need this. i'm lost now
2016-04-11 17:32:10 +01:00
Richard van der Hoff
e051d1528c
Remember to load new timeline events
...
Fixes a bug where we wouldn't load new timeline events if they arrived when we
were scrolled up (https://github.com/vector-im/vector-web/issues/1367 )
2016-04-11 14:05:04 +01:00
Matthew Hodgson
2e772e2f19
fix whitespace on multiupload prompt
2016-04-10 14:02:22 +01:00
Matthew Hodgson
6c372d37f7
add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback
2016-04-08 21:42:29 +01:00
Matthew Hodgson
23d6edbf63
forceupdate the whole scrollPanel rather than the geminiPanel at vdh's PR review request
2016-04-08 20:21:27 +01:00
Matthew Hodgson
4abc5d0d36
add comment
2016-04-08 20:21:12 +01:00
Richard van der Hoff
967528608f
Merge pull request #265 from matrix-org/rav/limit_pagination
...
Stop trying to paginate after we get a failure
2016-04-08 16:00:51 +01:00
Richard van der Hoff
15d0df5d3b
Stop trying to paginate after we get a failure
...
Once TimelineWindow.paginate fails to return any results, set
can*Paginate=false, and use it as a flag to stop us trying to paginate any
further.
2016-04-08 15:05:15 +01:00
Matthew Hodgson
1d8b08040e
incorporate PR feedback
2016-04-07 18:58:50 +01:00
Matthew Hodgson
7884c13d0d
Merge branch 'develop' into matthew/preview_urls
2016-04-07 17:25:48 +01:00
David Baker
a0c41e2d57
Fix password resetting
...
Fixes https://github.com/vector-im/vector-web/issues/1349
2016-04-07 12:59:30 +01:00
Richard van der Hoff
b64604964d
Fix exception in key handling
...
Fix a typo introduced in PR #262 which caused scroll keys to throw console
errors.
2016-04-07 12:05:07 +01:00
Richard van der Hoff
8b8ee21765
Catch pageup/down and ctrl-home/end at the top level
...
Make the scroll keys work when the focus is outside the message panel.
2016-04-05 13:40:36 +01:00
Richard van der Hoff
c5c9cad0cb
Merge pull request #261 from matrix-org/rav/issue_1151
...
Fix an issue where the scroll stopped working.
2016-04-05 12:55:59 +01:00
Richard van der Hoff
6a82d1a94c
Merge pull request #254 from matrix-org/rav/fix_rm_animation
...
Fix a bug where we tried to show two ghost read markers at once.
2016-04-05 12:55:38 +01:00
Richard van der Hoff
0d7adae100
Back out animation timing changes for now
...
... since they seem to be a bit contentious
2016-04-05 10:46:08 +01:00
Richard van der Hoff
51fe77122b
Fix an issue where the scroll stopped working.
...
Under certain conditions, it was possible to get stuck in a state where any
user-initiated scroll would be met with "Working around
vector-im/vector-web#528" and overridden. Fix this by removing the duplication
between _lastSetScroll and recentEventScroll, and using _lastSetScroll which is
more reliable.
2016-04-05 10:41:32 +01:00
Matthew Hodgson
1de4e0d2dd
label previews with the target URL if all else fails
2016-04-04 01:06:54 +01:00
Matthew Hodgson
96b0f42db2
support lightboxes for image previews
2016-04-04 00:18:18 +01:00
Matthew Hodgson
0eb7b627fc
ugly impl to track whether to hide the widget or not
2016-04-03 23:30:48 +01:00
Matthew Hodgson
e61c99f7f3
support cancelling previews
2016-04-03 02:50:36 +01:00
Matthew Hodgson
f9c914c40e
specify timestamps for historical previews
2016-04-03 01:21:56 +01:00
Matthew Hodgson
f195d2eb24
Merge branch 'develop' into matthew/preview_urls
2016-04-03 01:10:33 +01:00
Matthew Hodgson
2d289b321d
Merge branch 'develop' into matthew/preview_urls
2016-04-03 01:09:50 +01:00
Matthew Hodgson
2d3a237101
Merge pull request #258 from aviraldg/fix-219
...
File upload improvements
2016-04-02 23:07:50 +01:00
Aviral Dasgupta
0574a28e36
Add confirmation dialog for file upload
...
fixes vector-im/vector-web#92
2016-04-03 02:22:05 +05:30
Aviral Dasgupta
0eeaac88b4
Allow multiple files to be uploaded at once
...
fixes vector-im/vector-web#219
2016-04-03 01:26:50 +05:30
Aviral Dasgupta
31e09ebe63
Show full-size avatar on MemberInfo avatar click
...
fixes vector-im/vector-web#65
2016-04-03 00:54:23 +05:30
Matthew Hodgson
bffb482133
add FIXME
2016-04-02 02:46:19 +01:00
Matthew Hodgson
4388334e30
fix up scroll behaviour when loading widgets
2016-04-02 00:36:19 +01:00
Matthew Hodgson
62d04c38ef
fix typo and add linkify descriptions
2016-04-01 02:23:29 +01:00
Matthew Hodgson
4d959fc33b
improve layout and make thumbnails work
2016-04-01 02:16:11 +01:00
Matthew Hodgson
e6842eab94
WIP url previewing
2016-03-31 18:38:01 +01:00
Richard van der Hoff
b6e4e9caf3
Fix a bug where we tried to show two ghost read markers at once.
...
I think this was responsible for the readmarker just disappearing rather than
animating.
While we're here, decrease the delay on the animation, and instead make it take
slightly longer to disappear.
2016-03-31 18:27:46 +01:00
Matthew Hodgson
f6f86958f5
tweak room settings wording
2016-03-31 14:20:50 +01:00
Richard van der Hoff
631183da29
Don't reload the DOM if we can jump straight to the RM
...
Adds a missing 'return' statement which meant that, even if we already had the
relevant event loaded into the DOM, we would rebuild it when the user clicked
on the "(^) Unread messages" bar.
2016-03-31 00:51:23 +01:00
Matthew Hodgson
4380308393
my node choked on this trailing ,
2016-03-30 01:31:29 +01:00
Matthew Hodgson
182fa22eac
Merge pull request #251 from aviraldg/feature-pretty-placeholder
...
Prettier, animated placeholder :D
2016-03-30 01:27:36 +01:00
Richard van der Hoff
49e75b7430
Merge pull request #252 from matrix-org/rav/RoomHeader
...
Refactor RoomHeader, and fix topic updates
2016-03-29 23:25:54 +01:00
Richard van der Hoff
1f2ba87ff5
Pass SimpleRoomHeader title in as a named property
...
... rather than a child
2016-03-29 23:21:17 +01:00
Richard van der Hoff
0d261c37c2
Update room header when room state changes
...
Force an update so that we see the latest state.
Fixes https://github.com/vector-im/vector-web/issues/1299
2016-03-29 16:31:13 +01:00
Richard van der Hoff
6422f7ecc8
Factor out separate RoomNameEditor and RoomTopicEditor components
2016-03-29 15:21:16 +01:00
Richard van der Hoff
abedb05268
Merge pull request #250 from matrix-org/rav/disable_composer_if_no_permission
...
Disable the message composer if we don't have permission to post
2016-03-29 15:15:58 +01:00
Richard van der Hoff
70133ae661
Factor out SimpleRoomHeader
...
Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader.
2016-03-29 12:51:46 +01:00
Matthew Hodgson
e068a92cde
Merge pull request #248 from matrix-org/matthew/fix-image-load-popping
...
Fix scroll offset popping around during image load by putting explicit height back on images
2016-03-29 00:48:31 +01:00
Matthew Hodgson
0a2678b917
Add warning if fixupHeight fails, and remove overzealous logging
2016-03-29 00:46:51 +01:00
Aviral Dasgupta
6b10d5f696
Prettier, animated placeholder :D
2016-03-28 19:39:36 +05:30
Matthew Hodgson
a3dcd24e4a
fix event-recycling bug and mend history viz changes
2016-03-25 01:12:16 +00:00
Richard van der Hoff
c227b2279b
Minor fixes to image sizing
...
* use string refs instead of callback funcs
* Add a null-guard in case we don't have an image
2016-03-24 16:58:27 +00:00
David Baker
c3dd9a4b17
Unset email pending state on error or we never remove the spinner
2016-03-24 15:03:44 +00:00
Richard van der Hoff
cbf5b0eca3
Disable the message composer if we don't have permission to post
...
Rehashes dave's earlier PR which did the same thing
2016-03-24 13:57:21 +00:00
Richard van der Hoff
6ff41c40b6
Split a textinput component out of MessageComposer
...
Split the text entry section out of MessageComposer: it has a lot of stuff
which won't be needed if we disable input
2016-03-24 11:25:41 +00:00
Matthew Hodgson
8b67a1059d
oops, forgot a sync dispatch on onSearchResultsResize
2016-03-24 02:14:16 +00:00
Matthew Hodgson
5bd0303dda
make it work, seemingly
2016-03-24 01:12:51 +00:00
Matthew Hodgson
151a9994ba
WIP fix for image load popping
2016-03-24 00:13:32 +00:00
Matthew Hodgson
b81d901919
fix spinner when cancelling start chat from memberinfo
2016-03-23 18:17:49 +00:00
Matthew Hodgson
1a62369a01
prioritise new version bar
2016-03-23 18:05:47 +00:00
Richard van der Hoff
9f05249d9c
Disable scrollpanel debug
...
... so that I can (re-)release
2016-03-23 14:53:38 +00:00
David Baker
d6218ca153
Actually calling functions often helps.
2016-03-23 12:02:26 +00:00
David Baker
e20c599273
Swap register & cancel buttons for matthew
2016-03-23 11:48:47 +00:00
Matthew Hodgson
c4eabe2eb4
hopefully fix https://github.com/vector-im/vector-web/issues/1242
2016-03-23 11:41:10 +00:00
Richard van der Hoff
422a1f01a4
Limit check on scrollNode.scrollTop to keep firefox happy
...
Turns out that Firefox ignores attempts to set scrollTop to
Number.MAX_VALUE. Clip it to scrollHeight.
2016-03-23 10:51:07 +00:00
Richard van der Hoff
cf17258a6c
Merge pull request #246 from matrix-org/rav/read_marker_off_by_one
...
Fix off-by-one error in read-marker advancing
2016-03-23 10:23:19 +00:00
Richard van der Hoff
04c9924ad6
Fix off-by-one error in read-marker advancing
...
The fix to https://github.com/vector-im/vector-web/issues/1241 introduced an
off-by-one error which meant we would show the RM before the last event in a
room. We were actually winding the RM back one if the last message wasn't sent
by us.
2016-03-23 09:49:31 +00:00
Richard van der Hoff
4fd49976ae
Another go at fixing the jumpy scroll
...
The most recent problem was that we were setting _lastSetScroll whenever we
wrote to scrollTop (and ignoring the next scroll event which matched that
offset), but if there was no change to scrollTop, we wouldn't actually get a
scroll event, so would ignore some future scroll event instead.
Make sure that we only set _lastSetScroll if there's a change to scrollTop.
(Fixes https://github.com/vector-im/vector-web/issues/1162 , more)
2016-03-22 19:33:02 +00:00
Matthew Hodgson
2403eca6af
profoundly evil ugly hack to workaround amandine's invite focus issues on her note-to-self rooms
2016-03-22 17:47:52 +00:00
Richard van der Hoff
7fb5736e52
Merge pull request #244 from matrix-org/rav/no_rm_on_my_events
...
Move read-marker past our own events when we switch to a room
2016-03-22 17:44:02 +00:00
David Baker
abe4df5f1c
Merge pull request #243 from matrix-org/dbkr/error_messages
...
Add better user-facing error messages
2016-03-22 17:41:00 +00:00
Richard van der Hoff
0737d89d57
Merge pull request #242 from matrix-org/rav/read_marker
...
Make the read-marker less annoying
2016-03-22 17:37:14 +00:00
David Baker
87d853d56b
If we don't get a specific event because of permissions, say so
2016-03-22 17:33:46 +00:00
David Baker
4e9c37c069
Remove unused prop
2016-03-22 17:23:46 +00:00
Richard van der Hoff
3736fcf80e
Move read-marker past our own events when we switch to a room
...
This fixes an issue where the RM appeared before any events which were pending
when you switched away from that room
(https://github.com/vector-im/vector-web/issues/1241 ).
Also, fix a buglet in the MessagePanel which meant we didn't animate the
disappearance of a RM when it stayed at the same event but became
invisible. This didn't really cause any user-visible problems (because
typically we advance the RM at the same time as it became invisible), but
confused me a bit while I was trying to debug this.
2016-03-22 17:23:23 +00:00
David Baker
7f6eabe657
Fix doc for NeedToRegisterDialog and the place I copied it from
2016-03-22 17:20:22 +00:00
Matthew Hodgson
e23f496dfe
fix PowerSelector to support both controlled & uncontrolled variants
2016-03-22 17:17:46 +00:00
David Baker
88aa975271
Sensible error message if we can't invite because we're not allowed
2016-03-22 16:33:39 +00:00
Richard van der Hoff
c1101d978e
Turn on scroll debug again
2016-03-22 15:37:08 +00:00
David Baker
7caad2a434
More user-facing error message for event-not-found
2016-03-22 14:22:16 +00:00
David Baker
098f3e6561
Merge remote-tracking branch 'origin/develop' into dbkr/error_messages
2016-03-22 13:54:31 +00:00
David Baker
f1219a6b8d
Register prompt for trying to set an avatar
2016-03-22 13:50:27 +00:00
Matthew Hodgson
c60a305284
oops, unbreak tags in roomsettings
2016-03-22 13:47:38 +00:00
David Baker
13f31b2a5d
Add error message for failing to join a room as a guest (which may or may not be because we're a guest: we can't tell)
2016-03-22 13:47:29 +00:00
David Baker
463212fb2a
Update error message
2016-03-22 13:19:29 +00:00
David Baker
6dce555865
Sensible error for setting room colours if you're a guest
2016-03-22 13:09:19 +00:00
David Baker
e311a963c1
Merge remote-tracking branch 'origin/develop' into dbkr/error_messages
2016-03-22 12:59:14 +00:00
David Baker
30b76d372c
Error messages for guests creating rooms
2016-03-22 12:58:12 +00:00
Matthew Hodgson
385e1ca1fb
only let people add aliases if they canSeetAliases
2016-03-22 12:54:08 +00:00
Matthew Hodgson
80416fe583
prettify tag ui
2016-03-22 12:51:11 +00:00
David Baker
45dd192309
Merge remote-tracking branch 'origin/develop' into dbkr/error_messages
2016-03-22 12:48:13 +00:00
Matthew Hodgson
e141a44103
Merge pull request #241 from matrix-org/matthew/room-visibility
...
rework roomsettings for new visibility UI
2016-03-22 12:30:21 +00:00
Matthew Hodgson
5a2a2c5bdc
fix up and factor out mayChangeRoomAccess and fix review feedback
2016-03-22 12:26:38 +00:00
Richard van der Hoff
2ac88a3d89
Make the read-marker less annoying
...
We considered the user active if there had been a user_activity event within
the last 500ms, but those events were only raised every 500ms, so it was
possible that we would be considered inactive immediately. Use
UserActivity.userCurrentlyActive() instead, which fixes this.
Also increase CURRENTLY_ACTIVE_THRESHOLD_MS to 2 seconds.
2016-03-22 12:15:17 +00:00
Matthew Hodgson
df905cfcb7
incorporate PR review, and explicitly spell out if the room has ended up with guest_access=forbidden but join_rules=invite
2016-03-22 12:10:58 +00:00
Richard van der Hoff
b9d3047a93
Disable scrollpanel debug
...
... now that https://github.com/vector-im/vector-web/issues/1162 is hopefully
fixed
2016-03-22 11:58:17 +00:00
David Baker
5f1fabd982
Error message #1 : guests can't invite people. Also add a dialog box for telling people they need to register.
2016-03-22 10:57:05 +00:00
Richard van der Hoff
c31fbf1214
Merge pull request #236 from matrix-org/rav/search_pagination_spinner
...
Show a spinner when we back-paginate search results
2016-03-22 10:12:51 +00:00
Richard van der Hoff
d000870668
Merge pull request #237 from matrix-org/rav/scroll_jump
...
Only ignore scroll echoes once
2016-03-22 10:12:23 +00:00
Richard van der Hoff
74b45475be
Merge pull request #238 from matrix-org/rav/cancel_sending
...
Add 'cancel all' option to 'unsent messages' bar
2016-03-22 10:12:11 +00:00
Richard van der Hoff
f6862f03ad
Merge pull request #239 from matrix-org/rav/context_errors
...
Show an error when a direct-to-event link fails
2016-03-22 10:11:29 +00:00
Matthew Hodgson
8cfb0e9ef4
rework roomsettings for new visibility UI
2016-03-22 00:57:40 +00:00
Matthew Hodgson
4e97fe982d
improve previewbar look & feel
2016-03-21 22:05:59 +00:00
David Baker
3bd93c90b1
Splitting this over two lines confuses the word spacing
2016-03-21 18:15:01 +00:00
Richard van der Hoff
d67c64c7a6
Show an error when a direct-to-event link fails
...
If the /context request fails, pop up a modal dialog to tell the user about
it.
2016-03-21 17:29:33 +00:00
Richard van der Hoff
75f8765f88
Add 'cancel all' option to 'unsent messages' bar
...
Also, make sure we hide said bar when unsent messages are cancelled.
2016-03-21 16:49:07 +00:00
Matthew Hodgson
11be2e1cad
Merge pull request #234 from matrix-org/matthew/stop-peeking
...
if we're not peeking in a room, stop any ongoing peeking
2016-03-21 16:17:00 +00:00
Richard van der Hoff
c89906e571
Only ignore scroll echoes once
...
When the user scrolls up, and scrolls back to where they were, we want to save
the final scroll state. We were ignoring it because it looked the same as the
last autoscroll.
Fixes https://github.com/vector-im/vector-web/issues/1162
2016-03-21 14:48:17 +00:00
Matthew Hodgson
0a346350e8
warn if you don't specify an email
2016-03-21 01:15:11 +00:00
Matthew Hodgson
5bdcb64464
fix NPE
2016-03-21 00:51:45 +00:00
Matthew Hodgson
59f599af5c
prompt before giving equal ops
2016-03-21 00:49:18 +00:00
Matthew Hodgson
31ed7b9dd7
fix state caching bugs in RoomHeader
2016-03-21 00:39:33 +00:00
Richard van der Hoff
c1fa89972a
Show a spinner when we back-paginate search results
...
Hook into the existing searchInProgress state to show a spinner when we
back-paginate search.
2016-03-20 23:51:43 +00:00
Matthew Hodgson
eadd2a522f
fix room reuse semantics when starting chats
2016-03-20 13:04:03 +00:00
Matthew Hodgson
18fc8fc6c4
s/m.room.join_rule/m.room.join_rules/
2016-03-20 12:47:38 +00:00
Matthew Hodgson
bbd57f2bdf
when starting chat from memberinfo, allow guest access. in future synapse should make guest_access a default for the private_chat preset.
2016-03-20 12:39:49 +00:00
Matthew Hodgson
68a391e24b
implement history visibilty warnings
2016-03-19 22:33:06 +00:00
Richard van der Hoff
7712582c29
Renable debug in ScrollPanel
...
... after matthew disabled it by accident
2016-03-19 20:42:30 +00:00
Matthew Hodgson
a44ebddae0
show default displayname in ChangeDisplayName prompt
2016-03-19 02:45:06 +00:00
Matthew Hodgson
383779f718
oops, actually fix https://github.com/vector-im/vector-web/issues/308 properly...
2016-03-18 20:08:47 +00:00
Matthew Hodgson
cb9da69382
doh
2016-03-18 20:01:19 +00:00
Matthew Hodgson
0250192477
handle tagging for kicked rooms correctly
2016-03-18 19:59:58 +00:00
Matthew Hodgson
bfbb7a661e
special case to include kicked rooms as per https://github.com/vector-im/vector-web/issues/308
2016-03-18 19:45:04 +00:00
Matthew Hodgson
24972a8267
if we're not peeking in a room, stop any ongoing peeking
2016-03-18 19:23:30 +00:00
Matthew Hodgson
86807b631d
don't reset RoomHeader every time the props change due to RoomView re-rendering during edits
2016-03-18 19:16:55 +00:00
Matthew Hodgson
12db0d9130
fix NPE on events with no sender object
2016-03-18 16:33:22 +00:00
Matthew Hodgson
d0ecd38927
top-align search results
2016-03-18 16:25:11 +00:00
Richard van der Hoff
15c9ad87a1
Merge pull request #231 from matrix-org/rav/pending_event_list
...
Use new pendingEventList functionality from matrix-js-sdk
2016-03-18 16:17:56 +00:00
David Baker
076bd720a3
Spell address correctly
2016-03-18 16:07:32 +00:00
David Baker
eb5aa7ed7d
Move comment
2016-03-18 16:06:36 +00:00
David Baker
b4dd7ba509
I mean string, object
2016-03-18 16:04:58 +00:00
David Baker
3e915cf0e2
Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email
2016-03-18 15:34:15 +00:00
David Baker
97c765f457
Look up bound mxid for the invited email address on the ID server and warn if it doesn't match our account.
2016-03-18 15:30:27 +00:00
Matthew Hodgson
03bdcf265a
fix proptypes on dialogs
2016-03-18 11:20:00 +00:00
Matthew Hodgson
deaa5c350a
Remove unnecessary Modal.createDialogWithElement, complete with its broken onFinished() support. Switch SetDisplayNameDialog to use Modal.createDialog(). Explicitly pass false to closeDialog if the user tries to cancel dialogs by clicking on the background, rather than passing in an event object which evaluates to true.
2016-03-18 11:15:06 +00:00
Matthew Hodgson
e63990a66e
ensure we call onFinished successfully if the user actually hits submit
2016-03-18 11:12:37 +00:00
Matthew Hodgson
d0d22136f5
remove totally dead wood from stale Modal API
2016-03-18 11:12:06 +00:00
Richard van der Hoff
b93af2d536
Use new pendingEventList functionality from matrix-js-sdk
...
Update react-sdk to use `pendingEventOrdering`==`detached` instead of
`end`. Look for pending events in the pendingEvent list, and use
MatrixClient.cancelPendingEvent to, uh, cancel pending events.
2016-03-17 22:26:06 +00:00
Matthew Hodgson
e55a375d6f
improve RoomPreviewBar as per https://github.com/vector-im/vector-web/issues/761
2016-03-17 19:19:05 +00:00
Matthew Hodgson
be5173a8db
fix https://github.com/vector-im/vector-web/issues/871
2016-03-17 18:49:40 +00:00
Matthew Hodgson
396d23b267
kill annoying warning
2016-03-17 18:49:40 +00:00
David Baker
f1844a99e7
WIP on fixing https://github.com/vector-im/vector-web/issues/924
...
Pass the invited email through to RoomPreviewBar, display it in a temporary way currently.
Remove a condition from RoomView render that appears to be functionally identical to the previous.
2016-03-17 18:38:25 +00:00
Richard van der Hoff
d1dbce8adf
Enable debug in ScrollPanel for now
...
... in an attempt to debug some of the recent scroll problems
2016-03-17 17:48:19 +00:00
Matthew Hodgson
57ffc2d2e2
add autoFocus to MessageComposer's textarea, which generally makes the world a better place. We could probably kill all the focus_composer dispatches too, but haven't got time to check that right now
2016-03-17 17:29:48 +00:00
Matthew Hodgson
fd4e709705
don't need null guard
2016-03-17 16:56:16 +00:00
Matthew Hodgson
76d4e8a788
check length of textarea, not its trueiness
2016-03-17 16:54:54 +00:00
Matthew Hodgson
1b4c5224fd
missed some s/this.refs.//
2016-03-17 16:52:12 +00:00
Matthew Hodgson
a64ad04a0e
handle focus nicely when inserting displaynames and let them be inserted in the middle of in-progress messages
2016-03-17 16:29:37 +00:00
Matthew Hodgson
c7ffb59374
click on nicks to insert them into the MessageComposer
2016-03-17 15:35:23 +00:00
Matthew Hodgson
a13513935b
only show '...' when people are typing
2016-03-17 15:02:07 +00:00
Matthew Hodgson
9dcdf0ae51
Merge pull request #227 from matrix-org/matthew/fix-notif-spam
...
Correctly fix notif spam after logout/login
2016-03-17 14:37:01 +00:00
Matthew Hodgson
c51dac2f29
Merge pull request #226 from matrix-org/matthew/fix-last-active
...
fix last_active_ago timestamps, tab completion ordering, and implement currently_active semantics
2016-03-17 14:36:52 +00:00
Matthew Hodgson
a68e4ed1a7
Merge pull request #222 from matrix-org/matthew/fix-memberlist-refresh
...
make MemberTiles actually update in realtime
2016-03-17 11:59:24 +00:00
Matthew Hodgson
b617571481
tidy up https://github.com/matrix-org/matrix-react-sdk/pull/225
2016-03-17 11:56:46 +00:00
Matthew Hodgson
e03d8626be
Merge pull request #225 from aviraldg/fix-1174
...
Bring up MemberInfo on avatar click in EventTile
2016-03-17 11:48:32 +00:00
Matthew Hodgson
84278a4ed4
fix copy-paste bug caught by PR review
2016-03-17 11:37:26 +00:00
David Baker
b960d1d462
Make getCurrent[H|I]SUrl honour the state setting that comes from the url bar.
...
Fixes @ara4n's later bug in https://github.com/vector-im/vector-web/issues/1027
2016-03-17 11:33:25 +00:00
Matthew Hodgson
3326a50c4b
hopefully stop weird flickering bugs when pressing delete or zero-height textareas...
2016-03-17 02:17:17 +00:00
Matthew Hodgson
e9b0539b58
hopefully stop weird flickering bugs when pressing delete or zero-height textareas...
2016-03-17 02:16:39 +00:00
Matthew Hodgson
08618f6ad5
remove start_login_from_guest and instead make logout able to preserve guestCreds
2016-03-17 02:09:49 +00:00
Matthew Hodgson
11a146ed42
oops
2016-03-17 00:07:30 +00:00
Matthew Hodgson
6acfc8f508
comment currentlyActive
2016-03-17 00:06:53 +00:00
Matthew Hodgson
50e33d30b6
never try to tab-complete yourself, doofus
2016-03-16 23:35:01 +00:00
Matthew Hodgson
500b88dc36
implement currently_active
2016-03-16 22:44:54 +00:00
Matthew Hodgson
ce833c9bba
deobfuscate last_active_ago ordering
2016-03-16 22:26:20 +00:00
Matthew Hodgson
2265d1a82a
fix display of null last_active_ago timestamps
2016-03-16 22:25:57 +00:00
Aviral Dasgupta
bd7f56007a
Bring up MemberInfo on avatar click in EventTile
...
Fixes vector-im/vector-web#1174
2016-03-17 02:45:38 +05:30
Matthew Hodgson
87e1bc2f07
fix zero-length /me
2016-03-16 19:52:43 +00:00
Matthew Hodgson
4571c64413
fix zero-length /me
2016-03-16 19:52:24 +00:00
Matthew Hodgson
8f967d6e23
make MemberTiles actually update in realtime\n\nFixes https://github.com/vector-im/vector-web/issues/730 and all its dups
2016-03-16 19:32:48 +00:00
Matthew Hodgson
bb918f198b
don't let uses change HS/IS URL in the middle of registration - fixes https://github.com/vector-im/vector-web/issues/1176
2016-03-16 19:14:28 +00:00
Matthew Hodgson
74acc0b564
keep the existing colour scheme
2016-03-16 18:58:04 +00:00
Matthew Hodgson
6016ba70d9
Merge pull request #221 from aviraldg/feature-sync-status
...
Display sync status in favicon and title.
2016-03-16 18:56:57 +00:00
Matthew Hodgson
81674684bb
Merge pull request #217 from matrix-org/matthew/disable-room-settings
...
grey out roomsettings that you can't edit
2016-03-16 14:42:13 +00:00
Matthew Hodgson
74aad34dfb
Merge pull request #220 from matrix-org/matthew/cancellable-upgrade
...
allow registration and login from guest to be cancellable
2016-03-16 14:38:00 +00:00
Matthew Hodgson
90aa4223f2
merge develop
2016-03-16 14:37:12 +00:00
Matthew Hodgson
1aa84f2d15
switch to roomState.mayClientSendStateEvent
2016-03-16 13:10:45 +00:00
Matthew Hodgson
4db79edb73
oops, use right signature for roomState.maySendStateEvent
2016-03-16 12:17:07 +00:00
Matthew Hodgson
014ea9a328
switch to using MatrixClientPeg.get().maySendStateEvent() everywhere
2016-03-16 12:09:26 +00:00
Matthew Hodgson
b58a1707cb
Merge pull request #219 from matrix-org/matthew/fix-guest-upgrade
...
let registering guests either upgrade or create a new account by spec…
2016-03-16 11:58:44 +00:00
Matthew Hodgson
b457a4e4a2
improve semantics for when the 'return to app' prompt is shown
2016-03-16 11:48:32 +00:00
David Baker
43fd13b9d7
Merge pull request #187 from matrix-org/dbkr/may_send_state_event
...
Remove (broken, as it turns out) permission logic from react sdk
2016-03-16 10:40:07 +00:00
Matthew Hodgson
795435b1ce
DOH
2016-03-16 10:33:20 +00:00
Aviral Dasgupta
b47ea1ca4b
Color for sync status, less scary message
2016-03-16 06:32:49 +05:30
Aviral Dasgupta
47c3419c0e
Display sync status in favicon and title
...
Signed-off-by: Aviral Dasgupta <me@aviraldg.com>
2016-03-16 05:31:50 +05:30
Matthew Hodgson
d8af6ec240
hide 3PID settings from guests
2016-03-15 23:57:42 +00:00
Matthew Hodgson
25bf4030de
stop guests from setting avatars
2016-03-15 23:55:59 +00:00
Matthew Hodgson
0e1186c4f9
display m.room.history_visibility updates in the timeline
2016-03-15 23:47:40 +00:00
Matthew Hodgson
5f68f1313b
show warning if guest login disabled
2016-03-15 23:01:59 +00:00
Matthew Hodgson
bae23c78de
fix https://github.com/vector-im/vector-web/issues/1040 and https://github.com/vector-im/vector-web/issues/833
2016-03-15 22:42:22 +00:00
Matthew Hodgson
2bedece9a1
argh, remove debugging
2016-03-15 22:15:04 +00:00
Matthew Hodgson
b7726d34d5
allow registration and login from guest to be cancellable
2016-03-15 21:04:11 +00:00
Matthew Hodgson
f66dd69710
oops, revert - do this on the right branch...
2016-03-15 18:40:03 +00:00
Matthew Hodgson
b23cad5613
let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161
2016-03-15 18:36:13 +00:00
Matthew Hodgson
f70eec62d1
let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161
2016-03-15 18:35:09 +00:00
Matthew Hodgson
672a5cb89c
Merge pull request #200 from matrix-org/matthew/loginfixes
...
Bring back lost functionality on login/register/password-reset screens
2016-03-15 15:21:32 +00:00
Matthew Hodgson
59866a2006
final PR feedback
2016-03-15 15:20:51 +00:00
David Baker
836f7ca80d
Merge pull request #218 from matrix-org/session_logged_out
...
Handle the new Session.logged_out event.
2016-03-15 14:51:50 +00:00
Matthew Hodgson
438558da55
PR feedback
2016-03-15 13:48:46 +00:00
Matthew Hodgson
1a74b0c487
Merge pull request #216 from matrix-org/matthew/fix-join-by-room-alias
...
hopefully fix https://github.com/vector-im/vector-web/issues/819
2016-03-15 13:16:51 +00:00
David Baker
a1b875bb25
Handle the new Session.logged_out event. Log the user out and display a message telling them they've been logged out.
...
Requires https://github.com/matrix-org/matrix-js-sdk/pull/100 (but safe without)
Fixes https://github.com/vector-im/vector-web/issues/414
2016-03-15 10:48:16 +00:00
Richard van der Hoff
8ea75277e1
Merge pull request #215 from matrix-org/rav/fix_scroll_on_resize
...
Adjust the scroll position when the gemini panel is resized
2016-03-15 09:59:44 +00:00
Matthew Hodgson
8a905dec58
grey out roomsettings that you can't edit
2016-03-15 02:46:17 +00:00
Matthew Hodgson
7c598d90b1
give proper error message on failing to start chat
2016-03-15 02:19:27 +00:00
Matthew Hodgson
1abd7f45ce
fix setting custom power levels
2016-03-15 01:34:49 +00:00
Matthew Hodgson
5e050c6276
hopefully fix https://github.com/vector-im/vector-web/issues/819
2016-03-15 00:49:44 +00:00
Matthew Hodgson
79eb54058f
oops, backout WIP
2016-03-15 00:48:19 +00:00
Matthew Hodgson
005ebbd037
stop avatar mxids being copy-pastable (unless they contain an initial). should significantly improve https://github.com/vector-im/vector-web/issues/893
2016-03-15 00:21:05 +00:00
Richard van der Hoff
ce150646e6
Merge branch 'develop' into rav/fix_scroll_on_resize
2016-03-14 22:32:54 +00:00
Richard van der Hoff
3173898bc1
Bump the timeline limit to 500
...
... so that matthew can ctrl-f
2016-03-14 15:47:09 +00:00
Richard van der Hoff
61cd66304e
Adjust the scroll position when the gemini panel is resized
...
Make sure we restore the scroll state of the message panel when it is resized
2016-03-14 15:29:29 +00:00
Richard van der Hoff
8a4a810d1f
Merge pull request #214 from matrix-org/rav/gemini-resize
...
Use our fork of react-gemini-scrollbar to fix resize issues
2016-03-14 13:59:11 +00:00
Richard van der Hoff
74bbb81532
Merge pull request #212 from matrix-org/rav/fix_search_position
...
Put direct-linked events and search clickthroughs in the middle
2016-03-14 12:49:21 +00:00
Richard van der Hoff
88b3f2ed8c
Use our fork of react-gemini-scrollbar to fix resize issues
...
Rather than telling react-gemini-scrollbar to update every time something that
changes its size happens, try out our fork of it which uses some hackery to
listen for resizes.
2016-03-14 12:46:13 +00:00
Matthew Hodgson
893e338917
incorporate keganfeedback
2016-03-12 19:49:54 +00:00
David Baker
e0c416ee01
Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash
...
Don't crash on redacted (or otherwise invalid) 3pid invites
2016-03-11 14:39:43 +00:00
David Baker
1131b82414
Don't crash on redacted (or otherwise invalid) 3pid invites
2016-03-11 14:18:30 +00:00
David Baker
1516f17af4
Merge pull request #210 from matrix-org/dbkr/invite_display_when_peekable
...
Show the invite preview bar when we have a 3pid invite
2016-03-11 10:21:04 +00:00
David Baker
15170f8718
Comment how we're not rejecting 3pid invites
2016-03-11 10:20:52 +00:00
David Baker
73781f5619
doc inviterName
2016-03-10 17:43:20 +00:00
Richard van der Hoff
5e7eb3ee92
Stop video tags autoplaying.
...
Properly, this time
Fixes https://github.com/vector-im/vector-web/issues/995
2016-03-10 17:38:52 +00:00
Richard van der Hoff
3fd066c2d4
Put direct-linked events and search clickthroughs in the middle
...
We need two modes of operation for ScrollPanel.scrollToToken:
For jump-to-read-marker, we want it 1/3 of the way down the screen.
For search clickthrough, and hyperlinked events, we want put the event in the
*middle* of the screen.
Fixes https://github.com/vector-im/vector-web/issues/1032
2016-03-10 17:27:46 +00:00
David Baker
2875fa3eb1
Show the invite preview bar when we have a 3pid invite, and make the reject button work.
2016-03-10 15:56:58 +00:00
Richard van der Hoff
f9e753f57a
Update the gemini panel when we show/hide the TopUnreadMessagesBar
...
Showing/hiding the TopUnreadMessagesBar resizes the scrollpanel. Make sure that
we update the gemini panel when this happens.
(Fixes an intermittent bug wherein we could get stuck with a 'scroll to bottom'
indicator after jumping to the bottom, with unread messages in the view)
2016-03-10 15:55:03 +00:00
Richard van der Hoff
7660276b54
Merge pull request #209 from matrix-org/rav/local_echoes_are_today
...
Use 'today' for the date separator for unsent messages
2016-03-10 14:34:18 +00:00
Richard van der Hoff
a841991952
Merge pull request #208 from matrix-org/rav/missing_date_separator
...
Fix the missing date separator at the start of rooms
2016-03-10 14:19:52 +00:00
Richard van der Hoff
928b2bb9a7
Use 'today' for the date separator for unsent messages
...
Fixes https://github.com/vector-im/vector-web/issues/1087 , though we'll still
have problems if the unsent messages get out of order.
2016-03-10 14:16:31 +00:00
Richard van der Hoff
3bd33d0985
Fix the missing date separator at the start of rooms
...
When we first hit the start of the room, we still have a pagination token, so
we hide the date separator. When we try to backpaginate again, we get an empty
result, and the pagination token is cleared.
Make sure that we update state. canBackPaginate even when there are no new
results, to handle this case.
Fixes https://github.com/vector-im/vector-web/issues/1014
2016-03-10 13:42:46 +00:00
David Baker
f997a6fff2
Merge pull request #206 from matrix-org/dbkr/invites_silently_fail
...
Make 3pid invite failures show errors
2016-03-10 10:07:47 +00:00
David Baker
a74e7b45d0
Return the promise so the failure actually propagates through the promise chain. Makes the invite error handling code work.
...
Fixes https://github.com/vector-im/vector-web/issues/691
2016-03-09 18:48:38 +00:00
Richard van der Hoff
ec2e27a754
Merge pull request #205 from matrix-org/rav/shouldComponentUpdates_2
...
Re-introduce shouldComponentUpdate methods in RoomView and TimelinePanel
2016-03-09 17:25:11 +00:00
Richard van der Hoff
aabdaa737e
Merge pull request #204 from matrix-org/rav/jump_to_read_marker_fix
...
Make jump-to-read-marker work when the RM event isn't loaded.
2016-03-09 16:12:16 +00:00
Richard van der Hoff
4b333d2363
Update the timeline when a local echo arrives
2016-03-09 15:56:54 +00:00
Richard van der Hoff
6c928f12b2
ForceUpdate the scrollpanel when the aux panel changes size
...
Catch some more cases when we ought to be updating the gemini scroll stuff.
2016-03-09 15:56:54 +00:00
Richard van der Hoff
393e8ff612
Revert "Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates""
...
Put the shouldComponentUpdate methods back in, now that Matthew has stopped
demoing.
This reverts commit 606fdcb8df
.
2016-03-09 15:56:53 +00:00
Richard van der Hoff
a9da0a014e
Merge pull request #203 from matrix-org/rav/optimize_resize
...
Don't forceUpdate the message panel on resize
2016-03-09 15:55:33 +00:00
Richard van der Hoff
1a371b346e
remove spurious debug
2016-03-09 15:51:17 +00:00
David Baker
d54ee4f247
Merge pull request #201 from matrix-org/dbkr/reuse_guest_account
...
Use the guest access tokens sent in 3pid invite emails.
2016-03-09 15:49:30 +00:00
Richard van der Hoff
b45c256427
Don't forceUpdate the message panel on resize
...
We don't really need to forceUpdate() the entire timeline panel every time
something might resize it. It is sufficient to forceUpdate the ScrollPanel.
2016-03-09 15:40:19 +00:00
Richard van der Hoff
f60ac2aa5f
Make jump-to-read-marker work when the RM event isn't loaded.
...
If the event corresponding to the read-up-to mark hasn't been loaded into the
timeline window, we can't simply scroll to it. Instead, reload the timeline,
centered on the RM event.
Fixes https://github.com/vector-im/vector-web/issues/1055
2016-03-09 07:54:49 +00:00
Richard van der Hoff
6e23623c28
Fix checkScroll after image load
...
Make the onImageLoad handler call checkScroll on the right thing. This was
originally done in commit 99d2392
, but got broken in the Great RoomView
Refactor of February 2016.
2016-03-07 22:23:14 +00:00
Richard van der Hoff
606fdcb8df
Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates"
...
This reverts commit a7c75b1315
, reversing
changes made to b66ca74ede
.
This is causing breakage in the messagepanel screen resize after video call and
room settings
2016-03-07 17:28:50 +00:00
David Baker
42a90f49c2
Use the guest access tokens sent in 3pid invite emails.
2016-03-07 17:11:01 +00:00
David Baker
a2c6bd0e6c
Merge pull request #199 from mebjas/develop
...
fixed issue vector-im/vector-web 1079
2016-03-07 16:15:45 +00:00
Minhaz A V
7e7493b336
removed typeof and todo
...
Signed-off-by: Minhaz A V <minhazav@gmail.com>
2016-03-07 21:16:35 +05:30
Richard van der Hoff
a7c75b1315
Merge pull request #193 from matrix-org/rav/shouldComponentUpdates
...
Add shouldComponentUpdate() methods to RoomView and TimelinePanel
2016-03-07 11:50:38 +00:00
Matthew Hodgson
a82d3710d1
provide sensibile defaults for PasswordLogin
2016-03-06 18:42:09 -05:00
Matthew Hodgson
0bb58dd60c
brings back the functionality in login/register/screens that got lost in @kegsay's refactor. specifically:
...
1) custom HS/IS urls are now persisted in HTML5 local storage. As a result, all the login components now distinguish between default HS/IS URLs and custom specified ones again. (
2) custom HS/IS urls are synchronised between the instances of ServerConfig found in the Login, Registration and Forgot Password screens.
3) username are persisted over changing homeserver (but not password, to stop accidentally leaking passwords to the wrong server)
4) correctly interpret a blank URL field as meaning the placeholder text
5) when toggling custom URLs on and off, remember what the custom values were, and use the default URLs if custom mode is not engaged
also, guest access now upholds custom HS/IS URLs found in local storage rather than being limited to the server config ()
also adds assorted comments and improved console debug and a few minor cosmetic changes to the login components.
this commit sponsored by VS27...
2016-03-06 14:33:36 -05:00
Minhaz A V
3c1312a9e6
fixed issue vector-im/vector-web 1079
2016-03-05 23:36:24 +05:30
Matthew Hodgson
b66ca74ede
fix comments
2016-03-05 02:35:17 +00:00
Richard van der Hoff
7820a5d900
Merge pull request #189 from matrix-org/rav/fix_timeline_react_keys
...
Flatten arrays of components before adding to messagepanel li
2016-03-04 17:56:18 +00:00
Richard van der Hoff
318bcb1284
Merge pull request #192 from matrix-org/rav/fix_read_receipts
...
Make sure we update the timelinepanel when a read-receipt arrives
2016-03-04 17:55:29 +00:00
Richard van der Hoff
1738fab2ee
Merge pull request #190 from matrix-org/rav/reduce_timeline_limit
...
Reduce the number of messages we show in the DOM to 250
2016-03-04 17:54:59 +00:00
David Baker
66bed45e67
Merge pull request #195 from matrix-org/dbkr/reenable_upgrade_registration
...
Re-enable upgrade registration.
2016-03-04 17:54:50 +00:00
David Baker
b9f508a61e
Merge pull request #197 from matrix-org/dbkr/starting_room_alias_tidy
...
Tidy up starting from a room alias when not logged in.
2016-03-04 17:54:37 +00:00
David Baker
068429f3e3
Tidy up starting from a room alias when not logged in.
2016-03-04 17:37:06 +00:00
Matthew Hodgson
fcf17adf14
hopefully fix bug186 by ensuring room members never have null users
2016-03-04 16:57:20 +00:00
David Baker
4da0e2fd95
Re-enable upgrade registration.
...
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
2016-03-04 15:41:32 +00:00
Richard van der Hoff
bc5ae6a6ad
Add shouldComponentUpdate() methods to RoomView and TimelinePanel
...
This will avoid re-rendering the whole RoomView every time we get a scroll
event, and might even help with https://github.com/vector-im/vector-web/issues/1056 .
2016-03-04 14:51:55 +00:00
Richard van der Hoff
31df97e486
Make sure we update the timelinepanel when a read-receipt arrives
...
Fixes https://github.com/vector-im/vector-web/issues/1094
2016-03-04 14:47:11 +00:00
Richard van der Hoff
c14b62ee64
Reduce the number of messages we show in the DOM to 250
...
... as per https://github.com/vector-im/vector-web/issues/1077
2016-03-04 14:07:18 +00:00
Richard van der Hoff
6e86d7553f
Flatten arrays of components before adding to messagepanel li
...
Avoid updating the whole DOM when we paginating by making sure the keys are
right
2016-03-04 13:49:15 +00:00
David Baker
5b505cd32d
Remove (broken, as it turns out) permission logic from react sdk and use https://github.com/matrix-org/matrix-js-sdk/pull/94 instead.
2016-03-03 17:58:41 +00:00
Matthew Hodgson
05a3dab528
fix roomavatars on FF
2016-03-03 16:16:40 +00:00
Matthew Hodgson
27fea6bc95
make the newly invited warning prettier
2016-03-03 15:02:11 +00:00
Matthew Hodgson
cfd6546fe9
default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files
2016-03-03 12:11:22 +00:00
David Baker
45857fa12c
Remove unused voice & video on-clicks from RoomHeader.
2016-03-02 14:54:38 +00:00
David Baker
0051c91126
Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata
...
Pass room metadata from 3pid invite emails all the way through to the…
2016-03-02 14:31:58 +00:00
David Baker
c585b3edee
anothert stray room_
2016-03-02 14:31:01 +00:00
David Baker
de2eaa3078
Document inviterName
2016-03-02 14:04:51 +00:00
David Baker
5827a883bf
This should be just oob_data too
2016-03-02 14:02:36 +00:00
David Baker
4184158a9a
Make comment match reality, attempt 2.
2016-03-02 14:01:21 +00:00
David Baker
6319c85272
Make comment match reality
2016-03-02 13:59:55 +00:00
David Baker
5bd2316e7f
Oops, it's just oob_data here
2016-03-02 13:58:52 +00:00
David Baker
2dbed2aa02
Clarify when room / oobData can/can't be set
2016-03-02 11:59:17 +00:00
David Baker
d61f383748
Oops, actually assign variable
2016-03-02 11:57:05 +00:00
David Baker
acb5f5d69b
This should be props, not state
2016-03-02 11:56:18 +00:00
David Baker
7ae2c5b11b
Document fields of oob_data
2016-03-02 11:51:47 +00:00
David Baker
10b1b6443d
Fix rooms we don't have any info about
2016-03-02 10:59:54 +00:00
David Baker
9085a2a866
Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it.
2016-03-01 18:23:57 +00:00
Richard van der Hoff
1e3040d19a
Fix a race condition handling gappy syncs
...
We had a problem handling gappy syncs: resetting the timeline would trigger a
pagination request (which would return no results, because there are no events
at this point); this would make the pagination requests which are spawned when
we process the events in the sync get ignored - with the result that we get a
blank window.
The fix is to avoid the ScrollPanel when we are processing new live events and
tell the TimelineWindow to paginate itself directly.
2016-03-01 10:52:56 +00:00
Richard van der Hoff
dc9a7e5e28
Merge pull request #181 from matrix-org/rav/issue_1049
...
Fix CallView in left panel
2016-02-29 17:51:39 +00:00
Richard van der Hoff
559f60d43e
unmounted check in TimelinePanel
2016-02-29 17:06:38 +00:00
Richard van der Hoff
30abf81ed4
Fix CallView in left panel
...
Make CallView cope with not being passed a room. Fixes
https://github.com/vector-im/vector-web/issues/1049 , introduced in
7a20fda7
, which made vector crash when you switched to another room with an
active call.
2016-02-29 13:43:22 +00:00
Richard van der Hoff
db1e1c7df0
Fix NPE when re-joining a room
...
Fix the length check on state.events
2016-02-26 23:05:41 +00:00
Richard van der Hoff
acfc7b3719
Don't throw exceptions when room changes in a timelinepanel
...
This does happen - fortunately only in circumstances where it's not a
problem. Downgrade the exception to a warning.
Fixes https://github.com/vector-im/vector-web/issues/1036
2016-02-26 22:39:25 +00:00
Richard van der Hoff
543f444174
Merge commit 'd9e58d9' into develop
...
Undo an over-zealous force-push :(
2016-02-26 16:31:02 +00:00
Richard van der Hoff
d5c83347a6
Merge pull request #173 from matrix-org/rav/configurable_sync_limit
...
Make the initialSyncLimit configurable
2016-02-26 13:57:30 +00:00
Richard van der Hoff
a9d363c668
Merge pull request #180 from matrix-org/rav/optimise_timeline_load
...
Make room-switching quicker
2016-02-26 13:29:35 +00:00
Richard van der Hoff
65ecbf93fe
Merge pull request #178 from matrix-org/rav/reset_timeline
...
Reload the timeline when we get a gappy sync
2016-02-26 13:28:20 +00:00
Richard van der Hoff
0d1c85eb7c
Make room-switching quicker
...
Avoid delaying a reactor tick when switching rooms, to make room-switching
(feel) a bit snappier.
2016-02-26 12:25:46 +00:00
Richard van der Hoff
e634f98a13
Show spinners when forward/back paginating.
2016-02-25 18:44:07 +00:00
Richard van der Hoff
4be29401ce
Reload the timeline when we get a gappy sync
...
After a resume from sleep, we don't want to start paginating through the whole
timeline. If we were in 'stuckAtBottom' mode before, treat a gappy sync
similarly to how we handle the 'scroll to bottom' knob, which is to reload the
timelinewindow starting from scratch.
Fixes https://github.com/vector-im/vector-web/issues/932 , and will probably
also fix https://github.com/vector-im/vector-web/issues/943 , though I haven't
tested it yet.
2016-02-25 18:42:59 +00:00
Richard van der Hoff
2bd6529ca0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-25 18:38:14 +00:00
Will Hunt
081a975d2a
Added ES6 function 'fromCodePoint' to retrive first initial for default avatars that begin with a large unicode character.
2016-02-25 16:23:38 +00:00
Richard van der Hoff
2e5df1a96f
Merge pull request #173 from matrix-org/rav/configurable_sync_limit
...
Make the initialSyncLimit configurable
2016-02-25 14:19:31 +00:00
David Baker
e915d7e215
Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup.
...
Fixes https://github.com/vector-im/vector-web/issues/544
2016-02-25 11:06:47 +00:00
Richard van der Hoff
10b55036f9
Merge branch 'rav/roomview_works' into develop
...
Implementation of new read-marker semantics (PR #160 ).
2016-02-24 17:26:46 +00:00
Richard van der Hoff
1959b03104
Land refactored roomview branch 'rav/roomview_works'.
...
This branch has been sitting around a while; it includes a substantial refactor
of RoomView (into separate MessagePanel and TimelinePanel), as well as a number
of fixes.
2016-02-24 16:52:12 +00:00
Richard van der Hoff
1009faf9dc
Merge pull request #171 from matrix-org/rav/typing_notifs_cleanups
...
Don't forceUpdate the whole roomview on typing notifs
2016-02-24 16:45:45 +00:00
Richard van der Hoff
7a19bad388
Merge pull request #170 from matrix-org/rav/video_resize
...
Factor out a separate auxpanel, and cleanup the maxHeight management
2016-02-24 16:45:25 +00:00
Richard van der Hoff
4ce3598274
Make the initialSyncLimit configurable
...
I keep wanting to change this to test things, and can never find the right
place to change it. Make it configurable.
2016-02-24 16:42:23 +00:00
Richard van der Hoff
68e0192acc
reinstate event-continuation logic
...
Forgot to set prevEvent in the merge from develop, so we were never applying
the correct continuation logic.
2016-02-23 18:43:51 +00:00
David Baker
3f51cda846
Register a s a guest even if email invite: this is ok now.
2016-02-23 18:30:35 +00:00
David Baker
e2bafcbf02
Don't redirect to registration on 3pid invite: it's ok to be a guest now.
2016-02-23 18:26:15 +00:00
David Baker
b2b7354018
Comment guest access initial state
2016-02-23 18:10:48 +00:00
David Baker
418bf8e39c
Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this.
2016-02-23 17:55:45 +00:00
David Baker
b384d8c91a
Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites
...
Wire up support for keypair 3pid invites.
2016-02-23 16:37:55 +00:00
Richard van der Hoff
07822e20cb
Don't forceUpdate the whole roomview on typing notifs
...
updating the roomview is expensive, so we shouldn't do it every time we get a
typing notification (which may or may not correspond to a user in this
room). Push it down to RoomStatusBar, and use a state var to keep track of it.
2016-02-23 16:17:50 +00:00
Richard van der Hoff
7a20fda7e7
Factor out a separate auxpanel, and cleanup the maxHeight management
...
Basically two changes here:
1. Factor out auxpanel from RoomView
2. Rather than setting maxHeight attributes by poking directly into the DOM,
pass them down as properties.
2016-02-23 15:54:15 +00:00
Richard van der Hoff
d599c8fbd2
Merge remote-tracking branch 'origin/develop' into rav/roomview_works
2016-02-23 13:37:21 +00:00
Richard van der Hoff
ac4b36c0dd
Merge commit '99d2392' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:32:23 +00:00
Richard van der Hoff
4a22fb9763
Merge commit '26e6632' into rav/roomview_works
2016-02-23 13:25:09 +00:00
Richard van der Hoff
21850d7e2f
Merge commit 'd7b3a24' into rav/roomview_works
2016-02-23 13:24:58 +00:00
Richard van der Hoff
9eff426819
Merge commit '71e2495' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:24:38 +00:00
Richard van der Hoff
6aaced04fa
Merge commit 'd2a731e' into rav/roomview_works
2016-02-23 13:02:26 +00:00
Richard van der Hoff
776b6a26c3
Merge commit '9a0ea56' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:02:02 +00:00
Richard van der Hoff
b1093f3f4b
Merge commit 'e972686' into rav/roomview_works
2016-02-23 12:57:53 +00:00
Richard van der Hoff
4c571cf1bf
Merge commit 'eb91faf' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:56:54 +00:00
Richard van der Hoff
7f4f30d7d5
Merge commit 'e3feae3' into rav/roomview_works
2016-02-23 12:01:53 +00:00
Richard van der Hoff
3acfab48fc
Merge commit '014acba' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:00:54 +00:00
Richard van der Hoff
8161a18efd
Merge commit 'b1a6575' into rav/roomview_works
2016-02-23 11:56:51 +00:00
Richard van der Hoff
d673249681
Wire up StatusBar size changes to a geminipanel update
...
When the statusbar changes size, we need to tell the gemini panel to
update. This is slightly tortuous as figuring out the size of the statusbar
isn't completely trivial.
Fixes https://github.com/vector-im/vector-web/issues/945 and
https://github.com/vector-im/vector-web/issues/986
2016-02-23 11:06:16 +00:00
David Baker
ac9f0f204d
Wire up support for keypair 3pid invites.
2016-02-23 10:15:07 +00:00
Richard van der Hoff
99d2392b6f
Update the scroll offset when images load
...
In order to deal with image-loading reshaping the DOM, wire up
ScrollPanel.checkScroll to the image load events.
Fixes https://github.com/vector-im/vector-web/issues/984
2016-02-22 17:43:33 +00:00
Richard van der Hoff
26e66326a2
Link search results to the right room
...
Fixes https://github.com/vector-im/vector-web/issues/980
2016-02-22 12:54:22 +00:00
David Baker
d7b3a24c18
Merge pull request #165 from matrix-org/dbkr/read_receipt_send_ignore_implicit
...
Fix stuck notification bug
2016-02-19 16:20:12 +00:00
David Baker
71e2495e81
Use new flag in js-sdk to look at the last read receipt the server actually has and ignore implicit ones, otherwise we can end up not sending an RR because we think there's already a more recent one, even though that one is implicit.
2016-02-19 14:45:02 +00:00
Matthew Hodgson
b4fe9473d5
improve error messages when failing to talk to a HS
2016-02-19 14:17:41 +00:00
Matthew Hodgson
a44ef5bd48
fix incomingCallBox vertical offset if MatrixToolbar is present
2016-02-19 02:21:17 +00:00
Matthew Hodgson
957ef9cdc8
fix self-highlight
2016-02-19 01:56:03 +00:00
Matthew Hodgson
d2a731e255
only resize the video element if not fullscreen
2016-02-19 01:18:53 +00:00
Matthew Hodgson
7f310ce307
fix nasty overscroll bug on video element caused by inline v. block
2016-02-19 01:18:37 +00:00
Matthew Hodgson
dc94df4b06
accomodate 800px wide thumbs and support horizontal scaling
2016-02-18 19:09:58 +00:00
Matthew Hodgson
12f5407392
remove ... in error view
2016-02-18 18:16:48 +00:00
Matthew Hodgson
9a0ea56bba
don't suppress conf join/parts
2016-02-18 00:07:35 +00:00
Richard van der Hoff
e9726865fc
Merge pull request #162 from matrix-org/rav/keep_redactions
...
Handle redacted events
2016-02-17 21:42:39 +00:00
Richard van der Hoff
c4176ab706
Merge pull request #163 from matrix-org/rav/fix_search_clickthrough
...
Fix search clickthrough for HTML events
2016-02-17 21:35:39 +00:00
Richard van der Hoff
e3feae32e1
Fix search clickthrough for HTML events
...
Switch to using a normal <a href="..."> link for search result
clickthrough. Apart from generally giving a better experience, this means that
it also works on html messages. The problem there was that we were attaching
onClick handlers to <span>s which we were then flattening into HTML with
ReactDOMServer (which meant the onClick handlers were never attached to React's
list of listeners).
To make this work without jumping through React hoops, the highlighter now
returns either a list of strings or a list of nodes, depending on whether we
are dealing with an HTML event or a text one. We therefore have a separate
HtmlHighlighter and TextHighlighter.
2016-02-17 21:06:27 +00:00
Matthew Hodgson
b087157855
Merge branch 'develop' into rav/update_status_bar
2016-02-17 18:38:47 +00:00
Matthew Hodgson
38a2a61b38
back out hacky previous commit as #946 only happens when gemini is disabled
2016-02-16 19:39:22 +00:00
Matthew Hodgson
34d0fc890a
disable scroll-to-token entirely temporarily - https://github.com/vector-im/vector-web/issues/946
2016-02-16 17:39:32 +00:00
Richard van der Hoff
eb91faf554
Handle redacted events
...
matrix-js-sdk now retains redacted events. Filter them out of the timeline.
Also put empty placeholders in the dom so that if we try to scroll to a
redacted event, we don't end up blowing up.
2016-02-16 16:08:52 +00:00
Richard van der Hoff
db09d3d9e4
Move ghost-read-marker logic to MessagePanel
2016-02-15 23:05:58 +00:00
Richard van der Hoff
63511d4e71
Refactor the EventTile loop
...
... so that it's a bit more tractable.
2016-02-15 23:05:42 +00:00
Richard van der Hoff
06133b0467
Add a null guard for matrix client TimelinePanel.componentWillUnmount
...
client can be null when unmounting
2016-02-15 23:04:21 +00:00
Matthew Hodgson
4b8b2ade8b
fix login-on-guest-bar-NPE crash https://github.com/vector-im/vector-web/issues/930
2016-02-15 21:50:39 +00:00
Matthew Hodgson
ca56b7ec2d
match partial names in memberlist
2016-02-15 20:43:43 +00:00
Matthew Hodgson
61018f4f38
whitespace
2016-02-15 20:42:44 +00:00
Richard van der Hoff
ab9690d3b0
Don't re-tint on unmount
...
Need to remember the 'ref' function is called on unmount too - we shouldn't
retint back to the room colours at this point.
2016-02-15 20:40:34 +00:00
Matthew Hodgson
6b48b626e6
fix spinner of doom
2016-02-15 20:39:02 +00:00
Matthew Hodgson
576de32ce4
show vaguely accurate default avatar
2016-02-15 22:01:22 +02:00
Matthew Hodgson
dfbc88d421
fix keyboard shortcuts on logout prompt
2016-02-15 22:01:05 +02:00
Matthew Hodgson
0d153df417
improve registration fail error msg slightly
2016-02-15 21:58:37 +02:00
Matthew Hodgson
014acbab1f
restore drag & drop file upload, broken by @richvdh's new timeline stuff
2016-02-15 21:16:04 +02:00
Matthew Hodgson
b1a6575b1d
remove ugly join & reject error msgs in favour of modal dialogs
2016-02-15 20:59:44 +02:00
Matthew Hodgson
30e9c76089
login as guest button on the login page
2016-02-15 20:44:13 +02:00
Matthew Hodgson
e17d77778f
sanitize setting displayname prompt
2016-02-15 19:37:03 +02:00
Richard van der Hoff
b766055f2f
Merge branch 'develop' into rav/roomview_works
2016-02-15 17:24:15 +00:00
Matthew Hodgson
0c7573629a
spell out that you can invite email addresses
2016-02-15 11:13:37 +02:00
Matthew Hodgson
0a37f1c478
improve the fix for https://github.com/vector-im/vector-web/issues/917
2016-02-15 09:52:57 +02:00
Matthew Hodgson
9d3b0f6075
fix https://github.com/vector-im/vector-web/issues/913
2016-02-15 00:37:59 +02:00
Matthew Hodgson
5e5fdb9b96
fix vector-im/vector-web#921
2016-02-14 13:38:12 +02:00
Richard van der Hoff
0e0d0cf4f5
post-review tweaks
2016-02-11 15:38:13 +00:00
Richard van der Hoff
f2377fa9fe
Factor out a TimelinePanel from RoomView
2016-02-10 18:41:48 +00:00
Richard van der Hoff
c3692378fa
Factor a stateless messagepanel out from RoomView
2016-02-10 18:41:47 +00:00
David Baker
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
David Baker
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
David Baker
038f613079
Don;t try to fetch push rules if we're a guest: it throws.
2016-02-10 11:16:36 +00:00
Richard van der Hoff
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
David Baker
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
David Baker
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
David Baker
b4a7124686
Add a null check here since room can be null and this was throwing
2016-02-09 16:48:12 +00:00
Richard van der Hoff
f48f28eefe
Kill another scrollToToken
...
Missed a place where we were scrolling the messagepanel manually
2016-02-09 15:50:09 +00:00
Richard van der Hoff
576b59be66
Kill off the remains of auto_peek
...
Remove some dead code.
2016-02-09 15:45:41 +00:00
Richard van der Hoff
178e99385a
Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling
2016-02-09 14:52:38 +00:00
Richard van der Hoff
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
Richard van der Hoff
7fd56351a9
Fix 'unread messages' in status
...
This got broken in the previous commit
2016-02-09 12:40:11 +00:00
Richard van der Hoff
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
Richard van der Hoff
81e95ca8c1
Wire up jump-to-bottom knob
...
... which I embarassingly forgot
2016-02-09 11:36:57 +00:00
Richard van der Hoff
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
Kegsay
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
Richard van der Hoff
1d9c88698f
Factor the statusbar implementation out of RoomView
...
... because RoomView must die
2016-02-08 18:08:19 +00:00
Kegan Dougal
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
Richard van der Hoff
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
David Baker
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
David Baker
9bf8f37e5f
explicitly check join status as it's clearer
2016-02-08 16:03:04 +00:00
Kegan Dougal
2027ed9f49
Fix bug where clicking on the email tile didn't work
2016-02-08 15:21:23 +00:00
Kegan Dougal
70ed0be389
Merge branch 'develop' into kegan/invite-autocompleting-race
2016-02-08 15:06:13 +00:00
Kegan Dougal
3fa23798ea
Split out invite memberlist logic into its own component
2016-02-08 15:05:35 +00:00
David Baker
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
David Baker
05f1e1e205
Merge pull request #140 from matrix-org/dbkr/fix_tab_complete
...
Fix tab complete
2016-02-08 14:19:06 +00:00