OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,373 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

379 Commits (c8a39e361d672d15108cc7fd17289115958fc711)

Author SHA1 Message Date
Richard van der Hoff 66ddf25977 Deflake the joining test 
Just give the client longer to get started (it seems to be taking a long time
to get started talking to indexeddb)
 2017-07-14 16:14:42 +01:00
Richard van der Hoff 0c31c62a62 build fix: bump to mock-request 1.1 
This should have happened with 32ef273f: now that we are using
flushAllExpected, we nee matrix-mock-request 1.1.0
 2017-07-14 15:41:13 +01:00
Richard van der Hoff 01d954e4ab Bump react to 15.6 to fix build problems 
matrix-react-test-tools requires react 15.6 or later, so make sure we require
it in riot-web too.
 2017-07-14 14:45:44 +01:00
Richard van der Hoff 3ec4b25793 Transform `async` functions to bluebird promises 
It turns out that the assertion made in
https://github.com/vector-im/riot-web/pull/4565 about `async` functions
returning bluebird promises was only correct when babel used an inline version
of the `asyncToGenerator` helper; in react-sdk we are using
`babel-transform-runtime` which means that we use a separate
`babel-runtime/helpers/asyncToGenerator`, which returns a native (or core-js)
Promise.

This meant that we were still in the situation where some methods returned
native Promises, and some bluebird ones, which is exactly the situation I
wanted to resolve by switching to bluebird in the first place: in short,
unless/until we get rid of all code which assumes Promises have a `done` method
etc, we need to make sure that everything returns a bluebird promise.

(Aside: there was debate over whether in the long term we should be trying to
wean ourselves off bluebird promises by assuming all promises are native. The
conclusion was that the complexity hit involved in doing so outweighed any
benefit of a potential future migration away from bluebird).
 2017-07-13 17:34:47 +01:00
Richard van der Hoff 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Richard van der Hoff 10decf95f6 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-13 00:48:31 +01:00
Richard van der Hoff b2403d59b7 loading tests: wait for login component 
Rather than a fixed delay, use matrix-react-test-utils to wait for the login
component to appear. Hopefully this will deflakify some tests.
 2017-07-13 00:18:49 +01:00
Richard van der Hoff 0f8a2554dc Enable colours for karma test output 
I don't really know why we disable colours here.
 2017-07-13 00:18:10 +01:00
Richard van der Hoff 9969d6095d Remove phantomjs; add chrome 2017-07-05 09:43:40 +01:00
Richard van der Hoff 38b1ca9b90 Use headless chrome instead of phantomjs for tests 2017-07-05 09:35:51 +01:00
Richard van der Hoff 48889b51b0 Bump to matrix-mock-request 1.0.0 
- for consistency with js-sdk updates
 2017-07-04 16:38:19 +01:00
Richard van der Hoff bd1196716a Use external mock-request 
mock-request is now factored out to matrix-mock-request; use it
 2017-07-04 15:59:21 +01:00
David Baker cf5cf02529 v0.11.4 2017-06-22 12:04:49 +01:00
David Baker c380e7566a Released js-sdk & react-sdk 2017-06-22 11:58:57 +01:00
David Baker 639b17c663 v0.11.3 2017-06-20 13:15:36 +01:00
David Baker 6ef32f182a react-sdk 0.9.6 2017-06-20 13:13:03 +01:00
David Baker 448e33bb65 v0.11.2 2017-06-19 13:20:45 +01:00
David Baker f420a18696 Released js-sdk & react-sdk 2017-06-19 13:12:40 +01:00
David Baker 8cf6712426 v0.11.2-rc.2 2017-06-16 13:32:57 +01:00
David Baker 1a12528634 react-sdk rc.2 2017-06-16 13:30:27 +01:00
David Baker 104cb7b999 v0.11.2-rc.1 2017-06-15 17:21:01 +01:00
David Baker cb905e9be7 released js-sdk & react-sdk 2017-06-15 17:18:33 +01:00
David Baker 4edd21ba8a v0.11.1 2017-06-14 11:21:27 +01:00
David Baker f9795232e0 react-sdk 0.9.4 2017-06-14 11:19:43 +01:00
David Baker bddb6b7f8f v0.11.0 2017-06-12 16:04:24 +01:00
David Baker 8c541a2702 released js sdk & react sdk 2017-06-12 15:53:46 +01:00
David Baker 89e14c1b49 v0.11.0-rc.2 2017-06-09 22:20:38 +01:00
David Baker f086629fed react-sdk rc.2 2017-06-09 22:17:30 +01:00
David Baker d108f34390 Change flux version to 2.1.1 
It was previously pinned to 2.0.3 in https://github.com/vector-im/riot-web/commit/5bab440a1
but only here and not in react-sdk, meaning that react-sdk was
still using the latest, at least in develop builds, however
react-sdk now uses utils which requires 2.1, so pin to 2.1.1
everywhere for sanity.
 2017-06-09 21:43:11 +01:00
David Baker 7237224fc9 v0.11.0-rc.1 2017-06-09 20:31:34 +01:00
David Baker daf92c59b1 released js-sdk & react-sdk 2017-06-09 20:29:36 +01:00
Matthew Hodgson d8f7262eac Merge branch 'develop' into t3chguy/random_fix_1 2017-06-08 15:58:49 +01:00
David Baker 53bc78429d Merge pull request #4212 from vector-im/t3chguy/package_json_fix 
change electron -> electron_app which was previously missed
 2017-06-07 14:46:54 +01:00
Luke Barnard a158549a4c Merge pull request #4039 from vector-im/new-guest-access 
New guest access
 2017-06-07 13:40:00 +01:00
Michael Telatynski 79d6ced201
change electron -> electron_app which was previously missed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-06 18:39:54 +01:00
David Baker 968e21a67d Merge branch 'master' into develop 2017-06-06 17:48:32 +01:00
David Baker 26bb962a3c v0.10.2 2017-06-06 17:45:07 +01:00
David Baker a62ed0eb03 reatc-sdk 0.9.2 2017-06-06 17:41:26 +01:00
David Baker d06934c5f6 Add velocity as a dep 
As we now use it from vector, so we shouldn't rely on it being
pulled in via react-sdk
 2017-06-06 14:00:36 +01:00
Michael Telatynski f24c6de245
provide react devtools in electron dev builds 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-04 15:30:44 +01:00
Matthew Hodgson ed6709ec6c rename WMClass as riot rather than confusing riot-web 2017-06-03 18:43:06 +01:00
Matthew Hodgson 5add4a1b95 v0.10.1 2017-06-02 22:48:18 +01:00
Matthew Hodgson dea012f460 bump to 0.9.1 2017-06-02 22:45:59 +01:00
Michael Telatynski cb3fa16cd0 install text-encoding-utf-8 so we're not relying on it from react-sdk 
implicitly/transitively (not nice)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 22:04:01 +01:00
David Baker 24a5297fc8 v0.10.0 2017-06-02 14:37:10 +01:00
David Baker b4a0e85d90 released react-sdk 2017-06-02 14:25:12 +01:00
Matthew Hodgson 921ffc3762 v0.10.0-rc.2 2017-06-02 01:21:19 +01:00
Matthew Hodgson ce4a2e48d6 bump deps 2017-06-02 01:18:37 +01:00
Matthew Hodgson 943c9d931e v0.10.0-rc.1 2017-06-02 01:12:19 +01:00
Matthew Hodgson 0fbd73a3c9 bump js & react sdk 2017-06-01 02:16:57 +01:00