f88ba9df11
fix comment & use room.getUnfilteredTimelineSet()
2016-09-08 14:38:34 +01:00
c882d66b0d
make NotificationPanel work
2016-09-08 03:02:31 +01:00
7174648f94
don't show RRs if manageRRs is false
2016-09-08 03:01:38 +01:00
334564c814
unbreak tests
2016-09-07 22:54:38 +01:00
8f75bce29e
add fixmes
2016-09-07 22:54:37 +01:00
990d84df77
make FilePanel refresh when we switch rooms
2016-09-07 22:54:37 +01:00
e7074ef9af
apply FilePanel css and fix filtering
2016-09-07 22:54:37 +01:00
e5dd2e0b46
make FilePanel work, superficially at least
2016-09-07 22:54:37 +01:00
e22d0a53b6
WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets
2016-09-07 22:54:37 +01:00
c3de035964
filepanel
2016-09-07 22:54:37 +01:00
ae34f2ed5c
placeholder NotificationPanel
2016-09-07 22:53:15 +01:00
d9ffe30a0d
WIP notif panel
2016-09-07 22:53:15 +01:00
7dfb8857d8
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-07 17:22:10 +01:00
df1cc8748f
Change references to MatrixTools to Rooms
...
or remove where they were unused
2016-09-07 11:33:58 +01:00
d9c6448a0f
Adding better deafults and ErrorDialog message
2016-09-05 14:29:21 +01:00
9c0f51fb82
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:06:31 +01:00
ca443e01d8
Initial commit of the new ChatInviteDialog
2016-09-05 12:03:16 +01:00
67c623d410
Rename the action to make it clearer what it is doing
2016-09-05 10:29:03 +01:00
b5f9c2a5ac
Merge branch 'master' into develop
2016-09-02 17:17:24 +01:00
d5062f1ff7
gah, revert debug
2016-09-02 17:15:21 +01:00
fd664e893f
Merge branch 'master' into develop
2016-09-02 17:14:24 +01:00
6de2e8bda5
update changelog
2016-09-02 17:13:52 +01:00
b4521bc44c
review feedback
2016-09-01 22:45:09 +01:00
e7d4ef74d0
Placeholder for one to one chat dialog and functionality
2016-09-01 16:45:24 +01:00
ba341c11fb
Show session restore errors on the login screen
...
If we are unable to load the matrix session on startup, don't just get stuck at
a spinner; instead, show the error on the login screen.
2016-09-01 11:08:40 +01:00
769e7d3b2e
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-30 11:19:54 +01:00
5e105e1be6
make /user URLs work
2016-08-28 14:04:11 +01:00
de82ac3bc0
don't change URL bar when clicking on linkified rooms or users.
...
be aware of /user paths.
2016-08-28 02:05:31 +01:00
ad873c2b60
handle matrix.to links correctly. add partial support for #/user URLs
2016-08-28 01:55:42 +01:00
c1db6fb42d
Merge pull request #429 from matrix-org/rav/timelinepanel_test
...
Update annoying TimelinePanel test
2016-08-25 15:40:03 +01:00
ae910d82a8
Merge pull request #416 from aviraldg/feature-changelog
...
add fancy changelog dialog
2016-08-24 18:01:39 +01:00
cdd2902b01
Update annoying TimelinePanel test
...
* Actually test what we were supposed to be testing (viz, that we can paginate
back down after we hit the top of the room)
* Make the cap on the number of events we show in the timeline a configurable
property, so that we can set it in the test
* Use a smaller cap in the test, so that we have to do less paginating to hit
the cap, to make the test run quicker.
* add some more logging so that we can see how far it's got if it gets stuck.
2016-08-24 16:28:00 +01:00
6a4d02ffc5
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 12:49:21 +01:00
6d1f9003e2
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 10:52:50 +01:00
ddda435e9e
Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not
2016-08-18 22:15:53 +01:00
ff39d52431
add fancy changelog dialog
2016-08-16 03:33:47 +05:30
5a83adc2b6
Merge pull request #414 from matrix-org/rav/fix_device_display_name
...
defaultDeviceDisplayName should be a prop
2016-08-12 11:44:57 +01:00
b9870f2c23
defaultDeviceDisplayName should be a prop
...
... not a bit of config.
2016-08-12 11:41:45 +01:00
33e9abe421
Merge pull request #410 from matrix-org/rav/use_server_device_id
...
Use server-generated deviceId
2016-08-12 11:40:55 +01:00
a29325cc46
Set initial_device_display_name on login and register
...
Let Vector pass in a default device name, and thread it through everywhere to
set it on login and register calls
2016-08-12 10:55:02 +01:00
df22768f1b
Use server-generated deviceId
2016-08-12 07:31:15 +01:00
434115ccda
Bugifx: 'background-color' in react should be 'backgroundColor'
2016-08-11 17:34:05 +01:00
e32c325863
Don't use MatrixClientPeg for temporary clients
...
Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local,
temporary MatrixClients for the unauthed steps; we therefore only use
MatrixClientPeg for logged-in clients.
2016-08-11 16:23:03 +01:00
3704e2c648
Merge pull request #402 from matrix-org/wmwragg/room-tag-menu
...
Wmwragg/room tag menu
2016-08-11 08:59:32 -05:00
e06763d421
Move guest registration into the login logic
2016-08-11 13:05:16 +01:00
bbfb9291f8
Refactor login token
...
move the logic for handling login tokens into Lifecycle.loadSession
This means it needs access to the (real) query parmeters, so it depends on
corresponding changes in vector-web.
2016-08-11 11:02:52 +01:00
6802db05bd
Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login
...
Use the current HS for guest login
2016-08-11 10:32:37 +01:00
46899a0086
Merge pull request #395 from aviraldg/fix-emoji
...
Various fixes and improvements to emojification.
2016-08-11 10:23:00 +01:00
4c1dcb924b
reskindex and use sdk.getComponent for EmojiText
2016-08-11 07:55:12 +05:30
1fbddcf6af
Use the current HS for guest login
...
Make sure that we use the homeserver from localstorage for guest regsistration,
in preference to the default.
Also rename the parameters for loadSession
2016-08-11 01:39:33 +01:00
e2d3631e7c
Menu colour now changeable, and leave room item hooked up
2016-08-10 16:34:49 +01:00
f08519a496
Merge pull request #401 from matrix-org/rav/avoid_login_for_guest
...
Avoid flashing up login screen during guest registration
2016-08-10 15:38:34 +01:00
68f8db3834
Avoid flashing up login screen during guest registration
...
Fix a bug where we would flash up the login screen during guest registration if
you followed a room link.
2016-08-10 14:34:44 +01:00
8fe470bce1
Cancel calls to rate-limited funcs on unmount
...
The tests were throwing up warnings about state being accessed, and null
MatrixClients being called, after component unmount.
2016-08-10 13:39:47 +01:00
e0f71977b4
Merge pull request #397 from matrix-org/rav/factor_out_sessionloader
...
Start to factor out session-loading magic
2016-08-10 11:40:58 +01:00
26c7c9e994
Make SessionLoader a function
...
There's no point in it being a React component.
2016-08-10 11:36:26 +01:00
13a4bfa8fe
Merge pull request #396 from matrix-org/rav/fix_react_warning
...
Hack around a react warning
2016-08-10 10:09:18 +01:00
24841cc5c4
Start to factor out session-loading magic
...
Take some of the magic out of MatrixChat.componentDidMount() into a new
component.
Also delete the MatrixChat test. It wasn't really doing much, is broken by the
change, and I am replacing it with (better) app-level tests in the vector
project.
2016-08-10 00:05:44 +01:00
a1d3db76e5
Hack around a react warning
...
when login completes, we replace the whole state, which means we unset
collapse_lhs, which then leads to complaints from the RoomList.
I think the 'default view' for MatrixChat ought to be factored out to another
component, which could manage collapse_lhs properly; but for now, hack around
it.
2016-08-09 23:57:36 +01:00
09e8a45cde
Add EmojiText component for emoji replacement.
2016-08-10 00:31:51 +05:30
dbbea63227
Various fixes and improvements to emojification.
...
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Add emoji shortcodes as titles
2016-08-09 22:09:28 +05:30
4b8ad3c102
Merge pull request #393 from matrix-org/dbkr/enable_labs
...
Add config to hide the labs section
2016-08-05 17:25:25 +01:00
5e358b8cf6
Add comment
2016-08-05 17:18:45 +01:00
f8d02c1551
pr feedback
2016-08-05 16:36:35 +01:00
e8ee5c2f96
Add config to hide the labs section
2016-08-05 16:13:06 +01:00
98e89d4293
Merge pull request #392 from matrix-org/dbkr/scalar
...
Dbkr/scalar
2016-08-05 15:43:57 +01:00
e8dbf978c3
Merge pull request #388 from matrix-org/dbkr/refactor_field_errors
...
Refactor UI error effects
2016-08-05 12:34:56 +01:00
d0158f5812
fix merge conflict
2016-08-04 23:45:28 +01:00
cf70f1731e
hide integration management behind labs checkbox
2016-08-04 23:26:27 +01:00
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
90e5ab2ca3
merge in develop
2016-08-04 13:39:47 +01:00
498ad7fa4c
Merge branch 'develop' into dbkr/deactivate_account
2016-08-03 17:52:18 +01:00
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
bb3a7725db
Shift loginIncorrect into state
...
and consequently make setErrorTextFromError into setStateFromError
2016-08-03 17:49:29 +01:00
476f69cbec
Unused ref
2016-08-03 17:38:13 +01:00
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
f95a11a9bf
Merge pull request #369 from matrix-org/wmwragg/mention-state-menu
...
Wmwragg/mention state menu
2016-08-03 15:22:39 +01:00
f8201ac2ea
Merge branch 'dbkr/use_logout_api' into dbkr/deactivate_account
2016-08-03 11:39:22 +01:00
f47ac87775
Don't show deactivate button for guests
2016-08-03 11:34:31 +01:00
d9a7d50a03
Add an interface for MatrixClientCreds
...
and make MatrixClientPeg functions use it consistently
2016-08-03 10:46:42 +01:00
cf7e7d65c8
Don't start the client twice
...
if we have a guest_access_token
2016-08-03 10:15:50 +01:00
e3a5776eae
We should clear /login off the URL after login
2016-08-03 09:57:12 +01:00
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
0c2bd10594
Comment functions
2016-08-02 19:05:05 +01:00
0c61c52480
Just use Lifecycle.setLoggedIn
2016-08-02 19:02:07 +01:00
d74a8e405d
Remove unused function
2016-08-02 19:00:01 +01:00
65865f879f
We already know we're a guest here
2016-08-02 18:59:09 +01:00
58bbb35096
s/login/setLoggedIn/
2016-08-02 18:48:27 +01:00
3818a89ca3
Comment guestCreds
2016-08-02 18:46:43 +01:00
54c10a5d89
Get name of section right
2016-08-02 18:42:02 +01:00
aafec49abf
WIP for deactivaing account UI
...
https://github.com/vector-im/vector-web/issues/1775
2016-08-02 18:40:12 +01:00
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
c071bc54f9
Implement device management UI
...
View/rename/delete.
2016-08-01 13:42:29 +01:00
cf22a5fecc
Merge up from develop
2016-07-30 12:10:43 +01:00
94350bc780
Fixed spelling mistake
2016-07-28 15:51:46 +01:00
bc902a9741
Tidy up of the contextual menu refactor
2016-07-28 14:32:59 +01:00
8246d9148c
Initial context menu with all it's elements
2016-07-27 17:43:48 +01:00
6e7e091117
Refactor so that chevron and menu can be positioned independantly
2016-07-27 16:09:07 +01:00
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
0660b9feff
Fixes to properly point to the moved components
2016-07-27 14:49:10 +01:00
3df746ef14
Revert merge up from develop
2016-07-27 14:16:17 +01:00
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
4b26ac58af
Re-modularised the context menus
2016-07-27 10:41:24 +01:00
09993cd3bc
Add comment back
2016-07-26 18:19:25 +01:00
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
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
030652f289
Add removeLisatener for account data listener
2016-07-21 13:49:31 +01:00
165b0810cc
remove debug
2016-07-20 18:17:09 +01:00
bc87fc575b
remove debug
2016-07-20 18:16:54 +01:00
d6415aceca
handle accountData changes, and errors on toggling URL previews
2016-07-20 18:14:16 +01:00
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
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
1365f18829
many stupid thinkos and bugfixes; make it work
2016-07-20 12:03:13 +01:00
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
6bf5499289
typos
2016-07-18 10:47:03 +01:00
f13bb5f656
typos
2016-07-18 01:39:24 +01:00
ebdac4ee50
first cut (untested)
2016-07-18 01:35:42 +01:00
a385955c6b
Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it.
2016-07-17 21:23:52 +01:00
5c566cae5c
typo
2016-07-15 18:10:56 +01:00
ccf8e269cd
Comments & required props
2016-07-15 17:15:51 +01:00
327015ba0f
Tidy up autocomplete updating
...
..into a function
2016-07-15 17:03:53 +01:00
7d712d06a1
Move code to make diff less confusing
2016-07-15 16:14:05 +01:00
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
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
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
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
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
345ed04ba9
Less enetering
2016-07-07 13:03:27 +01:00
a6b04c462e
Comment how we're remembering form vals
2016-07-07 11:26:35 +01:00
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
30b7efd585
fix: code cleanup, fix getCurrentCommand
2016-07-04 21:44:35 +05:30
cd928fe6f5
Merge remote-tracking branch 'upstream/develop' into feature-autocomplete
2016-07-03 00:00:02 +05:30
e8337b2119
More PR feedback
2016-06-28 17:11:47 +01:00
548c392236
PR feedback
2016-06-28 14:59:45 +01:00
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
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
5195140ff8
reposition Login spinner
2016-06-21 19:50:03 +01:00
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
d3265ab970
Redundant getDeafultHs()
...
This now can never be falsey so no point checking it
2016-06-21 17:46:55 +01:00
213e284edf
Fix https://github.com/vector-im/vector-web/issues/1679
2016-06-21 11:05:37 +01:00
442291c0a4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete
2016-06-21 04:09:22 +05:30
fc06ebcc63
Fix view_next_room
2016-06-20 18:43:56 +01:00
4c214119b2
Fix PR feedback
2016-06-20 18:05:58 +01:00
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
4af983ed90
Style changes and improvements in autocomplete
2016-06-20 13:52:55 +05:30
94aec10512
Merge branch 'develop' into dbkr/scalar
2016-06-19 22:40:48 +01:00
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
f6835baa9c
UserSettings: fix the displayed version of the react-sdk
2016-06-17 17:09:52 +01:00
6adce649eb
Use the first alias is there's no canonical alias
2016-06-17 16:56:34 +01:00
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
Matthew Hodgson