Matthew Hodgson
6786539550
pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010
2016-08-25 18:30:48 +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
Richard van der Hoff
dd77cd74d1
Add text prefix to test event content
2016-08-25 15:13:28 +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
6bcf9cc9db
TimelinePanel-test: Hackery to make it pass
2016-08-24 17:30:53 +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
Kegsay
82a822820f
Merge pull request #427 from matrix-org/kegan/postmessage-bot-options
...
Add ability to query and set bot options
2016-08-24 13:51:31 +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
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
Aviral Dasgupta
884abbd7e9
Cleanup autocomplete
2016-08-23 00:36:31 +05:30
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
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
