Richard van der Hoff
18cbd452b0
Merge pull request #495 from matrix-org/dbkr/irc_links
...
Fix links to IRC rooms
2016-09-23 14:31:30 +01:00
David Baker
d0a15975c8
Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive
...
Make markdown less aggressive
2016-09-23 14:31:20 +01:00
David Baker
90c9d51c7d
Typos
2016-09-23 14:15:48 +01:00
David Baker
2120963c7a
More linkifier fixes
...
* Accept underscores in usernames
* Accept usernames & room aliases on localhost
* Accept #localhost:foo.com and @localhost:foo.com
2016-09-23 14:02:14 +01:00
David Baker
fae9b048dd
Merge remote-tracking branch 'origin/develop' into dbkr/irc_links
2016-09-23 13:50:03 +01:00
David Baker
eeac0619f4
reskindex
2016-09-23 13:49:35 +01:00
David Baker
2e77b0a3c7
Use directory search box component
2016-09-23 13:48:44 +01:00
David Baker
61b48a5b1a
Add component for the directory search box
2016-09-23 13:48:24 +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
6ba20ec012
Better logic for wrapping in p tags or not
2016-09-22 18:57:46 +01:00
David Baker
de0c92dadf
Remove unused code
2016-09-22 18:37:14 +01:00
David Baker
ca240b0b85
Don't wrap everything in p tags
...
Preserves the old behaviour of not wrapping everything in p tags,
but also returns valid markup if the resulting markdown contains
multiple paragraphs (previously it stripped the <p> from the start
and the </p> from the end, leaving closing and opening paragraph tags
in the middle of the returned markup).
Also turn on the 'xhtml' option so marked uses self-closing tags
for br's, hr's and so forth.
2016-09-22 18:17:02 +01:00
David Baker
0eddea1937
Disable link detection, as per comment
2016-09-22 17:51:34 +01:00
David Baker
6c7259eec8
Better detection of when input contains markdown
2016-09-22 17:18:12 +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
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
d9c51832ab
Use 2x res logo to work with hidpi displays
2016-09-21 11:09:00 +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
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
5011d3b158
Only show version bar if on develop
...
Or rather, if the version string is in the right format it to work.
2016-09-20 14:33:25 +01:00
David Baker
a5ee48d857
Swap out unknown user icons
2016-09-19 16:42:07 +01:00
David Baker
940eaf2b7d
The times, they are a changin'
2016-09-19 15:32:39 +01:00
David Baker
855ecbe11d
Update twitter / blog
2016-09-19 15:18:49 +01: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
1c76870dcf
Remove failed commenting
2016-09-19 13:36:04 +01:00
David Baker
a99c9f4db2
Keep order of blog / twitter the same
2016-09-19 13:35:31 +01:00
David Baker
7e5373e194
Stick with VectorCo twitter for now
2016-09-19 13:34:49 +01:00
David Baker
560174b99f
Keep width on logo
2016-09-19 13:34:01 +01:00
David Baker
d2947a637a
Better.
2016-09-19 13:31:01 +01:00
David Baker
8e4dcd9b41
Rebrand
2016-09-19 13:29:49 +01:00
David Baker
31753fc3f3
Rebrand
2016-09-19 13:26:59 +01:00
Matthew Hodgson
9391dc6c2a
aargh
2016-09-19 07:41:32 -04:00
Matthew Hodgson
b348cf1244
actually apply scalar CSS :(
2016-09-19 07:01:46 -04:00
Matthew Hodgson
f19044fef2
re-apply new scalar CSS
2016-09-19 06:59:24 -04:00
Kegan Dougal
993bb5c89d
Pass close_scalar postMessage action through to the dispatcher
2016-09-19 10:38:42 +01:00
Kegan Dougal
de38a32969
Listen for close_scalar and close the dialog box when received
2016-09-19 10:37:19 +01:00
