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

737 commits

Author SHA1 Message Date
David Baker
f8d02c1551 pr feedback 2016-08-05 16:36:35 +01:00
David Baker
e8ee5c2f96 Add config to hide the labs section 2016-08-05 16:13:06 +01:00
David Baker
98e89d4293 Merge pull request #392 from matrix-org/dbkr/scalar 
Dbkr/scalar
 2016-08-05 15:43:57 +01:00
Richard van der Hoff
e8dbf978c3 Merge pull request #388 from matrix-org/dbkr/refactor_field_errors 
Refactor UI error effects
 2016-08-05 12:34:56 +01:00
Matthew Hodgson
d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson
cf70f1731e hide integration management behind labs checkbox 2016-08-04 23:26:27 +01:00
David Baker
1f2b023885 Make sure error message never lies 
Make sure we don't say 'login incorrect' unless the user is actually trying to log in
 2016-08-04 17:37:07 +01:00
Matthew Hodgson
90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
David Baker
498ad7fa4c Merge branch 'develop' into dbkr/deactivate_account 2016-08-03 17:52:18 +01:00
David Baker
cbfb0ad998 Merge pull request #377 from matrix-org/dbkr/use_logout_api 
Call the logout API when we log out
 2016-08-03 17:51:42 +01:00
David Baker
bb3a7725db Shift loginIncorrect into state 
and consequently make setErrorTextFromError into setStateFromError
 2016-08-03 17:49:29 +01:00
David Baker
476f69cbec Unused ref 2016-08-03 17:38:13 +01:00
David Baker
f469bbbb64 Refactor UI error effects 
And add error effects to the login page to be consistent with the registration page
 2016-08-03 15:59:17 +01:00
Matthew Hodgson
f95a11a9bf Merge pull request #369 from matrix-org/wmwragg/mention-state-menu 
Wmwragg/mention state menu
 2016-08-03 15:22:39 +01:00
David Baker
f8201ac2ea Merge branch 'dbkr/use_logout_api' into dbkr/deactivate_account 2016-08-03 11:39:22 +01:00
David Baker
f47ac87775 Don't show deactivate button for guests 2016-08-03 11:34:31 +01:00
David Baker
d9a7d50a03 Add an interface for MatrixClientCreds 
and make MatrixClientPeg functions use it consistently
 2016-08-03 10:46:42 +01:00
David Baker
cf7e7d65c8 Don't start the client twice 
if we have a guest_access_token
 2016-08-03 10:15:50 +01:00
David Baker
e3a5776eae We should clear /login off the URL after login 2016-08-03 09:57:12 +01:00
David Baker
4825ab8fe7 No need to set options in WillStartClient 
We can set them any time up to that point
 2016-08-03 09:53:02 +01:00
David Baker
0c2bd10594 Comment functions 2016-08-02 19:05:05 +01:00
David Baker
0c61c52480 Just use Lifecycle.setLoggedIn 2016-08-02 19:02:07 +01:00
David Baker
d74a8e405d Remove unused function 2016-08-02 19:00:01 +01:00
David Baker
65865f879f We already know we're a guest here 2016-08-02 18:59:09 +01:00
David Baker
58bbb35096 s/login/setLoggedIn/ 2016-08-02 18:48:27 +01:00
David Baker
3818a89ca3 Comment guestCreds 2016-08-02 18:46:43 +01:00
David Baker
54c10a5d89 Get name of section right 2016-08-02 18:42:02 +01:00
David Baker
aafec49abf WIP for deactivaing account UI 
https://github.com/vector-im/vector-web/issues/1775
 2016-08-02 18:40:12 +01:00
David Baker
db9750a7e3 Call the logout API when we log out 
Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient.
 2016-08-02 14:04:20 +01:00
Richard van der Hoff
c071bc54f9 Implement device management UI 
View/rename/delete.
 2016-08-01 13:42:29 +01:00
