Commit graph

2063 commits

Author SHA1 Message Date
wmwragg
1fe85f37fd Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching 2016-09-06 11:34:38 +01:00
Luke Barnard
cb4df84d49 Missing curly bracket 2016-09-06 10:36:44 +01:00
Luke Barnard
fa3387b326 Code review
- use an empty state key
- swap switch for if
- s/not in view/not visible/
2016-09-06 10:29:38 +01:00
David Baker
80dd927275 Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
Fix: conference rooms were no longer hidden
2016-09-05 18:39:15 +01:00
David Baker
04889a89ec Only count rooms we're in as DM rooms 2016-09-05 18:35:32 +01:00
David Baker
50ef695740 Fix: conference rooms were no longer hidden 2016-09-05 17:42:22 +01:00
wmwragg
5ed680e5ce Picking the top of the queryList not _userList, as the queryList is the query filtered _userList 2016-09-05 17:34:20 +01:00
wmwragg
3dd84e2b8a Initial AddressTile added 2016-09-05 17:28:08 +01:00
David Baker
d782d5bbc7 Fix error dialog on conf call error 2016-09-05 17:03:10 +01:00
Luke Barnard
310e6602ca Fix ref to dispatcher 2016-09-05 15:24:05 +01:00
Luke Barnard
efccdab0ad Better error message for room not viewed 2016-09-05 15:16:22 +01:00
Luke Barnard
1c29c95990 Only current room works with postMessage 2016-09-05 15:13:48 +01:00
Luke Barnard
54f21c9acc Expose join rules of a room 2016-09-05 14:58:16 +01:00
wmwragg
d9c6448a0f Adding better deafults and ErrorDialog message 2016-09-05 14:29:21 +01:00
wmwragg
3d66dff0aa Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any 2016-09-05 14:16:21 +01:00
wmwragg
9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:06:31 +01:00
wmwragg
ca443e01d8 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:16 +01:00
Richard van der Hoff
31e09e6137 Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
Make MemberInfo to use client.getStoredDevicesForUser
2016-09-05 10:38:24 +01:00
wmwragg
67c623d410 Rename the action to make it clearer what it is doing 2016-09-05 10:29:03 +01:00
Kegsay
6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links
Implement starter link support
2016-09-05 09:10:39 +01:00
Kegan Dougal
56ac0004e5 Use href='#' hack to make link text look like a link 2016-09-05 09:10:15 +01:00
Richard van der Hoff
fc40bdcbfc Make MemberInfo to use client.getStoredDevicesForUser
It's more powerful than listDeviceKeys, and isn't deprecated.
2016-09-05 00:08:16 +01:00
Richard van der Hoff
a316c652b7 Convert MemberDeviceInfo to ES6 class 2016-09-04 21:49:06 +01:00
wmwragg
f9ab2fa957 When zoomed in, the sticky headers should correctly position themselves 2016-09-04 08:01:04 +01:00
wmwragg
721baf8d42 Tolltip tweak to not require the passing in of the parent 2016-09-04 07:42:09 +01:00
Richard van der Hoff
bc8e7724e8 Make the 'encrypt this room' knob be megolm 2016-09-03 18:42:54 +01:00
wmwragg
03e74f48f8 Positioned Tooltip better 2016-09-03 13:44:44 +01:00
Matthew Hodgson
fdfd6ecfd9 let users join confs as voice or video 2016-09-03 13:27:46 +01:00
wmwragg
405dcf76eb Further tweaks to the tooltip to better handle its position, and simplify it's use 2016-09-03 12:44:55 +01:00
wmwragg
bffefd9261 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component 2016-09-02 18:41:44 +01:00
Matthew Hodgson
dbd17ea953 improve e2e warning a bit 2016-09-02 17:37:16 +01:00
Matthew Hodgson
b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson
d5062f1ff7 gah, revert debug 2016-09-02 17:15:21 +01:00
Matthew Hodgson
fd664e893f Merge branch 'master' into develop 2016-09-02 17:14:24 +01:00
Matthew Hodgson
6de2e8bda5 update changelog 2016-09-02 17:13:52 +01:00
Richard van der Hoff
fd0ed4a406 Show something when we see a no-op join event
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
2016-09-02 16:59:42 +01:00
Matthew Hodgson
8e9c04e1aa Merge pull request #438 from matrix-org/rav/matrix_dev_hack
Show something when we see a no-op join event
2016-09-02 16:58:29 +01:00
Richard van der Hoff
f5fe4b2433 Show something when we see a no-op join event
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
2016-09-02 16:54:27 +01:00
Kegan Dougal
45ada1887d Implement starter link support
This involves modal dialogs because browsers are *terrible*.
2016-09-02 16:36:43 +01:00
Kegan Dougal
6ec7e5df28 Move scalar auth stuff to ScalarAuthClient from RoomSettings 2016-09-02 16:03:24 +01:00
wmwragg
4c05edb71b Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari 2016-09-02 15:47:40 +01:00
Matthew Hodgson
f9d8829ba2 let you join confs either as voice or video 2016-09-02 15:38:28 +01:00
Richard van der Hoff
f3a1c58fa9 Handle broken OlmAccounts
olm 1.0.0 made broken OlmAccounts, which we may be unable to restore with olm
1.1.0. Add some words to that effect, and make sure we clear the localstorage.
2016-09-02 11:28:04 +01:00
Richard van der Hoff
584c7ed56d Merge branch 'rav/show_session_load_errors' into develop 2016-09-02 11:03:39 +01:00
Richard van der Hoff
b4521bc44c review feedback 2016-09-01 22:45:09 +01:00
Matthew Hodgson
1586e5bd6f fix guest access; broken since Aug 18 2016-09-01 22:16:55 +01:00
Matthew Hodgson
1bc26cb6c5 fix guest access; broken since Aug 18 2016-09-01 16:58:37 +01:00
wmwragg
e7d4ef74d0 Placeholder for one to one chat dialog and functionality 2016-09-01 16:45:24 +01:00
Matthew Hodgson
031daf7b3c Merge pull request #434 from matrix-org/matthew/uninterrupted-audio
use a top-level audio tag for playing all VoIP audio.
2016-09-01 16:12:37 +01:00
Matthew Hodgson
f0d5f42921 whine loudly if remoteAudio element is missing 2016-09-01 13:58:26 +01:00
Richard van der Hoff
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
Matthew Hodgson
4829ac0c4d comment 2016-09-01 11:07:46 +01:00
Matthew Hodgson
a23d8e313d show ongoing audio call in LeftPanel 2016-09-01 00:13:32 +01:00
Matthew Hodgson
6c4ad49b78 use a top-level audio tag for playing all VoIP audio.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621 2016-08-31 21:50:46 +01:00
Matthew Hodgson
35fff74477 oops, typo 2016-08-31 17:25:41 +01:00
Matthew Hodgson
516369fb07 use promises to mediate access to HTMLAudioElements 2016-08-31 16:38:37 +01:00
Matthew Hodgson
5543c126e6 fix tests 2016-08-30 15:22:52 +01:00
wmwragg
c30ff57c62 Better comments 2016-08-30 12:29:25 +01:00
wmwragg
8061a2f279 Fixed historical scetion not scrolling up when clicked if not hidden and stuck 2016-08-30 11:55:51 +01:00
wmwragg
769e7d3b2e Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-30 11:19:54 +01:00
wmwragg
83c4fd4b2f Code clean up, and better comments 2016-08-30 10:45:17 +01:00
wmwragg
2b1ed707c4 Better comments, and correct bottom header sticky calc to allow clicking 2016-08-28 19:18:41 +01:00
wmwragg
123d9b56c8 calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars 2016-08-28 16:25:20 +01:00
Matthew Hodgson
5e105e1be6 make /user URLs work 2016-08-28 14:04:11 +01:00
wmwragg
8f7d3394e6 Always setup stickies, even if we aren't going to use them so that the following map can fire 2016-08-28 12:02:20 +01:00
wmwragg
7631539584 Fixed incorrect init calculation of originalPosition attribute 2016-08-28 11:39:47 +01:00
Aviral Dasgupta
7c6b1703f3 fix emojione sizing 2016-08-28 14:54:07 +05:30
Matthew Hodgson
18436e1257 pick up ! matrix.to URLs 2016-08-28 02:12:18 +01:00
Matthew Hodgson
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
Matthew Hodgson
ad873c2b60 handle matrix.to links correctly. add partial support for #/user URLs 2016-08-28 01:55:42 +01:00
Matthew Hodgson
50d09f73f5 add leave/forget button to RoomSettings 2016-08-28 00:00:22 +01:00
Matthew Hodgson
fb5f8294c8 switch to namespaced CSS 2016-08-28 00:00:10 +01:00
Matthew Hodgson
5b0d13c1fc switch to namespaced CSS 2016-08-27 23:59:55 +01:00
Matthew Hodgson
5df98d70f4 add debugging to MemberAvatar to try to kick jenkins... 2016-08-27 01:18:48 +01:00
wmwragg
73dd05b01d Corrected incorrect offset from top of window for the scrollArea 2016-08-26 18:31:02 +01:00
wmwragg
8ccb1d482a Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck 2016-08-26 15:52:57 +01:00
wmwragg
5f9c794f0c Tweaking autoscroll to only adjust if header stuck at top and not at bottom 2016-08-26 15:36:16 +01:00
wmwragg
b9e95865af Click on stuck header scrolls to that header, collapses expands for none stuck header 2016-08-26 15:09:13 +01:00
wmwragg
71e829fd32 Getting click to not collapse expand when header is stuck 2016-08-26 14:36:39 +01:00
wmwragg
774e24a3b4 Added some logic to turn off sticky headers when the scroll area isn't large enough to support them 2016-08-26 11:01:04 +01:00
wmwragg
c8c2f733e2 Re-calculate sticky header positions when sublist header is clicked 2016-08-26 09:56:07 +01:00
wmwragg
7fcdd0f77a Initial pass at sticky headers for the LHS panel section labels 2016-08-25 19:46:01 +01:00
Richard van der Hoff
c8b2d5106f Merge pull request #430 from matrix-org/rav/fix_search_regression
Fix NPE when we don't know the sender of an event
2016-08-25 19:31:16 +01:00
Richard van der Hoff
96567dad0d Fix NPE when we don't know the sender of an event
Fixes a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/426.

