mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 15:33:02 +03:00
Code Issues Projects Releases Packages Wiki Activity
6603 commits 219 branches 562 tags 474 MiB
Commit graph

1772 commits

Author SHA1 Message Date
Richard van der Hoff
1139dd2be5 Fix a flaky test in the timelinepanel code 
Sometimes it was possible for there to be a scroll event before the initial
pagination completed, which then upset the rest of the test. Just give it a few
ms to sort itself out instead.
 2017-07-11 17:34:46 +01:00
Richard van der Hoff
67372d4fed Give Login an unmounted guard 2017-07-11 17:04:19 +01:00
Luke Barnard
af3b6484cd Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview 
Add more features to Group View
 2017-07-11 17:03:47 +01:00
David Baker
ff3c21ef10 Lint, including putting key in right place 2017-07-11 15:16:58 +01:00
David Baker
8690ed2181 Make the category functions React components 2017-07-11 14:28:44 +01:00
David Baker
222ca054c5 Use PropTypes.shape to define our required inputs 2017-07-11 13:41:00 +01:00
Kegsay
cf158530f5 Implement new widget API (#1201) 
* Implement new widget API

This allows clients to see who provisioned which widgets.

* Update to make state_key the wid

* Update to latest API

* Only show widgets which have required fields

* Don't constantly show apps dialog

* Fix example to include data key
 2017-07-11 12:15:27 +01:00
David Baker
29990296d2 Lint 2017-07-11 11:02:23 +01:00
David Baker
925d5bd480 Add featured users to Group View 2017-07-10 19:32:02 +01:00
David Baker
0e67a9158c hide settings button until it's wired up 2017-07-10 15:32:57 +01:00
David Baker
048912a241 Remove commented ordering code 
No lomger needed now roosm come down in order
 2017-07-10 15:17:58 +01:00
David Baker
49ca29e422 Lint 2017-07-10 14:07:16 +01:00
David Baker
696c72be2b Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:03:30 +01:00
David Baker
1e713557bb PR feedback 2017-07-07 18:34:40 +01:00
David Baker
681fd512d7 Lint 2017-07-07 13:46:05 +01:00
David Baker
c1833f9833 Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview 2017-07-07 13:44:35 +01:00
David Baker
c21f90338d Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-07 12:02:15 +01:00
David Baker
bc8c2d442b WithMatrixClient -> withMatrixClient 
because we're using it as a function rather than a React component
 2017-07-07 11:34:20 +01:00
David Baker
183f45bc1f Fix lint errors 2017-07-07 10:41:59 +01:00
David Baker
45986306cc Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:32:37 +01:00
David Baker
1deb406294 Fix race 2017-07-07 10:12:06 +01:00
Luke Barnard
32a01b54b8 Merge branch 'develop' into erikj/group_server 2017-07-07 10:08:49 +01:00
David Baker
fa37d03db6 Improve the Group View page 
Show the rooms in the group in thir various categories, etc
 2017-07-06 19:13:14 +01:00
David Baker
8468a118b5 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-06-30 16:15:41 +01:00
David Baker
e5c1aeb14c Make the Groups page look more like the design 2017-06-30 13:59:49 +01:00
David Baker
3892362386 Make my groups page a bit saner 2017-06-29 18:30:16 +01:00
David Baker
84e13d5437 Add GroupAvatar to handle fallback images etc. 
And a few misc tidyups
 2017-06-29 17:51:38 +01:00
David Baker
d6ecec1987 Behave better on rooms with no avatar / name 
Also add translation strings
 2017-06-29 17:17:43 +01:00
David Baker
f99c540b3d Groups page / Create Group dialog 2017-06-29 17:03:05 +01:00
David Baker
a2ff289ed8 Add 'groups' page 2017-06-28 13:56:18 +01:00
Richard Lewis
ff1636aaf5 Simplify boolean assignment. 2017-06-28 12:21:05 +01:00
Richard Lewis
06dafdc099 Remove unused state variable. 2017-06-28 12:20:07 +01:00
Richard Lewis
bf2a4afce5 Change to allow setting of DEBUG at run-time. 2017-06-28 12:02:07 +01:00
Richard Lewis
8dfd047f03 Don't show widgets when editing room settings and lint fixes. 2017-06-27 17:39:29 +01:00
David Baker
aa7a113324 More PR feedback 2017-06-27 13:41:43 +01:00
David Baker
6c9716637e Fix linting errors 2017-06-27 13:13:00 +01:00
Richard Lewis
ad9a3d9ddc Remove unused case statement. 2017-06-27 11:55:32 +01:00
Richard Lewis
89f051e693 Fix automerge error. 2017-06-27 11:52:49 +01:00
David Baker
2aeaaf26ca remove inline css 2017-06-27 11:52:23 +01:00
Richard Lewis
ddc0da396d Merge in changes from develop 2017-06-27 11:44:36 +01:00
Richard Lewis
e343e99355 Cleaned up unused files and removed commented code 2017-06-27 11:28:38 +01:00
David Baker
971f7ad045 Fix avatars 2017-06-27 10:32:21 +01:00
David Baker
867b47f4a2 PR feedback: remove phases 2017-06-27 10:28:46 +01:00
David Baker
f0aaca0a31 Fix some PR feedback 2017-06-27 10:05:05 +01:00
David Baker
c033d5defd Missing React import 2017-06-27 09:58:29 +01:00
David Baker
09b1012388 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-26 17:49:06 +01:00
David Baker
812b3643de Add message for HSes that don't support groups 
Also add an unrelated missed translation
 2017-06-26 17:47:17 +01:00
David Baker
a26498bc6c Make 'group not found' work 2017-06-26 17:38:10 +01:00
Johannes Löthberg
48c32172fd TextualBody: only highlight code block if language was specified 
The highlight.js autodetection is finicky and often wrong, so disable
highlighting unless the language was explicitly specified, or if the
user has explicitly enabled it in the settings.

Fixes vector-im/riot-web#508.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-06-26 17:45:40 +02:00
Luke Barnard
f091d209b9 Merge branch 'develop' into luke/fix-rte-tab-complete-after-join 2017-06-26 09:39:49 +01:00
David Baker
f0f4a16e97 Translate autocomplete delay 2017-06-23 18:28:02 +01:00
Luke Barnard
ddb84f034e Update tab-complete state onRoom received after joining 
As opposed to doing it when the component mounts.

Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)
 2017-06-23 17:52:50 +01:00
