Commit Graph

1948 Commits (9c0f51fb822fdf20db3b2f18930c3ef16460953a)

Author SHA1 Message Date
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
wmwragg a07833e7fc Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:47:19 +01:00
David Baker 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
wmwragg 4aea2caefc Initial pass at creating a direct message section 2016-08-11 16:45:19 +01:00
David Baker 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
Richard van der Hoff 55a28564b9 Add device_id to devices display
(it turns out to be quite useful)
2016-08-11 16:24:09 +01:00
Richard van der Hoff 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
Matthew Hodgson 3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu
Wmwragg/room tag menu
2016-08-11 08:59:32 -05:00
David Baker 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
Richard van der Hoff e06763d421 Move guest registration into the login logic 2016-08-11 13:05:16 +01:00
David Baker 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
David Baker f42d619e7d Missing comma 2016-08-11 12:30:37 +01:00
David Baker 5b71b28dcf Fix member info 2016-08-11 11:34:14 +01:00
Richard van der Hoff 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
David Baker 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
David Baker 46899a0086 Merge pull request #395 from aviraldg/fix-emoji
Various fixes and improvements to emojification.
2016-08-11 10:23:00 +01:00