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
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
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
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
98ef793809
Default IS should be vector.im now
2016-06-09 10:56:14 +01:00
bb405563c8
Fix default servers
2016-06-09 10:54:56 +01:00
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
7700bb0ed9
Merge pull request #301 from matrix-org/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:47 +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
cab24bb14c
Switch matrix-js-sdk back to develop
2016-06-08 21:34:30 +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
b5ff247f09
Merge pull request #299 from matrix-org/dbkr/SdkConfig
...
Pass brand parameter down to Notifications
2016-06-08 17:34:10 +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
8679ce80c8
Update vector velocity fork package name
2016-06-07 20:28:38 +01:00
a4352dee50
Merge pull request #298 from matrix-org/dbkr/velocity_mem_leak2
...
Second attempt at fixing the Velocity memory leak
2016-06-07 19:55:41 +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
507f5e2ca1
0.6.3
2016-06-03 12:17:46 +01:00
9e17c0ddd1
Prepare changelog for v0.6.3
2016-06-03 12:17:45 +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
b06ab78a81
0.6.2
2016-06-02 18:55:34 +01:00
5ecbd10d36
Prepare changelog for v0.6.2
2016-06-02 18:55:34 +01:00
168f74d6cf
correctly bump dep on js-sdk 0.5.4
2016-06-02 18:53:50 +01:00
204437e40c
0.6.1
2016-06-02 18:32:50 +01:00
d857859d51
Prepare changelog for v0.6.1
2016-06-02 18:32:50 +01:00
487f3c72dd
fix new 3pid invite UI
2016-06-02 16:59:44 +01:00
5379956b0d
jenkins.sh: remove spurious 'npm install'
...
Just let npm install matrix-js-sdk, rather than installing the one from jenkins
2016-06-02 16:42:19 +01:00
268cedee0f
0.6.0
2016-06-02 13:38:19 +01:00
9a77796d77
Prepare changelog for v0.6.0
2016-06-02 13:38:18 +01:00
d812c77fc1
Bump to js-sdk 0.5.3
2016-06-02 13:36:45 +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
0ef0120227
Merge pull request #297 from matrix-org/matthew/new-3pid-invite
...
implement new UX for 3pid invites
2016-06-02 11:24:21 +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
David Baker