David Baker
fae9b048dd
Merge remote-tracking branch 'origin/develop' into dbkr/irc_links
2016-09-23 13:50:03 +01:00
David Baker
c8f6902da8
Merge pull request #494 from matrix-org/rav/reinstate_device_id
...
Add the deviceId back to memberdeviceinfo
2016-09-23 09:40:06 +01:00
Richard van der Hoff
dd2da20031
Add the deviceId back to memberdeviceinfo
...
It was removed by @ara4n in 5fa5489
2016-09-22 19:28:50 +01:00
Richard van der Hoff
2f7b4f74fd
Move the device verification buttons to their own class
...
Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog
for utterly no reason and breaking everything
2016-09-22 19:24:09 +01:00
David Baker
898fbcee30
Merge pull request #489 from aviraldg/fix-2128
...
Force-hide autocomplete after sending message.
2016-09-22 10:49:23 +01:00
David Baker
c228fac6d9
Merge pull request #488 from aviraldg/fix-2180
...
force old selection state after creating entities
2016-09-22 10:49:10 +01:00
David Baker
77c4cd337e
Merge branch 'develop' into dbkr/irc_links
2016-09-22 09:50:18 +01:00
David Baker
fedc0f2ec6
Back to develop
2016-09-21 17:32:54 +01:00
David Baker
be232bc1da
0.7.2
2016-09-21 17:28:08 +01:00
David Baker
a9494252d5
Prepare changelog for v0.7.2
2016-09-21 17:28:08 +01:00
David Baker
58de14a4c6
Pin to released js-sdk
2016-09-21 17:26:15 +01:00
Richard van der Hoff
da88dc53ee
Merge pull request #491 from matrix-org/dbkr/revert_333
...
Revert #333
2016-09-21 16:48:18 +01:00
David Baker
5fff3bdf24
Document brokenness
2016-09-21 16:25:18 +01:00
David Baker
8ae210cbe2
Revert #333
...
Revert https://github.com/matrix-org/matrix-react-sdk/pull/333/files since sanitizer blindly allows urls with no scheme, meaning // links can be used to fetch images over whatever scheme you serve vector over (ie. normally http/https).
2016-09-21 16:19:41 +01:00
David Baker
59117f1905
Fix linkifying rooms with underscores, try 2
...
Fixes https://github.com/vector-im/vector-web/issues/500
2016-09-21 14:11:43 +01:00
David Baker
b83d1db24a
Missed some Vectors
2016-09-21 14:03:35 +01:00
David Baker
765ae3a715
Move back to js-sdk develop
2016-09-21 12:00:37 +01:00
David Baker
1b01270202
Merge branch 'master' into develop
2016-09-21 11:59:17 +01:00
David Baker
041b10539a
0.7.1
2016-09-21 11:57:51 +01:00
David Baker
11db163c15
changelog
2016-09-21 11:56:24 +01:00
David Baker
681b45230e
Pin to js-sdk 0.6.0
2016-09-21 11:50:17 +01:00
David Baker
165da6ca27
Pin to js-sdk 0.6.0
2016-09-21 11:47:53 +01:00
David Baker
1870cd0e2b
Merge branch 'master' into develop
2016-09-21 11:45:10 +01:00
David Baker
c34108eab5
0.7.0
2016-09-21 11:43:15 +01:00
David Baker
4e062447d2
Prepare changelog for v0.7.0
2016-09-21 11:43:15 +01:00
David Baker
5fa67d9617
Merge pull request #490 from matrix-org/rav/encrypted_event_dialog
...
EncryptedEventDialog updates
2016-09-21 10:52:22 +01:00
Richard van der Hoff
2842506b27
EncryptedEventDialog updates
...
* Separate info on the event from info on the device, and add a couple of new
fields.
* Use MatrixClient.getEventSenderDeviceInfo (requires
https://github.com/matrix-org/matrix-js-sdk/pull/214 )
* Don't force a download of the device keys every time we open the dialog
* Fix a react warning if the device query takes a while
2016-09-21 10:36:23 +01:00
David Baker
2fd3c7c5ac
Merge pull request #487 from matrix-org/dbkr/incoming_dm_heuristic
...
Apply heuristic on incoming DMs
2016-09-21 10:29:30 +01:00
David Baker
5b216df28e
Not joined members any more
2016-09-21 09:57:17 +01:00
Aviral Dasgupta
f171985e4c
Fix click-to-complete in RTE
...
Closes vector-im/vector-web#2179
2016-09-21 07:40:48 +05:30
Aviral Dasgupta
44217422d0
Force-hide autocomplete after sending message.
...
Fixes vector-im/vector-web#2128
2016-09-21 07:28:07 +05:30
Aviral Dasgupta
ea1419ff78
force old selection state after creating entities
...
Fixes vector-im/vector-web#2180
2016-09-21 07:20:50 +05:30
David Baker
d1a5e54a69
Check if a room looks like a DM rooms on joining
...
and mark it as one if so.
Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.
2016-09-20 17:59:46 +01:00
David Baker
b66c449bd7
Comment typo
...
and out comment in more sensible place
2016-09-20 16:08:11 +01:00
Matthew Hodgson
a2904ad33f
fix 'new chat' layout bug
2016-09-20 10:06:57 -04:00
David Baker
746aad9a18
Oops, missed one
2016-09-19 14:47:08 +01:00
David Baker
c40a7a696e
Merge pull request #485 from matrix-org/dbkr/riot
...
Rebrand
2016-09-19 13:36:55 +01:00
David Baker
31753fc3f3
Rebrand
2016-09-19 13:26:59 +01:00
Matthew Hodgson
b348cf1244
actually apply scalar CSS :(
2016-09-19 07:01:46 -04:00
Kegsay
9be1ab774d
Merge pull request #484 from matrix-org/kegan/add-close-scalar-event
...
Pass close_scalar postMessage action through to the dispatcher
2016-09-19 10:47:51 +01:00
Kegan Dougal
993bb5c89d
Pass close_scalar postMessage action through to the dispatcher
2016-09-19 10:38:42 +01:00
Matthew Hodgson
7691559e01
more disclaimer
2016-09-17 22:07:43 +01:00
Matthew Hodgson
53bb6b96ce
don't warn when disabling crypto
2016-09-17 21:56:10 +01:00
Matthew Hodgson
5fa5489bbd
disambiguate devices by ID in memberinfo
2016-09-17 20:12:56 +01:00
Matthew Hodgson
6e57faecb0
trim whitespace when adding to list
2016-09-17 16:14:02 +01:00
Matthew Hodgson
da85df9d1a
let comma trigger autocomplete. hook up backspace. search displaynames that include space
2016-09-17 15:21:08 +01:00
Matthew Hodgson
88273e8065
move admin tools to the top
2016-09-17 15:07:41 +01:00
Matthew Hodgson
cf1b1442eb
no labs for guests
2016-09-17 14:29:40 +01:00
Matthew Hodgson
0046ae50b5
switch to 3-digit formatting for counts
2016-09-17 02:39:19 +01:00
Matthew Hodgson
c51e6907f0
fix spinner on createroom
2016-09-17 02:19:32 +01:00