Luke Barnard
89afcfd897 Linting 2017-06-23 17:35:07 +01:00
David Baker
2efa099de2 Use function from HTMLUtils for sanitizing 
Encapsulates things a little nicer
 2017-06-23 17:02:54 +01:00
Luke Barnard
87609582c6 Merge branch 'develop' into rte-fixes2 
Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js
 2017-06-23 15:30:06 +01:00
David Baker
8f3eb89f8b Fix potential race in setting client listeners 2017-06-23 10:48:21 +01:00
David Baker
75ef80ecd4 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-23 09:51:24 +01:00
David Baker
ac3e039e2a Merge pull request #1019 from matrix-org/t3chguy/updating_stuff 
manual check for updates
 2017-06-22 17:36:55 +01:00
Richard van der Hoff
fcd945afc2 Fix an incorrect console error 
... this error is thrown when registering as guest or loading from
localstorage, not when using tokenparams.
 2017-06-22 15:08:30 +01:00
David Baker
72e73c05ac Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout 
reset page subtitle and favicon on_logged_out
 2017-06-21 14:58:26 +01:00
David Baker
9ef9d09d44 Fix another race with first-sync 
Set the first sync variables in onWillStartClient, as they race if
set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124)
 2017-06-21 11:27:18 +01:00
Michael Telatynski
a2a26a9ac9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 18:43:50 +01:00
Matthew Hodgson
d441ba1fd0 Merge pull request #1129 from matrix-org/luke/fix-logout 
Don't allow UserSettings to render if !MatrixClientPeg.get()
 2017-06-20 18:43:33 +01:00
Michael Telatynski
7f6a252bcb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 18:39:59 +01:00
Richard van der Hoff
1cd152e5f7 Merge pull request #1130 from matrix-org/rav/log_fixes 
Various logging cleanups
 2017-06-20 17:55:07 +01:00
Richard van der Hoff
cd73139af5 Various logging cleanups 
* don't just log errors without any context as to where they came from or what
   they mean
 * avoid the use of '%s' and multi-argument console.log because it looks awful
   under karma.
 2017-06-20 17:38:02 +01:00
Luke Barnard
3320df4cdd Don't allow UserSettings to render if !MatrixClientPeg.get() 
Now that it has state that updates following the nulling of the MCP (userHasGeneratedPassword) we need to stop it from rendering if the MCP is null.

Fixes https://github.com/vector-im/riot-web/issues/4319
 2017-06-20 17:13:06 +01:00
Michael Telatynski
b712a15a14 move in case it is racey ---- somehow? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-20 16:15:42 +01:00
Michael Telatynski
04aed416d2 Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/MatrixChat.js
 2017-06-20 15:37:05 +01:00
Michael Telatynski
5460b0f5b2 reset page subtitle on_logged_out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-20 15:31:12 +01:00
Luke Barnard
c337485d90 Redesign the warning to be red text, move below "Sign out" 2017-06-20 15:01:53 +01:00
David Baker
a2dc17256a Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff 2017-06-20 13:44:27 +01:00
Luke Barnard
4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning 2017-06-20 13:40:34 +01:00
Richard van der Hoff
0c431887b0 Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests 
Pop up a dialog when we get a room key request
 2017-06-20 13:20:58 +01:00
