c362d4ff01
Added updating of count when room tile notification state changed
2016-08-23 12:40:28 +01:00
9162a0ff01
Add postMessage API required for integration provisioning
...
Supports querying member state and creating invites only.
2016-08-23 12:00:11 +01:00
6d1f9003e2
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 10:52:50 +01:00
884abbd7e9
Cleanup autocomplete
2016-08-23 00:36:31 +05:30
edb7301b37
Moving the drirect messages above rooms
2016-08-22 14:10:51 +01:00
48a2567b82
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:19:30 +01:00
993333490d
Removal of the mini avatars for action (info) messages
2016-08-19 16:38:05 +01:00
afd1ab1582
Comment to describe what info messages are
2016-08-18 22:19:23 +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
a55c4a2a52
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
2016-08-18 21:53:37 +01:00
5495cfaca9
Only try to delete room rule if it exists
2016-08-18 16:59:25 +01:00
e29be619c9
Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:23:45 +01:00
d08f716681
Comment override rule stuff
2016-08-18 15:21:46 +01:00
fc2c62e896
We can use the new consts here
2016-08-18 15:19:24 +01:00
bab2f23db3
Oops, missed a constant
2016-08-18 15:18:02 +01:00
af48b8920e
Various PR feedback
2016-08-18 14:00:14 +01:00
9e45279894
Use enumalike thing
2016-08-18 13:44:58 +01:00
73e486cc58
Hide red highlight badge in mute mode
2016-08-18 11:58:27 +01:00
dd088794c2
Remove the mute toggle from room settings
...
As it now incorrectly represents the mute as a binary toggle rather than a quad-state
2016-08-17 18:50:34 +01:00
87f94bde62
Fix up notification setting listener in roomtile
...
The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere.
Also add util functions used here for getting the notif state and in vector for both getting and setting it.
2016-08-17 18:26:37 +01:00
46d306a217
Change register response access_token to scalar_token
2016-08-17 17:16:19 +01:00
69e8cb6f44
Merge branch 'rav/no_deviceload_if_disabled' into develop
2016-08-17 14:41:18 +01:00
0356f04b9c
MemberInfo: initialise _enableDevices in componentWillMount
...
... to avoid referencing it in render() before it is set
2016-08-17 14:40:10 +01:00
e173900808
Update autocomplete design and scroll it correctly
2016-08-17 17:27:19 +05:30
30168a1b9c
Don't download E2E devices if feature disabled
...
If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
2016-08-17 09:57:06 +01:00
52f5061cc5
Made the menu button a clickable image rather than an input element
2016-08-16 17:34:33 +01:00
58d9789645
Increase main avatar size
2016-08-16 16:03:34 +01:00
8e8e6fd5fe
formatTime for use with new timestamp format
2016-08-16 15:01:01 +01:00
c359358101
Initial context menu positioning and style change
2016-08-16 11:59:26 +01:00
6fd61f5816
Initial reposition of the timestamp
2016-08-16 10:26:27 +01:00
8777780928
strip (IRC) suffix from tabcomplete entries
...
fixes vector-im/vector-web#574
2016-08-16 03:50:59 +05:30
ff39d52431
add fancy changelog dialog
2016-08-16 03:33:47 +05:30
2a3b0e85ea
add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/
2016-08-15 21:37:26 +01:00
534d996582
ignore local busy - workaround for https://github.com/vector-im/vector-web/issues/1964
2016-08-15 16:17:35 +01:00
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
5fc98ffc49
Avoid setting device_id to 'undefined'
...
Deal with the situation where synapse doesn't give us a device_id on login:
don't set the device_id to 'undefined' in localstorage.
2016-08-12 11:22:04 +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
cb905dbaef
Merge pull request #409 from matrix-org/rav/device_panel_stuff
...
Add device_id to devices display
2016-08-12 10:43:44 +01:00
5f61464195
Merge pull request #408 from matrix-org/rav/refactor_matrix_client
...
Don't use MatrixClientPeg for temporary clients
2016-08-12 10:42:58 +01:00
fc0c5a5c58
Tidy up fix to multi-invite
2016-08-12 10:02:55 +01:00
df22768f1b
Use server-generated deviceId
2016-08-12 07:31:15 +01:00
d1eec57118
fix inviting some more
2016-08-11 17:11:51 -05:00
3bedad69cd
unbreak inviting :(
2016-08-11 17:08:17 -05:00
434115ccda
Bugifx: 'background-color' in react should be 'backgroundColor'
2016-08-11 17:34:05 +01:00
7713f0d587
refactoring out the direct message section
2016-08-11 17:32:39 +01:00
cc1cec8431
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-11 16:48:31 +01:00
a07833e7fc
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-11 16:47:19 +01:00
109184aab7
Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style
...
Only show Autocomplete if autocomplete is enabled
2016-08-11 16:47:07 +01:00
4aea2caefc
Initial pass at creating a direct message section
2016-08-11 16:45:19 +01:00
7cb663d39d
Only show Autocomplete if autocomplete is enabled
...
It was just never used, but it has 1px top border which makes the top border on chat look too big
2016-08-11 16:28:32 +01:00
55a28564b9
Add device_id to devices display
...
(it turns out to be quite useful)
2016-08-11 16:24:09 +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
4f76398b29
Merge pull request #407 from matrix-org/rav/refactor_guest_registration
...
Move guest registration into the login logic
2016-08-11 13:13:51 +01:00
e06763d421
Move guest registration into the login logic
2016-08-11 13:05:16 +01:00
4780f9000d
Merge pull request #403 from matrix-org/dbkr/multi_invite
...
Better support for inviting multiple people
2016-08-11 12:34:16 +01:00
f42d619e7d
Missing comma
2016-08-11 12:30:37 +01:00
5b71b28dcf
Fix member info
2016-08-11 11:34:14 +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
806477dcce
s/then/done/
2016-08-11 10:08:14 +01:00
a58a6275e5
Just use _canceled
...
Instead of both that and _unmounted
2016-08-11 10:06:22 +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
5b9d395234
Yet another fix to session saving
...
I've written tests this time, and everything.
2016-08-11 00:58:48 +01:00
a85259c2b7
Fix session persistence
...
https://github.com/matrix-org/matrix-react-sdk/pull/404 messed this up
somewhat; hopefully this gets it right
2016-08-10 23:52:09 +01:00
cab95f43ff
Show cancel button whilst inviting is in progress
...
And make it actually cancel the process.
2016-08-10 18:58:36 +01:00
d6f7358f81
Make completionStates an object
...
So that we can sensibly track the number completed by taking the length of it.
2016-08-10 18:50:56 +01:00
fa498eb8c6
Comment typo
2016-08-10 18:37:21 +01:00
6b3b2e30fe
Don't reset completionStates
...
We now set them in the constructor
2016-08-10 18:36:33 +01:00
b9f0b72ae1
Missing proptypes
2016-08-10 18:35:59 +01:00
020e4e14df
Factor out single-invite
2016-08-10 18:32:42 +01:00
4a6a9bd95b
Remove redundant setState
...
Duplicated in `finally`
2016-08-10 18:28:20 +01:00
92762eca74
Fix settings resetting on refresh
...
Don't clear localstorage when replacing the client: we clear it when logging out so this is just redundant, and since we now use replaceClient to unpickle a session from localstorage, this was blowing away all our setting on every refresh.
Also Move all of the localstorage code to Lifecycle (except device ID but this will probably be generated on the server soon anyway). We previously cleared localstorage on logout in Lifecycle so persist the session in Lifecycle.setLoggedIn() to be symmetrical.
2016-08-10 18:04:22 +01:00
54b3638a85
Better support for inviting multiple people
...
Pasting a list of addresses into the box will now pop up a dialog to confirm and show you the success / failure state of each address. It will also not die if it gets rate limited.
Fixes https://github.com/vector-im/vector-web/issues/1713
2016-08-10 17:11:49 +01:00
6d1eebe6f2
Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly
2016-08-10 17:01:06 +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
667264420c
hover state elements for the room tag menu, allong with CSS class updates
2016-08-10 14:46:05 +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
6aa5e5a493
Merge pull request #399 from matrix-org/rav/refactor_session_rehydration
...
Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
2016-08-10 12:56:01 +01:00
3922f6a1b7
Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
...
This means that we don't create a spurious MatrixClient which is thrown away by
the SessionLoader (whilst still ensuring that the rehydrated matrixclient
follows the same code path as matrixclients created at other points in the
session load process).
2016-08-10 11:59:24 +01:00
b7b0991ae9
Don't show integrations header if setting not on
...
If the labs setting for integrations was disableds, we still showed
the header for the integrations section but with nothing underneath
it.
2016-08-10 11:51:51 +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
1b414cad18
Add max-width to emoji completions.
2016-08-10 00:52:55 +05:30
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
75e1277961
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
2016-08-08 16:55:27 +01:00
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
5b812fead9
Initial RoomTagContextMenu wired in
2016-08-05 15:48:28 +01:00
98e89d4293
Merge pull request #392 from matrix-org/dbkr/scalar
...
Dbkr/scalar
2016-08-05 15:43:57 +01:00
80e4a99477
Merge branch 'develop' into wmwragg/room-tag-menu
2016-08-05 15:27:14 +01:00
4a46aba0c2
Added new onClick function for the avatar, but not wired in yet, waitin go pull up from develop once previous commits have been merged
2016-08-05 15:24:53 +01:00
10aa201d33
Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix
...
Wmwragg/mute mention state fix
2016-08-05 14:44:27 +01:00
ff02c21252
Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze
...
Fix long freeze when opening 'historical' section
2016-08-05 12:47:01 +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
9d958ab508
Fix long freeze when opening 'historical' section
...
By rate limiting the list update in InviteMemberList as it seems the sync this triggers causes a load of member events.
Fixes https://github.com/vector-im/vector-web/issues/1845
2016-08-04 17:54:00 +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
5305cb6785
Copy change to better describe the function
2016-08-04 16:55:52 +01:00
990da61a61
Fixed regression of click propogation
2016-08-04 16:25:09 +01:00
d204b043e5
Changed state from mute to mentions only
2016-08-04 16:17:21 +01:00
0351ab0a3d
Merge pull request #381 from matrix-org/dbkr/deactivate_account
...
Implement account deactivation
2016-08-04 15:38:29 +01:00
90e5ab2ca3
merge in develop
2016-08-04 13:39:47 +01:00
f7fda68e26
Use p tags instead of brs
2016-08-04 10:53:07 +01:00
c017e8dcf4
Initialise _passwordField & delete stale comment
2016-08-04 10:51:31 +01:00
e144da75e3
Comment onLoggedOut & consistent comment style
2016-08-04 10:49:34 +01:00
e1fea24fd6
Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled
...
Don't leave isRoomPublished as undefined
2016-08-04 10:42:34 +01:00
6632322029
spell out that conference calling is hit and miss
2016-08-03 19:56:13 +01:00
2d936a2850
Don't leave isRoomPublished as undefined
...
As this causes react to consider the component uncontrolled and then
warn when we change it to controlled
2016-08-03 18:23:38 +01:00
afa46a855b
Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account
2016-08-03 17:52:35 +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
b32a19a0f1
Comments
2016-08-03 17:23:09 +01:00
0919e41469
Fix MatrixClientPeg.start()
...
Move import & use `this`
2016-08-03 16:45:23 +01:00
009c768b72
Comma fail
2016-08-03 16:41:22 +01:00
9bf45fb556
Add start wrapper in MatrixClientPeg
...
to handle the opts dictionary
2016-08-03 16:39:47 +01:00
b95a1c4a4b
Just doc with the MatrixClientCreds object
2016-08-03 16:31:42 +01:00
a5384d32e2
Copy opts to set pendingEventOrdering
2016-08-03 16:28:37 +01:00
1b39f02141
Merge pull request #335 from aviraldg/feature-composer-emoji
...
feat: code cleanup & emoji replacement in composer
2016-08-03 16:18:56 +01:00
3780d82f6f
Merge pull request #386 from matrix-org/rav/default_to_device_id
...
DevicesPanel: use device_id as a placeholder
2016-08-03 16:12:46 +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
42f6703112
Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys
...
MemberDeviceInfo: Use the device name, where available
2016-08-03 15:26:37 +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
ff2dd74429
Merge pull request #383 from matrix-org/matthew/fix-video-upload
...
fix upload for video or image files where sniffing fails
2016-08-03 15:04:53 +01:00
c1cfbd6b59
Corrected comment typo
2016-08-03 14:47:53 +01:00
f4d41b7847
DevicesPanel: use device_id as a placeholder
...
A device may have no display_name set, in which case we probably want to use
the device_id as a placeholder.
2016-08-03 14:19:54 +01:00
55f4d23625
MemberDeviceInfo: Use the device name, where available
...
we now have device name for e2e devices: use it!
2016-08-03 14:18:09 +01:00
8e19532e5a
Hover state for badges, now only on the badges themselves
2016-08-03 14:09:10 +01:00
8e66e6dfdd
fix: Switch to opacity: 0 for composer emoji.
...
This seems to be the best option for displaying emoji in the composer. While it means selected emoji don't actually have the selection colour applied, it's the most functional of all the options. Facebook uses the same approach.
2016-08-03 18:27:49 +05:30
efdcc6da98
Merge pull request #384 from aviraldg/fix-composer-up-down
...
fix: allow up/down normally for no completions
2016-08-03 13:55:13 +01:00
a2d64f5119
fix: allow up/down normally for no completions
...
Autocomplete current eats up up/down key events by unconditionally returning
true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible.
2016-08-03 18:04:52 +05:30
1ff2ce60ff
Merge pull request #382 from aviraldg/fix-autocomplete-confirm
...
fix: autocomplete to use tab instead of return
2016-08-03 13:28:11 +01:00
569b6057c3
fix upload for video or image files where sniffing the content.info fails
2016-08-03 13:27:06 +01:00
1f9a396fa5
fix: autocomplete to use tab instead of return
2016-08-03 17:51:40 +05:30
104ccc751f
Merge pull request #375 from aviraldg/fix-574
...
strip (IRC) displayname suffix from autocomplete
2016-08-03 13:00:30 +01:00
wmwragg