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
ed1554f4af
index.js: fix wording in android popup
2016-06-07 22:01:56 +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
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
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
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
fdcebe1e56
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
2016-06-06 17:19:38 +01:00
a2e73cceee
Merge branch 'develop' into matthew/scalar
2016-06-06 10:24:39 +01:00
c672919d1e
0.7.3
2016-06-03 12:20:05 +01:00
7ab2449ac1
Prepare changelog for v0.7.3
2016-06-03 12:20:04 +01:00
e68a2b5e1d
pin to react sdk 0.6.3 for release
2016-06-03 12:19:04 +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
ddc4ac187c
dep on react-sdk develop
2016-06-02 23:32:47 +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
ded66bbdfc
0.7.2
2016-06-02 19:05:50 +01:00
1a11c402fa
Prepare changelog for v0.7.2
2016-06-02 19:05:50 +01:00
4ec77eeca7
correctly bump dep on js-sdk and react-sdk
2016-06-02 19:04:22 +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
635fd927cd
0.7.1
2016-06-02 18:41:20 +01:00
481a7b160d
Prepare changelog for v0.7.1
2016-06-02 18:41:20 +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
cadedd2919
Revert presumably accidentally comitted config.json
2016-06-02 14:24:36 +01:00
e0bf23fa7c
0.7.0
2016-06-02 13:42:25 +01:00
a53acb3b58
Prepare changelog for v0.7.0
2016-06-02 13:42:24 +01:00
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
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
d976046e6a
set email branding whenever emails are added from vector
2016-06-02 13:15:13 +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
1902b631c7
add default branding parameter for email notifs
2016-06-02 11:45:23 +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
David Baker