David Baker
e15aedfeb2 Fix another infinite spin on register 
Don't set ready on logging_in, set it before we start the client,
as commented
 2017-06-20 12:03:37 +01:00
Luke Barnard
e16d1b3cfb Implement password nag warning in user settings account section 
"To return to your account in future you need to set a password" in the account section when a user has not yet set a password (is a PWLU).
 2017-06-20 11:22:07 +01:00
Richard van der Hoff
a0534e7477 Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-20 00:25:14 +01:00
Richard van der Hoff
3a6dabdc08 Merge pull request #1116 from matrix-org/rav/no_more_guestcreds 
Get rid of guestCreds
 2017-06-19 14:34:12 +01:00
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
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
8e8af5eb5c Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server 2017-06-16 15:59:18 +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
Michael Telatynski
8c333dc3f7 remove debug and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 14:39:31 +01:00
David Baker
236cf1efb2 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-16 14:19:54 +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
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
Michael Telatynski
f0f721aa32 make hiding redactions use new pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:22:38 +01:00
Michael Telatynski
cebb7182f0 try to make hiding events work with read markers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:17:59 +01:00
Michael Telatynski
a097357baf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part 2017-06-15 20:10:32 +01:00
Michael Telatynski
c53fb08453 pass user settings from above 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:02:17 +01:00
Michael Telatynski
4b34a2b169 modernize imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:57:48 +01:00
Michael Telatynski
a0a4fe62d5 make hide joins/parts work for MELS and highlighted/permalink event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:53:34 +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
David Baker
8f9bf5f093 Merge branch 'develop' into erikj/group_server 2017-06-15 14:19:46 +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
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
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
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
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
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
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
Richard Lewis
876899948f Merge in upstream changes 2017-06-13 11:44:23 +01:00
Richard Lewis
2da30137ec Fix import path and add LG widget 2017-06-13 10:31:16 +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
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
Michael Telatynski
c1cbdbcc4f Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
 2017-06-12 13:22:52 +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
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
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
Luke Barnard
c02dbd1cdc Rename initial state variables 2017-06-08 17:26:08 +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
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
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
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
ef2fedc3a9 fix missing translations and typos in i18n 2017-06-07 18:24:35 +01:00
Richard van der Hoff
27e5098e00 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-07 15:44:33 +01:00
Richard Lewis
a09001933a git status 2017-06-07 15:39:27 +01:00
Richard van der Hoff
c1151fd31c Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-07 15:37:38 +01:00
Luke Barnard
53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
David Baker
1dbdbc163b Cancel 'join room' action if 'log in' is clicked 
or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes https://github.com/vector-im/riot-web/issues/4217
 2017-06-07 11:55:24 +01:00
Kegan Dougal
4127e7121c Translate src/components/structures 
Includes some pluralisation! Tested them manually to make sure they work.
 2017-06-07 11:40:46 +01:00
Richard Lewis
c552f7f336 App icon styling 2017-06-07 10:55:49 +01:00
Oliver Hunt
3d59d72aaa Fixed pagination infinite loop caused by long messages 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-07 04:49:41 +01:00
Richard Lewis
f6f660fa9a Initial app icon tiles 2017-06-06 23:45:17 +01:00
Matthew Hodgson
184c2d5e58 Merge pull request #1015 from matrix-org/t3chguy/random_fix_1 
fix copy and paste derp and rip out unused imports
 2017-06-06 18:02:35 +01:00
David Baker
9f15e8e152 Merge branch 'master' into develop 2017-06-06 17:41:05 +01:00
David Baker
00ccf4bb51 Revert "Call MatrixClient.clearStores on logout" 
This reverts commit c3d37c1ff9.

This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
 2017-06-06 17:33:50 +01:00
Luke Barnard
205fd1fad4 Allow password reset when logged in 2017-06-06 17:22:49 +01:00
David Baker
c27f50207d comment 2017-06-06 11:43:07 +01:00
David Baker
12d2480916 Reset 'first sync' flag / promise on log in 
Otherwise on any logins after the first,we always think the first
sync has completed.
 2017-06-06 11:36:33 +01:00
David Baker
f8198ba9c9 Merge branch 'develop' into new-guest-access 2017-06-06 10:33:01 +01:00
Matthew Hodgson
ed7c138d91 quick and dirty override to disable MD globally 2017-06-05 21:38:25 +01:00
David Baker
a99f6525c9 Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action 
Cancel deferred actions
 2017-06-05 21:27:13 +01:00