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

3024 commits

Author SHA1 Message Date
David Baker
73471138f8 Merge pull request #1140 from turt2live/travis/more-12h 
Use 12h timestamps when enabled in RR
 2017-06-22 17:44:52 +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
turt2live
a22f14e910 Use 12h timestamps when enabled in RR 
Fixes vector-im/riot-web#4393 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-22 08:54:34 -06: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
Luke Barnard
2c2091438e Fix ability to invite users with caps in their user IDs 
By lowercasing only when testing against local user IDs/display names. The user_directory shouldn't care. And when we make the placeholder "We didn't get any results, but here's the user with the exact mxid you typed in", use the original query.
 2017-06-20 15:46:54 +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
Luke Barnard
f15292becf Merge branch 'develop' into luke/fix-email-cancel-button-text 2017-06-20 13:30: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
David Baker
b1ca83bb9d Internationalise the drop targets 
Unsure how these had got missed (and yet still had the translation
strings in the json)
 2017-06-19 17:49:22 +01:00
daniel tygel
13c12811e7 typo 2017-06-19 13:22:23 -03:00
daniel tygel
aebe4fb88f add two strings to translation 2017-06-19 13:21:23 -03:00
daniel tygel
c418076c32 add two strings to translation 2017-06-19 13:20:16 -03: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
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
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