Mark Haines
fb4d3a9729
Merge pull request #425 from matrix-org/markjh/travis
...
Add .travis.yml
2016-08-23 17:20:30 +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
Mark Haines
763d3bf9e7
Add .travis.yml
2016-08-23 15:05:50 +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
Richard van der Hoff
0dbc3ce344
Merge pull request #424 from matrix-org/rav/fix_react_test
...
Fix TimelinePanel test
2016-08-23 14:56:21 +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
Richard van der Hoff
70c0290aec
Fix TimelinePanel test
...
https://github.com/matrix-org/matrix-react-sdk/pull/422 made events take up
less vertical space, so we now need more of them to allow us to scroll back.
2016-08-23 14:39:44 +01:00
Kegan Dougal
f6b008350d
Spaces not tabs
2016-08-23 13:31:55 +01:00
Matthew Hodgson
1a2475ebba
Merge pull request #422 from matrix-org/wmwragg/chat-message-presentation
...
Wmwragg/chat message presentation
2016-08-23 12:20:03 +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
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
d23ed642a0
Merge pull request #421 from matrix-org/dbkr/fix_mute_to_all_messages
...
Only try to delete room rule if it exists
2016-08-18 17:11:57 +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
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
Matthew Hodgson
bdfc7d069d
Merge pull request #417 from aviraldg/fix-574-again
...
strip (IRC) suffix from tabcomplete entries
2016-08-15 23:24:33 +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
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
David Baker
a94d415106
Merge pull request #415 from matrix-org/matthew/ignore-local-busy
...
ignore local busy
2016-08-15 17:13:58 +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
David Baker
7992042526
Merge pull request #413 from matrix-org/rav/device_display_name
...
Set initial_device_display_name on login and register
2016-08-12 11:28:18 +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
