Luke Barnard
57f01b83be
Revert "Save scroll state immediately before updating"
...
This reverts commit 4124a8dcff
from PR https://github.com/matrix-org/matrix-react-sdk/pull/1076
2017-06-19 13:19:17 +01:00
Luke Barnard
83d5822c85
Show a "Skip" button instead of "Cancel" in SetEmailDialog
...
Fixes https://github.com/vector-im/riot-web/issues/4309
2017-06-19 13:17:12 +01:00
Richard Lewis
80c5a58fc3
Fix custom widget form styling
2017-06-19 12:06:16 +01:00
Richard Lewis
f676b58c00
Add google ardboard logo
2017-06-19 11:47:03 +01:00
Richard Lewis
9d89bfe264
Fix jitsi logo references
2017-06-19 11:36:15 +01:00
Luke Barnard
513a585a3e
Merge pull request #1076 from ollieh/issues/reduce-save-restore-window
...
Reduce save-restore window in ScrollPanel to reduce scrolling jumps
2017-06-19 11:23:10 +01:00
Richard van der Hoff
a5d65ee391
Get rid of guestCreds
...
-- we just keep the MatrixClient running in the background, so it is easy to
resume.
2017-06-19 10:36:25 +01:00
Richard van der Hoff
3b518f2c59
Fix race in registration for pusher config
...
we no longer immediately create the MatrixClient, so don't assume we do.
2017-06-19 10:22:18 +01:00
Richard van der Hoff
115a3deed9
Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states
...
Refactor the state machine in MatrixChat
2017-06-19 08:53:50 +01:00
Richard van der Hoff
cb29d92912
Merge pull request #1110 from matrix-org/rav/fix_token_redirect
...
Avoid transitioning to loggedIn state during token login
2017-06-19 08:52:22 +01:00
Matthew Hodgson
032650e095
Merge branch 'develop' into t3chguy/fix_forwarding
2017-06-19 01:53:35 +01:00
Luke Barnard
ba95d7a16c
Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create
...
Don't peek when creating a room
2017-06-16 18:35:20 +01:00
Luke Barnard
be58e1095e
Don't peek when creating a room
...
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330 , https://github.com/matrix-org/riot-web-rageshakes/issues/196
2017-06-16 18:24:07 +01:00
Michael Telatynski
7b4cd31124
make forward_message be friendly with the RVS stuffs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-16 16:12:52 +01:00
David Baker
aa7ddfe86e
Remove unused collapse_rhs
...
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
2017-06-16 15:47:40 +01:00
Richard van der Hoff
db3d9c0573
Make Lifecycle.loadSession return an explicit result
...
- rather than inferring it from the fact it didn't call logging_in.
2017-06-16 15:23:09 +01:00
Richard van der Hoff
5f689b7929
Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp
2017-06-16 15:20:47 +01:00
Richard van der Hoff
eb1fc9ae2d
Avoid transitioning to loggedIn state during token login
...
Fixes riot-web#4334
When we do a token login, don't carry on with the normal app startup
(transitioning to the loggedIn state etc) - instead tell the app about the
successful login and wait for it to redirect.
Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what
it's supposed to be doing.
2017-06-16 15:05:53 +01:00
Richard van der Hoff
3884c5ccf0
Log an error on unknown state instead of throwing
2017-06-16 11:51:12 +01:00
Richard van der Hoff
5e5639b730
Fix half-written comment
2017-06-16 11:50:53 +01:00
Luke Barnard
82b2da7833
Correctly inspect state when rejecting invite
...
So that we view_next_room if we're looking at the room we're rejecting
2017-06-16 11:27:47 +01:00
David Baker
64b555dfe3
Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview
...
Make sure to pass the roomAlias to the preview header if we have it
2017-06-16 11:21:03 +01:00
Luke Barnard
807f01b57e
Make sure to pass the roomAlias to the preview header if we have it
2017-06-16 11:10:55 +01:00
David Baker
2a01e638b7
Make sure captcha disappears when container does
...
Should fix https://github.com/vector-im/riot-web/issues/4095
2017-06-16 10:25:51 +01:00
David Baker
af6392d7ca
Fix URL previews
...
and also things like the unsent message error and encryption
warning.
Stuff that we need to do at room view mount time had got moved into
a clause of the if statement in onHaveRoom and so wasn't being
executed.
Fixes https://github.com/vector-im/riot-web/issues/4327
2017-06-15 22:57:41 +01:00
Richard van der Hoff
7b526308fd
Rearrange MatrixChat.render for sanity
...
no-op to make it into a nice simple switch-like arrangement
2017-06-15 17:57:24 +01:00
Richard van der Hoff
90213ce72e
MatrixChat: Replace state.{loading,loggedIn,loggingIn} with views
...
MatrixChat is essentially a glorified state machine, with its states partially
determined by the loading, loggedIn and loggingIn state flags. If we actually
make each of the states implied by those flags an explicit 'view', then
everything gets much clearer.
2017-06-15 17:57:24 +01:00
Richard van der Hoff
ce42a9a06f
Replace MatrixChat.state.screen with 'view'
...
'screen' is overloaded, as it us used for the parameter of `showScreen` (and,
by implication, `state.screenAfterLogin`). Attempt to clear up the confusion by
replacing 'screen' with 'view' and using some constants for the potential
values.
This should be a no-op!
2017-06-15 16:41:17 +01:00
Richard van der Hoff
1f48b4caa6
Merge pull request #1098 from matrix-org/rav/test_rts_login
...
Groundwork for tests including a teamserver login
2017-06-15 16:12:28 +01:00
Luke Barnard
9d74001f4f
Show a spinner when accepting an invite and waitingForRoom
2017-06-15 15:32:01 +01:00
Luke Barnard
cc46fd34d7
Only stop peeking if at some point we were joined
2017-06-15 14:21:23 +01:00
Luke Barnard
5c37d591b0
Unbreak auto joining
2017-06-15 13:35:19 +01:00
Luke Barnard
fc7da536d6
Add forceUpdate for memberships !== join
2017-06-15 13:32:56 +01:00
Luke Barnard
30566beb43
Fix if-statement thinko
2017-06-15 13:28:52 +01:00
Luke Barnard
d55d61e456
Remove redundant isUserJoined
2017-06-15 12:37:01 +01:00
Luke Barnard
b90ceaa111
Display a spinner until new room object after join success
...
If we successfully join, display a spinner until the js-sdk indicates (via room membership event or room event) that we can start using the room normally. A room event indicates we have never seen that room which means we need to use the new room object to clobber state.room. This is to make sure we replace the room that is set up for peeking with the room that can be used normally. For historical rooms, this isn't a problem.
This is a workaround for the fact that when peeking, the js-sdk calls onRoom, which is difficult to handle from the clients perspective because onRoom should only be called for rooms that you've never seen before. But if you peek a room that you've joined and left and get an onRoom, you run into trouble. You also can't just always use onRoomMembership because this won't be triggered for the first time you see the room. So we end up using a combination of both.
See https://github.com/matrix-org/matrix-js-sdk/issues/464 for discussion on improving this
2017-06-15 12:01:16 +01:00
Richard van der Hoff
65f351ff22
Clear Lifecycle.RtsClient on MatrixChat.mount
...
- otherwise it ends up sitting around and failing later tests.
2017-06-15 02:15:13 +01:00
David Baker
8840625045
Merge pull request #1097 from matrix-org/luke/attempt-fix-peeking-regression
...
Luke/attempt fix peeking regression
2017-06-14 17:33:45 +01:00
Luke Barnard
58554cce53
Remove racey condition
...
joining might become false before we get the room down the sync
2017-06-14 17:13:13 +01:00
Luke Barnard
9e3efb54d3
Merge pull request #1096 from matrix-org/dbkr/fix_warm_fuzzy_text_mk_2
...
Show correct text in set email password dialog (2)
2017-06-14 16:59:12 +01:00
Richard van der Hoff
e9aac09105
Merge pull request #1092 from matrix-org/rav/no_resume_client_on_login
...
Don't create a guest login if user went to /login
2017-06-14 16:58:12 +01:00
Luke Barnard
ed5f01d46f
Add logging for diagnosis
2017-06-14 16:53:21 +01:00
Luke Barnard
b5fd78a97f
Only attempt to peek once in the lifetime of RoomView
2017-06-14 16:50:46 +01:00
Luke Barnard
2d6ba056d1
Attempt to follow closely what RoomView did pre-ILAG
...
In terms of peeking and what happens to the state when joining. This is another attempt to mitigate https://github.com/vector-im/riot-web/issues/4307
2017-06-14 16:48:34 +01:00
David Baker
9ecf82a1f2
Show correct text in set email password dialog (2)
...
Fixes https://github.com/vector-im/riot-web/issues/4311
The cancel button onClick was hooked directly up to onFinished, so
the mouse event ended up as the boolean for whether an email had
been set.
2017-06-14 16:06:28 +01:00
David Baker
449c65b784
Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set
...
Give password confirmation correct title, description
2017-06-14 15:16:36 +01:00
Luke Barnard
1d4a3ae5a3
Give password confirmation correct title, description
...
Fixes https://github.com/vector-im/riot-web/issues/4311
This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)
2017-06-14 14:58:39 +01:00
David Baker
57ef6f3cf8
Make enter submit change password form
...
Fixes https://github.com/vector-im/riot-web/issues/4302
2017-06-14 14:50:48 +01:00
Robert Swain
edb11d805e
AppsDrawer: Open add app widget if opening empty drawer
...
This felt much better than having to also click the add app widget
button.
2017-06-14 15:05:29 +02:00
Robert Swain
5f020423bc
AddAppDialog: Put the submit button inside the form
2017-06-14 15:05:11 +02:00
Robert Swain
2d3c886646
AppsDrawer: Generate room alias for vrdemo
2017-06-14 13:27:15 +02:00
Robert Swain
9c8ab2691b
AppsDrawer: Only append queryParams once
2017-06-14 13:26:43 +02:00
Robert Swain
880e7149f3
ModularWidgets: Add a quick VR demo widget
2017-06-14 13:05:43 +02:00
Richard van der Hoff
5d649626b0
Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login
2017-06-14 11:08:16 +01:00
Richard van der Hoff
498ea53995
Don't create a guest login if user went to /login
...
This fixes an unintuitive behaviour where, if you follow a link to
riot.im/app/#/login, we take you to the login page, but not before we've
registered a guest account (or restarted the MatrixClient with the stored
creds).
This actually ends up simplifying some of the startup dance, as we special-case
the registration flows earlier on.
2017-06-14 11:02:38 +01:00
Luke Barnard
57dfbc4701
Remove unused imports
2017-06-14 10:53:02 +01:00
Luke Barnard
040f28463d
Merge pull request #1045 from ollieh/issues/4009
...
Fixed pagination infinite loop caused by long messages
2017-06-14 10:40:02 +01:00
Richard van der Hoff
9e70884415
Merge pull request #1085 from matrix-org/rav/clear_storage_on_login
...
Clear persistent storage on login and logout
2017-06-14 10:34:26 +01:00
David Baker
0566e5d992
Merge pull request #1090 from matrix-org/luke/set-email-after-password-2
...
Ask for email address after setting password for the first time
2017-06-14 09:57:07 +01:00
Luke Barnard
4344af58ee
Ask for email address after setting password for the first time
...
So that the user can reset their password.
2017-06-14 09:31:16 +01:00
Matthew Hodgson
9dad5d0132
Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings
...
remove mx_filterFlipColor from verified e2e icon so its not purple :/
2017-06-13 17:45:56 +01:00
Michael Telatynski
f4aadafed9
remove mx_filterFlipColor from verified e2e icon so its not purple :/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-13 17:42:30 +01:00
Robert Swain
d67e7289e8
Merge branch 'develop' into rob/apps
2017-06-13 15:50:43 +02:00
Robert Swain
03ba3bd431
Merge branch 'rxl881/apps' into rob/apps
2017-06-13 15:41:52 +02:00
Robert Swain
91eabbba60
MessageComposer: Trigger Jitsi app from call buttons
2017-06-13 15:35:13 +02:00
Robert Swain
5d898dd098
AuxPanel: Add type checking for userId and showApps properties
2017-06-13 15:34:05 +02:00
Robert Swain
b63edcb390
AppTile: Support deletion of apps from room state
2017-06-13 15:33:17 +02:00
Robert Swain
bcb2f8408b
AppTile: Fix typo in property name
2017-06-13 15:32:40 +02:00
Robert Swain
2aa0aa61e3
AddAppDialog: Support adding apps to room state
2017-06-13 15:31:37 +02:00
Robert Swain
a72cb794f2
AppsDrawer: Populate apps from room state
2017-06-13 15:28:37 +02:00
Robert Swain
e2759774fc
RoomView: Correctly pass userId from matrix client
...
It isn't set in the state anywhere.
2017-06-13 15:19:38 +02:00
Robert Swain
99b1de7f0e
RoomView: Display AppsDrawer if apps in room state
2017-06-13 15:19:06 +02:00
David Baker
bd00c1d4b1
Merge pull request #1083 from matrix-org/t3chguy/width_height_int
...
width and height must be int otherwise synapse cries
2017-06-13 13:23:12 +01:00
Richard van der Hoff
392cd7861d
Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener
...
remove RoomViewStore listener from MatrixChat on unmount
2017-06-13 13:10:49 +01:00
Richard van der Hoff
68e1a7be74
Clear persistent storage on login and logout
...
Make sure that we don't end up with sensitive data sitting around in the stores
from a previous session.
2017-06-13 12:51:47 +01:00
Richard van der Hoff
1ea9ed5d8c
remove RoomViewStore listener from MatrixChat on unmount
...
... to avoid spurious warnings from the tests.
2017-06-13 12:39:26 +01:00
Michael Telatynski
ad7c835471
width and height must be int otherwise synapse cries
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-13 12:19:20 +01:00
Richard Lewis
876899948f
Merge in upstream changes
2017-06-13 11:44:23 +01:00
Luke Barnard
10ba5f8c3c
Only process user_directory response if it's for the current query
2017-06-13 11:03:22 +01:00
Richard Lewis
2da30137ec
Fix import path and add LG widget
2017-06-13 10:31:16 +01:00
Luke Barnard
1ce1984858
Fix regressions with starting a 1-1.
2017-06-13 10:15:29 +01:00
Matthew Hodgson
bc55d44bcf
Merge pull request #1079 from matrix-org/t3chguy/voip/force_turn
...
allow forcing of TURN
2017-06-12 21:44:00 +01:00
Michael Telatynski
c1d1a1377c
allow forcing of TURN, pass account val per-call until UX is designed.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 20:20:27 +01:00
David Baker
7b0565e9d1
Merge branch 'master' into develop
2017-06-12 15:53:04 +01:00
Matthew Hodgson
6133186583
fullstop fails
2017-06-12 15:36:24 +01:00
Richard Lewis
b893887707
Fix merge conflict
2017-06-12 14:52:41 +01:00
Richard Lewis
f9f924bbd6
Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps
2017-06-12 14:50:25 +01:00
Richard van der Hoff
cc74a09abd
Remove start_upgrade_registration dispatch handler
...
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
Richard van der Hoff
e6d7eedbe6
Remove NeedToRegisterDialog
...
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
Richard van der Hoff
9e96e8e87f
Remove guest-only bits of UserSettings
...
There is now no way to open UserSettings as a guest, so we might as well lose
the dead code.
2017-06-12 08:36:41 +01:00
Richard van der Hoff
56efe7d2f2
Merge pull request #1064 from matrix-org/rav/delinting
...
Delinting
2017-06-12 08:34:58 +01:00
Oliver Hunt
4124a8dcff
Save scroll state immediately before updating
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
2017-06-12 06:19:12 +01:00
Michael Telatynski
ccad1013a7
don't return null in case it breaks things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:42:22 +01:00
Michael Telatynski
1069bd33f0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:21:50 +01:00
Michael Telatynski
6ead97c7a6
change interface to UpdateCheckBar and change launching mechanism
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:12:40 +01:00
Will Hunt
3ddbf83c62
Add userid back
2017-06-11 07:13:50 +01:00
Will Hunt
f940d2c100
Add reason for ban in room settings
2017-06-10 16:57:09 +01:00
Matthew Hodgson
3b7ce49eab
Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons
...
adds mx_filterFlipColor so that the dark theme will invert this image
2017-06-10 01:06:31 +01:00
Michael Telatynski
34caf5586f
adds mx_filterFlipColor so that the dark theme will invert this image
...
making it more suitable for the said theme
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-10 00:08:40 +01:00
Matthew Hodgson
a4a0acc28d
fullstop fails
2017-06-09 22:19:14 +01:00
David Baker
d6b85c9d4d
Fix translations on conf call banner
...
* You can't substitute react elements into a text string
* Substituting in undefined gives the string 'undefined', so
initialise it to the empty string.
2017-06-09 22:06:43 +01:00
Luke Barnard
ecc8abbfc9
When ChatCreateOrReuseDialog is cancelled by a guest, go home
2017-06-09 13:46:45 +01:00
Robert Swain
9e0b476b72
Merge branch 'develop' into rob/apps
2017-06-09 12:06:44 +02:00
David Baker
924c08b143
Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room
...
Goto /home when forgetting the last room
2017-06-09 11:03:14 +01:00
Luke Barnard
19bb879fbf
Handle only 1 room in the list
2017-06-09 10:54:42 +01:00
Luke Barnard
c7229967a6
Goto /home when forgetting the last room
2017-06-09 10:28:45 +01:00
Luke Barnard
a21b6e61a6
Default to home page when settings is closed
...
If the current room isn't set.
2017-06-09 10:08:26 +01:00
Richard van der Hoff
105c6b2b87
delint MatrixChat
...
once more. with feeling.
2017-06-09 03:09:03 +01:00
Richard van der Hoff
20bdae6079
delint UserSettings.js
2017-06-09 03:08:57 +01:00
Luke Barnard
ce0977373e
Merge pull request #1058 from matrix-org/luke/fix-event-id-state
...
Control currently viewed event via RoomViewStore
2017-06-08 18:10:29 +01:00
Luke Barnard
5588e115eb
Clarify doc for highlighted
2017-06-08 17:57:37 +01:00
Luke Barnard
9892566007
Highlighted means highlighted
2017-06-08 17:54:41 +01:00
Matthew Hodgson
df625b0d31
hit MemberInfo with Gemini to fix vector-im/riot-web#4223
2017-06-08 17:26:40 +01:00
Luke Barnard
c02dbd1cdc
Rename initial state variables
2017-06-08 17:26:08 +01:00
David Baker
3d59fe58dc
Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message
...
Better error messages for login
2017-06-08 16:57:40 +01:00
David Baker
5e55b6a643
PR feedback
2017-06-08 16:23:43 +01:00
David Baker
9def0bb5c2
Oops, fix email check
2017-06-08 16:08:19 +01:00
David Baker
8dc20606c8
Use comma for list of three things
2017-06-08 16:07:29 +01:00
Luke Barnard
000a045e35
Rename RVS state (event -> initialEvent) and redocument
2017-06-08 15:52:21 +01:00
David Baker
d691c891e7
Move all login error string generation into view
...
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
2017-06-08 15:49:48 +01:00
Luke Barnard
1792fa45f4
Null-guard roomId before sending a dispatch to update scroll state
...
Otherwise we pointlessly assign the null key to something
2017-06-08 15:45:50 +01:00
Luke Barnard
59e649f326
Add comment about roomId potentially not being resolved following an update from RoomViewStore
2017-06-08 15:43:45 +01:00
Luke Barnard
e58e4db628
Explain why search results are cleared when eventId changes
2017-06-08 15:38:58 +01:00
Luke Barnard
dca2be6325
Add RoomView initial state and docs
2017-06-08 15:37:30 +01:00
Luke Barnard
2e82bf40fb
Explain setting of highlighted in room/$eventId showScreen handling.
2017-06-08 15:34:20 +01:00
Luke Barnard
8ddc38c9b1
Doc _viewRoom highlighted
2017-06-08 15:32:31 +01:00
Luke Barnard
aa20ad706e
Remove redundant currentRoomAlias
2017-06-08 15:30:43 +01:00
Matthew Hodgson
f26aeef2bf
Merge pull request #1056 from matrix-org/kegan/translation-tamarin
...
Add remaining translations
2017-06-08 15:06:26 +01:00
Kegan Dougal
9baaf5499f
Linting
2017-06-08 14:58:54 +01:00
David Baker
71eb405859
Add comments & remove redundant check
2017-06-08 14:53:21 +01:00
Kegan Dougal
f2efdf8a4f
Review comments
2017-06-08 14:45:59 +01:00
David Baker
b40636a425
Merge pull request #1040 from ollieh/issues/1974
...
Added button that copies code to clipboard
2017-06-08 14:45:58 +01:00
Matthew Hodgson
c173861b27
Merge pull request #1021 from Bitim/feature/rtl-languages-support
...
Better RTL support
2017-06-08 14:43:18 +01:00
Kegan Dougal
e3ac78bd28
Self-review
2017-06-08 14:36:20 +01:00
Luke Barnard
ea97d16aa2
Merge branch 'develop' into luke/fix-event-id-state
...
Conflicts:
src/components/structures/MatrixChat.js
2017-06-08 14:33:58 +01:00
Luke Barnard
f320f7d475
Remove redundant action id
2017-06-08 14:30:45 +01:00
Matthew Hodgson
29e792b642
make mels emoji capable
2017-06-08 14:21:14 +01:00
Kegan Dougal
c57823a31d
Merge branch 'develop' into kegan/translation-tamarin
2017-06-08 14:19:56 +01:00
Luke Barnard
d3cf78ff5a
Control currently viewied event via RoomViewStore
...
Fix for https://github.com/vector-im/riot-web/issues/4224
Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).
This required a few changes:
- The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
- The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
2017-06-08 14:17:49 +01:00
David Baker
6d1fa775a0
Formatting
2017-06-08 14:14:45 +01:00
Kegan Dougal
00df956ca2
Add remaining translations!
...
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
2017-06-08 14:08:51 +01:00
Kegan Dougal
1c58a9cd5e
Everything but src/components/views/rooms
2017-06-08 12:33:29 +01:00
Matthew Hodgson
bc0eb4294c
rename welcome page to home
2017-06-08 10:27:35 +01:00
Kegan Dougal
0f4028da07
Add more translations..
2017-06-08 09:44:58 +01:00
Richard van der Hoff
566fb2caeb
Add some logging around switching rooms
...
... which I wish had been there when I was staring at a rageshake.
2017-06-07 22:41:02 +01:00
Matthew Hodgson
8228db88d2
oops, fix more i18n var name typos
2017-06-07 18:28:49 +01:00
Matthew Hodgson
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
David Baker
0370b7c5e8
Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite
...
Use user_directory endpoint to populate ChatInviteDialog
2017-06-07 18:06:35 +01:00
Luke Barnard
29da25529c
Make it backwards compatible
...
Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.
2017-06-07 17:53:58 +01:00
Luke Barnard
68ddf35db4
Use then, catch, done and display any errors that occur during search
2017-06-07 17:33:15 +01:00