ef764c112e
Merge pull request #300 from matrix-org/rav/device_verification
...
Support for marking devices as verified
2016-06-09 10:44:42 +01:00
05404efa34
Remove if (this.props.config)
...
Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).
2016-06-09 09:53:37 +01:00
1dfb3f71ae
Merge branch 'develop' into rav/device_verification
2016-06-08 21:34:47 +01:00
85770feb31
device verification: use a js-sdk event
...
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
c123f02842
Make the config optional
2016-06-08 18:45:46 +01:00
7ce49c752f
Wire up events to update UI on device verification
...
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
1616431d27
EventTile: add classes to indicate verifiedness
...
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
2016-06-08 17:02:42 +01:00
f3e66e6fd2
Add device info to member info
...
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00
086698cd11
Add device info to user settings
...
Requires e81ce23 from matrix-js-sdk
2016-06-08 17:02:42 +01:00
7e8c8dd336
Remove SdkConfig
...
just take a config in MatrixChat, pass the individual things down through the chain.
This may become unwieldy: let's see how it goes.
2016-06-08 14:54:34 +01:00
12816c5e1f
Explanatory comment
2016-06-07 22:14:56 +01:00
d063735c96
Use variable for key name
2016-06-07 22:07:23 +01:00
33251e6566
Remove default options that shouldn't be part of this PR
2016-06-07 22:03:31 +01:00
b54376aa2a
Add singleton object to hold SDK configuration
2016-06-07 21:49:06 +01:00
aca0e060a4
Also change velocity-vector commit & requires
...
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
2016-06-07 20:47:37 +01:00
943d7e18e1
Add _ to internal member
2016-06-07 19:55:24 +01:00
d5a522fdfe
Second attempt at fixing the Velocity memory leak
...
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
2016-06-07 18:22:01 +01:00
f8b3128645
invite input box wording for amandine
2016-06-02 23:33:55 +01:00
1b3c8481f6
fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged
2016-06-02 21:07:47 +01:00
532e93d7cb
fix up trailing whitespace and put the buttons in the right order
2016-06-02 21:07:04 +01:00
e20a1acb88
label our versions sensibly
2016-06-02 19:22:11 +01:00
487f3c72dd
fix new 3pid invite UI
2016-06-02 16:59:44 +01:00
1d31463140
set email branding after registration
2016-06-02 13:14:52 +01:00
83fd02bdfa
specify a brand when registering accounts
2016-06-02 11:51:26 +01:00
3b34311e05
implement new UX for 3pid invites
2016-06-01 23:42:34 +01:00
0747ca3923
ignore @ prefixes when sorting memberlist
2016-06-01 14:00:20 +01:00
272afe39dc
do not list rooms by default
2016-06-01 02:03:53 +01:00
c3fc76cdaa
warn guests to register nicely to upload files
2016-05-31 23:59:36 +01:00
e1ba7df66e
fix the Add button for email addies
2016-05-31 23:50:53 +01:00
2662ca36f9
fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?!
2016-05-31 23:50:47 +01:00
b74d690035
Merge pull request #290 from matrix-org/matthew/multipreview
...
multiple URL preview support
2016-05-31 19:42:21 +01:00
b3638f9169
PR review
2016-05-31 19:42:00 +01:00
118eec8cc0
Add a fallback home server to log into
...
If login fail with a credential error on the default HS, try
logging in on the fallback one.
2016-05-27 14:57:43 +01:00
d5e6e961fd
fix url previews firing incorrectly on Matrix.org
2016-05-27 10:09:17 +01:00
1664f46180
Add comment
2016-05-26 16:30:04 +01:00
3a5e37aa84
This actually shouldn't be necessary.
2016-05-26 16:22:40 +01:00
ed835752bc
Hopefully fix memory leak with velocity
2016-05-26 13:51:51 +01:00
07cc9bf77d
how ironic
2016-05-24 11:44:30 +01:00
39a3d6fdd4
multiple URL preview support
2016-05-24 00:54:20 +01:00
817a3debec
debug HS & IS
2016-05-18 11:42:51 +01:00
1459478ee0
use right check for end of timeline
...
and avoid bad interactions with forward pagination. thanks @richvdh
2016-05-17 21:32:20 +01:00
24adf2847e
better comment
2016-05-17 20:32:38 +01:00
7879be1704
implement basic local echo for resetting unread message count when opening a room without a scroll offset. hopefully largely fixes https://github.com/vector-im/vector-web/issues/967
2016-05-17 20:28:11 +01:00
fd09d5c570
switch badge count to per-conversation, and add per-room badges
2016-05-17 11:14:12 +01:00
5bde32f7fe
handle slashcommands with no args
2016-05-13 17:07:50 +01:00
62a1100fca
Merge pull request #289 from matrix-org/dbkr/email_notifs
...
Support for enabling email notifications
2016-05-10 16:39:37 +02:00
b86af8939a
fix usersettings cancel fail on new accounts
2016-05-05 15:30:56 +01:00
6dd530e2a4
Comment getEmailPusher
2016-05-04 09:41:36 +01:00
6a596f034f
Clarify comment
2016-05-03 11:21:05 +01:00
fab7111fd7
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-29 11:09:02 +01:00
Richard van der Hoff