wmwragg
cf22a5fecc Merge up from develop 2016-07-30 12:10:43 +01:00
wmwragg
94350bc780 Fixed spelling mistake 2016-07-28 15:51:46 +01:00
wmwragg
bc902a9741 Tidy up of the contextual menu refactor 2016-07-28 14:32:59 +01:00
wmwragg
8246d9148c Initial context menu with all it's elements 2016-07-27 17:43:48 +01:00
wmwragg
6e7e091117 Refactor so that chevron and menu can be positioned independantly 2016-07-27 16:09:07 +01:00
David Baker
cf3cd69f37 Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate 
Remove relayoutOnUpdate prop on gemini-scrollbar
 2016-07-27 15:21:46 +01:00
wmwragg
0660b9feff Fixes to properly point to the moved components 2016-07-27 14:49:10 +01:00
wmwragg
3df746ef14 Revert merge up from develop 2016-07-27 14:16:17 +01:00
Richard van der Hoff
c8df9148b3 Remove relayoutOnUpdate prop on gemini-scrollbar 
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
 2016-07-27 11:35:48 +01:00
wmwragg
4b26ac58af Re-modularised the context menus 2016-07-27 10:41:24 +01:00
David Baker
09993cd3bc Add comment back 2016-07-26 18:19:25 +01:00
David Baker
31399254b6 Fix onRoomStateMember debouncing 
Don't have debounced functions take arsg, because they won't be the same for each invocation.
 2016-07-26 18:15:26 +01:00
David Baker
4ecf5f6372 Fix bug where vector freezes on power level event 
Make rate_limited_function accept functions with args so we can just ratelimit the event handler & be done with it.

Fixes https://github.com/vector-im/vector-web/issues/1877
 2016-07-26 17:58:19 +01:00
David Baker
030652f289 Add removeLisatener for account data listener 2016-07-21 13:49:31 +01:00
Matthew Hodgson
165b0810cc remove debug 2016-07-20 18:17:09 +01:00
Matthew Hodgson
bc87fc575b remove debug 2016-07-20 18:16:54 +01:00
Matthew Hodgson
d6415aceca handle accountData changes, and errors on toggling URL previews 2016-07-20 18:14:16 +01:00
David Baker
fb964be072 Merge pull request #356 from matrix-org/matthew/disable-url-previews 
Support for disabling/enabling URL previews per-user, per-room and per-user-per-room
 2016-07-20 16:43:08 +01:00
David Baker
02e2ade7d9 Merge pull request #336 from matrix-org/dbkr/add_email_fail_if_in_use 
Use HS proxy API for requestToken on adding email
 2016-07-20 14:05:58 +01:00
Matthew Hodgson
1365f18829 many stupid thinkos and bugfixes; make it work 2016-07-20 12:03:13 +01:00
David Baker
514bc2cd51 Merge pull request #341 from matrix-org/dbkr/tab_complete_most_recently_spoke 
Order tab complete by most recently spoke
 2016-07-19 18:02:09 +01:00
Matthew Hodgson
6bf5499289 typos 2016-07-18 10:47:03 +01:00
Matthew Hodgson
f13bb5f656 typos 2016-07-18 01:39:24 +01:00
Matthew Hodgson
ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +01:00
wmwragg
a385955c6b Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it. 2016-07-17 21:23:52 +01:00
David Baker
5c566cae5c typo 2016-07-15 18:10:56 +01:00
David Baker
ccf8e269cd Comments & required props 2016-07-15 17:15:51 +01:00
David Baker
327015ba0f Tidy up autocomplete updating 
..into a function
 2016-07-15 17:03:53 +01:00
David Baker
7d712d06a1 Move code to make diff less confusing 2016-07-15 16:14:05 +01:00
David Baker
d5bed78a54 Rejig tab complete to make it faster 
Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView.
 2016-07-15 16:10:27 +01:00
David Baker
f1d72296b7 Fix last-spoke order 
Turns out this timeline is the other way around, so loop through the other way
 2016-07-14 14:06:31 +01:00
David Baker
0dde891d4c Order tab complete by most recently spoke 
Fixes https://github.com/vector-im/vector-web/issues/1741
 2016-07-14 11:25:45 +01:00
David Baker
ac58520b3b Update tab completion list when we have a room 
Fixes https://github.com/vector-im/vector-web/issues/1737
 2016-07-12 18:30:37 +01:00