Particularly when we are showing search results, we may not recognise the
sender of an event; attempting to create a MemberAvatar for it will lead to
null-reference errors.

Also a bit of untangling of the logic of needsSenderProfile. Since
https://github.com/matrix-org/matrix-react-sdk/pull/422,
EventTileType.needsSenderProfile was only being called on MessageEvents, and
therefore only returned true. It's a shame to see all this logic going into
EventTile rather than the individual EventTileTypes, but since it's there,
let's not leave the unused logic lying around in the EventTileType
implementations.
2016-08-25 16:55:09 +01:00
Matthew Hodgson
36d8fa9786 fix avatar clicking in memberinfo 2016-08-25 16:20:38 +01:00
Richard van der Hoff
c1db6fb42d Merge pull request #429 from matrix-org/rav/timelinepanel_test
Update annoying TimelinePanel test
2016-08-25 15:40:03 +01:00
Matthew Hodgson
ae910d82a8 Merge pull request #416 from aviraldg/feature-changelog
add fancy changelog dialog
2016-08-24 18:01:39 +01:00
Richard van der Hoff
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
Kegsay
97fc4249d4 Merge pull request #428 from matrix-org/kegan/state-key-with-underscores
Send bot options with leading underscore on the state key
2016-08-24 15:09:44 +01:00
Kegan Dougal
c292312115 Send bot options with leading underscore on the state key
This is in order to get around the synapse rule which states that if the
state key is a user ID, then only that user can send the event. We want to
set the event for another user (the bot), hence we can't send just the plain
user ID.
2016-08-24 14:54:44 +01:00
Matthew Hodgson
2f0599aae1 Merge pull request #419 from aviraldg/feature-autocomplete-improvements
Update autocomplete design and scroll it correctly
2016-08-24 14:47:22 +01:00
Kegan Dougal
6235d88b55 Missing return 2016-08-24 14:10:21 +01:00
Kegan Dougal
73ba55abad s/then/done/ to throw uncaught exceptions if the error function throws 2016-08-24 13:47:35 +01:00
Kegan Dougal
dbff5f671e Add ability to query and set bot options
- Also standardise on 'success' as the key name for successes.
- Also return the entire `content` on get state event requests.
2016-08-24 13:23:06 +01:00
Matthew Hodgson
08c0d7e298 Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation
Added event/info message avatars back in
2016-08-23 17:14:11 +01:00
wmwragg
ae8234ffe3 Added event/info message avatars back in 2016-08-23 15:58:27 +01:00
Kegsay
c10208a203 Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api
Add postMessage API required for integration provisioning
2016-08-23 15:00:44 +01:00
Kegan Dougal
ecc7850e13 Trailing ) 2016-08-23 14:50:52 +01:00
Kegan Dougal
1c649303e3 Consistency with sendResponse 2016-08-23 14:50:29 +01:00
Kegan Dougal
e96a40004b Review comments 2016-08-23 14:41:47 +01:00
Kegan Dougal
f6b008350d Spaces not tabs 2016-08-23 13:31:55 +01:00
wmwragg
6a4d02ffc5 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 12:49:21 +01:00
wmwragg
c362d4ff01 Added updating of count when room tile notification state changed 2016-08-23 12:40:28 +01:00
Kegan Dougal
9162a0ff01 Add postMessage API required for integration provisioning
Supports querying member state and creating invites only.
2016-08-23 12:00:11 +01:00
wmwragg
6d1f9003e2 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 10:52:50 +01:00
Aviral Dasgupta
884abbd7e9 Cleanup autocomplete 2016-08-23 00:36:31 +05:30
wmwragg
edb7301b37 Moving the drirect messages above rooms 2016-08-22 14:10:51 +01:00
wmwragg
48a2567b82 Merge branch 'develop' into wmwragg/chat-message-presentation 2016-08-19 17:19:30 +01:00
wmwragg
993333490d Removal of the mini avatars for action (info) messages 2016-08-19 16:38:05 +01:00
wmwragg
afd1ab1582 Comment to describe what info messages are 2016-08-18 22:19:23 +01:00
wmwragg
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
wmwragg
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
David Baker
5495cfaca9 Only try to delete room rule if it exists 2016-08-18 16:59:25 +01:00
Richard van der Hoff
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
David Baker
d08f716681 Comment override rule stuff 2016-08-18 15:21:46 +01:00
David Baker
fc2c62e896 We can use the new consts here 2016-08-18 15:19:24 +01:00
David Baker
bab2f23db3 Oops, missed a constant 2016-08-18 15:18:02 +01:00
David Baker
af48b8920e Various PR feedback 2016-08-18 14:00:14 +01:00
David Baker
9e45279894 Use enumalike thing 2016-08-18 13:44:58 +01:00
David Baker
73e486cc58 Hide red highlight badge in mute mode 2016-08-18 11:58:27 +01:00
David Baker
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
David Baker
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
Luke Barnard
46d306a217 Change register response access_token to scalar_token 2016-08-17 17:16:19 +01:00
Richard van der Hoff
69e8cb6f44 Merge branch 'rav/no_deviceload_if_disabled' into develop 2016-08-17 14:41:18 +01:00
Richard van der Hoff
0356f04b9c MemberInfo: initialise _enableDevices in componentWillMount
... to avoid referencing it in render() before it is set
2016-08-17 14:40:10 +01:00
Aviral Dasgupta
e173900808 Update autocomplete design and scroll it correctly 2016-08-17 17:27:19 +05:30
Richard van der Hoff
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
wmwragg
52f5061cc5 Made the menu button a clickable image rather than an input element 2016-08-16 17:34:33 +01:00
wmwragg
58d9789645 Increase main avatar size 2016-08-16 16:03:34 +01:00
wmwragg
8e8e6fd5fe formatTime for use with new timestamp format 2016-08-16 15:01:01 +01:00
wmwragg
c359358101 Initial context menu positioning and style change 2016-08-16 11:59:26 +01:00
wmwragg
6fd61f5816 Initial reposition of the timestamp 2016-08-16 10:26:27 +01:00
Aviral Dasgupta
8777780928 strip (IRC) suffix from tabcomplete entries
fixes vector-im/vector-web#574
2016-08-16 03:50:59 +05:30
Aviral Dasgupta
ff39d52431 add fancy changelog dialog 2016-08-16 03:33:47 +05:30
Matthew Hodgson
2a3b0e85ea add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ 2016-08-15 21:37:26 +01:00
Matthew Hodgson
534d996582 ignore local busy - workaround for https://github.com/vector-im/vector-web/issues/1964 2016-08-15 16:17:35 +01:00
David Baker
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
Richard van der Hoff
b9870f2c23 defaultDeviceDisplayName should be a prop
... not a bit of config.
2016-08-12 11:41:45 +01:00
David Baker
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
Richard van der Hoff
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
Richard van der Hoff
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
David Baker
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
David Baker
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
David Baker
fc0c5a5c58 Tidy up fix to multi-invite 2016-08-12 10:02:55 +01:00
Richard van der Hoff
df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +01:00
Matthew Hodgson
d1eec57118 fix inviting some more 2016-08-11 17:11:51 -05:00
Matthew Hodgson
3bedad69cd unbreak inviting :( 2016-08-11 17:08:17 -05:00
wmwragg
434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' 2016-08-11 17:34:05 +01:00
wmwragg
7713f0d587 refactoring out the direct message section 2016-08-11 17:32:39 +01:00
wmwragg
cc1cec8431 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:48:31 +01:00