Richard Lewis
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
Richard Lewis
9e3c1fbc7a
Pass room name.
2018-02-09 11:44:27 +00:00
David Baker
84da19c544
Merge pull request #1668 from turt2live/travis/re-register-scalar-token
...
Attempt to re-register for a scalar token if ours is invalid
2018-01-11 11:01:04 +00:00
Travis Ralston
678d87ef20
Give the current theme to the integration manager
...
For integration managers which would like to theme themselves to match Riot.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-16 20:13:27 -07:00
Travis Ralston
dca6fb6b81
Attempt to re-register for a scalar token if ours is invalid
...
This mostly helps with people migrating between integration managers where their old scalar token may no longer be valid. This also solves the problem of people switching between scalar and scalar-staging in the wild.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-16 20:04:32 -07:00
Richard Lewis
24db57bfb6
Fix api prefix.
2017-12-08 18:47:00 +00:00
Richard Lewis
d62520482a
fix typo.
2017-12-05 21:57:28 +00:00
Richard Lewis
fc3287c49f
Fix error message.
2017-12-05 21:56:35 +00:00
Richard Lewis
d5d5397959
Set custom widget title.
2017-12-05 21:41:44 +00:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Richard Lewis
74ab7c9bb3
Fix encoding
2017-08-22 09:59:27 +01:00
Matthew Hodgson
d7f5295949
untested WIP for supporting multiple widgets properly
2017-08-18 18:40:00 +01:00
Richard van der Hoff
0d7cc59d99
replace q method calls with bluebird ones
...
```
find src test -name '*.js' |
xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
2017-07-12 18:05:40 +01:00
Richard van der Hoff
0254d2b3a2
q(...) -> Promise.resolve
...
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-12 18:05:08 +01:00
Richard van der Hoff
a06bd84213
replace imports of q with bluebird
...
update `package.json`
```
find src test -name '*.js' |
xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
find src test -name '*.js' |
xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-12 18:05:08 +01:00
Richard Lewis
d091550ccb
Use app ID for element key and pass screen parameter to scalar.
2017-07-06 15:59:59 +01:00
Kegan Dougal
45ada1887d
Implement starter link support
...
This involves modal dialogs because browsers are *terrible*.
2016-09-02 16:36:43 +01:00
Kegan Dougal
6ec7e5df28
Move scalar auth stuff to ScalarAuthClient from RoomSettings
2016-09-02 16:03:24 +01:00
Luke Barnard
46d306a217
Change register response access_token to scalar_token
2016-08-17 17:16:19 +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
bb9316edfa
Pass the room id to scalar
2016-05-06 14:42:00 +01:00
David Baker
6da4b9d671
Add suport for showing the scalar UI
2016-05-06 14:19:56 +01:00