David Baker
b78340ff51 Use HS proxy API for requestToken on adding email 
So we report an error if the email is already taken. Also fix a bug where the spinner wouldn't disappear if adding an email failed (and don't include the raw errcode in the user-facing dialog)
 2016-07-08 17:28:04 +01:00
David Baker
345ed04ba9 Less enetering 2016-07-07 13:03:27 +01:00
David Baker
a6b04c462e Comment how we're remembering form vals 2016-07-07 11:26:35 +01:00
David Baker
e2c473b366 Error on registration if email taken 
Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername.
 2016-07-06 15:22:06 +01:00
Aviral Dasgupta
30b7efd585 fix: code cleanup, fix getCurrentCommand 2016-07-04 21:44:35 +05:30
Aviral Dasgupta
cd928fe6f5 Merge remote-tracking branch 'upstream/develop' into feature-autocomplete 2016-07-03 00:00:02 +05:30
David Baker
e8337b2119 More PR feedback 2016-06-28 17:11:47 +01:00
David Baker
548c392236 PR feedback 2016-06-28 14:59:45 +01:00
David Baker
98c03869a7 Display an error message if room not found 
Fixes https://github.com/vector-im/vector-web/issues/1012
 2016-06-24 15:34:07 +01:00
Richard van der Hoff
e046f5359f CreateRoom: remove reference to encryption module 
The CreateRoom structure isn't currently used, but contained a reference to the
(now defunct) encryption module; remove the reference for now.
 2016-06-23 14:08:45 +01:00
Matthew Hodgson
5195140ff8 reposition Login spinner 2016-06-21 19:50:03 +01:00
Richard van der Hoff
2ddfccdab3 Merge pull request #318 from matrix-org/dbkr/fix_default_hs 
Fix https://github.com/vector-im/vector-web/issues/1679
 2016-06-21 17:55:27 +01:00
David Baker
d3265ab970 Redundant getDeafultHs() 
This now can never be falsey so no point checking it
 2016-06-21 17:46:55 +01:00
David Baker
213e284edf Fix https://github.com/vector-im/vector-web/issues/1679 2016-06-21 11:05:37 +01:00
Aviral Dasgupta
442291c0a4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete 2016-06-21 04:09:22 +05:30
David Baker
fc06ebcc63 Fix view_next_room 2016-06-20 18:43:56 +01:00
David Baker
4c214119b2 Fix PR feedback 2016-06-20 18:05:58 +01:00
David Baker
d8dedae084 Fix /join to be consistent with the other code 
Plus a number of other tidyups:

 * Fix /join to dispatch a view_room for the room alias
   with the additional auto_join parameter
 * Make RoomView automatically join the room if the auto_join
   parameter is true and the user isn't already in it
 * Tidy up RoomView's peeking code, also fixing
   https://github.com/vector-im/vector-web/issues/1220
   in react-sdk (although it still requires a synapse change
   to actually fix, but react-sdk does 'the right thing').
 * Remove duplication of usage text from /join command
 * Amalgamate MatrixChat::_viewRoom's many, many parameters
   into an object and sort out case consistency a little.
 2016-06-20 16:30:51 +01:00
Aviral Dasgupta
4af983ed90 Style changes and improvements in autocomplete 2016-06-20 13:52:55 +05:30
Matthew Hodgson
94aec10512 Merge branch 'develop' into dbkr/scalar 2016-06-19 22:40:48 +01:00
David Baker
8103a795ec Merge pull request #316 from matrix-org/rav/fix_react_version_number 
UserSettings: fix the displayed version of the react-sdk
 2016-06-17 17:13:35 +01:00
Richard van der Hoff
f6835baa9c UserSettings: fix the displayed version of the react-sdk 2016-06-17 17:09:52 +01:00
David Baker
6adce649eb Use the first alias is there's no canonical alias 2016-06-17 16:56:34 +01:00
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
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
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
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
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
David Baker
b60ab9d695 Remove XXX now it's fixed (yay!) 2016-06-09 18:50:18 +01:00