Aviral Dasgupta
0df201c483
Merge branch 'develop' into feature-autocomplete
2016-06-12 14:10:23 +05:30
David Baker
719928f389
Remove view_room_alias
...
As it was basically the same as view_room. Use view_room instead which will handle whether we pass an ID or an alias into RoomView
2016-06-10 15:12:42 +01:00
David Baker
b60ab9d695
Remove XXX now it's fixed (yay!)
2016-06-09 18:50:18 +01:00
David Baker
72b3ce200d
Make the room directory join rooms by alias
...
Also makes some improvement on the multiple code path mess for joining rooms
2016-06-09 18:49:06 +01:00
David Baker
049e3a968b
Merge pull request #303 from matrix-org/rav/factor_out_createroom
...
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
David Baker
888c0611e8
Merge pull request #302 from matrix-org/rav/guest_device_spinner
...
Fix spinner-of-doom in member info for guests
2016-06-09 11:03:40 +01:00
Richard van der Hoff
de36aa63fb
Factor out common parts of room creation
...
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
Richard van der Hoff
2352661513
MemberInfo: remove spinner if device query fails
...
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
2016-06-09 10:57:19 +01:00
David Baker
98ef793809
Default IS should be vector.im now
2016-06-09 10:56:14 +01:00
David Baker
bb405563c8
Fix default servers
2016-06-09 10:54:56 +01:00
Richard van der Hoff
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
David Baker
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
Richard van der Hoff
1dfb3f71ae
Merge branch 'develop' into rav/device_verification
2016-06-08 21:34:47 +01:00
Richard van der Hoff
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
David Baker
c123f02842
Make the config optional
2016-06-08 18:45:46 +01:00
Richard van der Hoff
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
Richard van der Hoff
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
Richard van der Hoff
f3e66e6fd2
Add device info to member info
...
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00
Richard van der Hoff
086698cd11
Add device info to user settings
...
Requires e81ce23 from matrix-js-sdk
2016-06-08 17:02:42 +01:00
David Baker
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
David Baker
b54376aa2a
Add singleton object to hold SDK configuration
2016-06-07 21:49:06 +01:00
David Baker
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
David Baker
943d7e18e1
Add _ to internal member
2016-06-07 19:55:24 +01:00
David Baker
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
Matthew Hodgson
f8b3128645
invite input box wording for amandine
2016-06-02 23:33:55 +01:00
Matthew Hodgson
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
Matthew Hodgson
532e93d7cb
fix up trailing whitespace and put the buttons in the right order
2016-06-02 21:07:04 +01:00
Matthew Hodgson
e20a1acb88
label our versions sensibly
2016-06-02 19:22:11 +01:00
Matthew Hodgson
487f3c72dd
fix new 3pid invite UI
2016-06-02 16:59:44 +01:00
Matthew Hodgson
1d31463140
set email branding after registration
2016-06-02 13:14:52 +01:00
Matthew Hodgson
83fd02bdfa
specify a brand when registering accounts
2016-06-02 11:51:26 +01:00
Matthew Hodgson
3b34311e05
implement new UX for 3pid invites
2016-06-01 23:42:34 +01:00
Matthew Hodgson
0747ca3923
ignore @ prefixes when sorting memberlist
2016-06-01 14:00:20 +01:00
Aviral Dasgupta
b979a16199
initial version of autocomplete
2016-06-01 16:54:21 +05:30
Matthew Hodgson
272afe39dc
do not list rooms by default
2016-06-01 02:03:53 +01:00
Matthew Hodgson
c3fc76cdaa
warn guests to register nicely to upload files
2016-05-31 23:59:36 +01:00
Matthew Hodgson
e1ba7df66e
fix the Add button for email addies
2016-05-31 23:50:53 +01:00
Matthew Hodgson
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
Matthew Hodgson
b74d690035
Merge pull request #290 from matrix-org/matthew/multipreview
...
multiple URL preview support
2016-05-31 19:42:21 +01:00
Matthew Hodgson
b3638f9169
PR review
2016-05-31 19:42:00 +01:00
David Baker
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
Matthew Hodgson
d5e6e961fd
fix url previews firing incorrectly on Matrix.org
2016-05-27 10:09:17 +01:00
Matthew Hodgson
39a3d6fdd4
multiple URL preview support
2016-05-24 00:54:20 +01:00
Matthew Hodgson
817a3debec
debug HS & IS
2016-05-18 11:42:51 +01:00
Matthew Hodgson
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
Matthew Hodgson
24adf2847e
better comment
2016-05-17 20:32:38 +01:00
Matthew Hodgson
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
Matthew Hodgson
fd09d5c570
switch badge count to per-conversation, and add per-room badges
2016-05-17 11:14:12 +01:00
Matthew Hodgson
62a1100fca
Merge pull request #289 from matrix-org/dbkr/email_notifs
...
Support for enabling email notifications
2016-05-10 16:39:37 +02:00
Matthew Hodgson
b86af8939a
fix usersettings cancel fail on new accounts
2016-05-05 15:30:56 +01:00
