Richard van der Hoff
5f29729e82
Make unverified encrypted events red and verified ones green
2016-06-08 17:03:54 +01:00
Richard van der Hoff
e24851456a
CSS for the MemberDeviceInfo view
2016-06-08 17:03:28 +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
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +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
12816c5e1f
Explanatory comment
2016-06-07 22:14:56 +01:00
David Baker
d063735c96
Use variable for key name
2016-06-07 22:07:23 +01:00
David Baker
33251e6566
Remove default options that shouldn't be part of this PR
2016-06-07 22:03:31 +01:00
Richard van der Hoff
ed1554f4af
index.js: fix wording in android popup
2016-06-07 22:01:56 +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
8679ce80c8
Update vector velocity fork package name
2016-06-07 20:28:38 +01:00
David Baker
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
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
David Baker
c6cf5febd5
Merge pull request #1516 from vith/static-config-json
...
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
David Baker
f9aaf7d903
Use the SdkConfig interface
...
rather than pulling in config.json directly.
json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
David Baker
15dccd9871
Handle errors with scalar-oauthing
...
Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error).
2016-06-06 17:55:45 +01:00
David Baker
fdcebe1e56
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
2016-06-06 17:19:38 +01:00
Matthew Hodgson
a2e73cceee
Merge branch 'develop' into matthew/scalar
2016-06-06 10:24:39 +01:00
Matthew Hodgson
c672919d1e
0.7.3
2016-06-03 12:20:05 +01:00
Matthew Hodgson
7ab2449ac1
Prepare changelog for v0.7.3
2016-06-03 12:20:04 +01:00
Matthew Hodgson
e68a2b5e1d
pin to react sdk 0.6.3 for release
2016-06-03 12:19:04 +01:00
Matthew Hodgson
507f5e2ca1
0.6.3
2016-06-03 12:17:46 +01:00
Matthew Hodgson
9e17c0ddd1
Prepare changelog for v0.6.3
2016-06-03 12:17:45 +01:00
Matthew Hodgson
f8b3128645
invite input box wording for amandine
2016-06-02 23:33:55 +01:00
Matthew Hodgson
ddc4ac187c
dep on react-sdk develop
2016-06-02 23:32:47 +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
ded66bbdfc
0.7.2
2016-06-02 19:05:50 +01:00
Matthew Hodgson
1a11c402fa
Prepare changelog for v0.7.2
2016-06-02 19:05:50 +01:00
Matthew Hodgson
4ec77eeca7
correctly bump dep on js-sdk and react-sdk
2016-06-02 19:04:22 +01:00
Matthew Hodgson
b06ab78a81
0.6.2
2016-06-02 18:55:34 +01:00
Matthew Hodgson
5ecbd10d36
Prepare changelog for v0.6.2
2016-06-02 18:55:34 +01:00
Matthew Hodgson
168f74d6cf
correctly bump dep on js-sdk 0.5.4
2016-06-02 18:53:50 +01:00
Matthew Hodgson
635fd927cd
0.7.1
2016-06-02 18:41:20 +01:00
Matthew Hodgson
481a7b160d
Prepare changelog for v0.7.1
2016-06-02 18:41:20 +01:00
Matthew Hodgson
204437e40c
0.6.1
2016-06-02 18:32:50 +01:00
Matthew Hodgson
d857859d51
Prepare changelog for v0.6.1
2016-06-02 18:32:50 +01:00
Matthew Hodgson
487f3c72dd
fix new 3pid invite UI
2016-06-02 16:59:44 +01:00
Richard van der Hoff
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
David Baker
cadedd2919
Revert presumably accidentally comitted config.json
2016-06-02 14:24:36 +01:00
Richard van der Hoff
e0bf23fa7c
0.7.0
2016-06-02 13:42:25 +01:00
Richard van der Hoff
a53acb3b58
Prepare changelog for v0.7.0
2016-06-02 13:42:24 +01:00
Richard van der Hoff
f6ec858ac9
Bump js-sdk and react-sdk for new releases
...
js-sdk 0.5.3
react-sdk 0.6.0
2016-06-02 13:40:15 +01:00
Richard van der Hoff
268cedee0f
0.6.0
2016-06-02 13:38:19 +01:00
Richard van der Hoff
9a77796d77
Prepare changelog for v0.6.0
2016-06-02 13:38:18 +01:00
