OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,892 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

420 Commits (9d17ed74074e3d94ca2b6d957941968b765b79fa)

Author SHA1 Message Date
David Baker b727944b11 Bump electron version 2017-10-13 16:27:01 +01:00
David Baker ef503cca11 Merge branch 'master' into develop 2017-09-21 21:56:58 +01:00
David Baker 2b7ee756f8 v0.12.6 2017-09-21 21:53:09 +01:00
David Baker aaff9133c7 Newer js-sdk & react-sdk for js-sdk build fix 2017-09-21 21:49:43 +01:00
David Baker 50e6536195 Merge branch 'master' into develop 2017-09-21 18:11:46 +01:00
David Baker fbccf22e00 v0.12.5 2017-09-21 18:08:17 +01:00
David Baker dbd4cf8756 Clean on prepublish (#5097) 
Otherwise you can make broken releases on case insensitive file
systems
 2017-09-21 18:06:41 +01:00
David Baker 874e88c4a8 react-sdk v0.10.5 2017-09-21 18:05:22 +01:00
David Baker 2ea9fc3f9a v0.12.4 2017-09-20 15:19:10 +01:00
David Baker d957f0cdd7 released js-sdk & react-sdk 2017-09-20 15:16:42 +01:00
David Baker ca50d1f04a v0.12.4-rc.1 2017-09-19 10:57:02 +01:00
David Baker 57851cd508 js-sdk & react-sdk rc.1 2017-09-19 10:54:35 +01:00
David Baker f148844573 Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip 
generic contextual menu for tooltip/responses
 2017-09-13 14:27:28 +01:00
Michael Telatynski 2316f4230e
install and use prop-types over React.PropTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:23:35 +01:00
David Baker 38575a653d Revert "Implement sticky date separators" 2017-09-06 17:36:43 +01:00
David Baker 8b250bda64 Merge branch 'master' into develop 2017-09-06 13:36:11 +01:00
David Baker 92d31a8890 v0.12.3 2017-09-06 13:32:33 +01:00
David Baker e8dd7be8a3 matrix-react-sdk v0.10.3 2017-09-06 13:31:00 +01:00
David Baker b8d9276f29 Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators 
Implement sticky date separators
 2017-09-05 14:16:21 +01:00
David Baker c1e2ee8123 v0.12.3-rc.3 2017-09-05 13:43:40 +01:00
David Baker 17bf8cb4ab v0.12.3-rc.2 2017-09-05 13:15:56 +01:00
David Baker 32423654b4 new react-sdk rc 2017-09-05 13:13:58 +01:00
David Baker 3f8564f641 v0.12.3-rc.1 2017-09-01 16:22:24 +01:00
David Baker c1fe3dff22 react-sdk v0.10.3 2017-09-01 16:19:08 +01:00
Luke Barnard 88228a5a3f Implement sticky date separators 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353
 2017-08-30 14:06:50 +01:00
David Baker 65f0bd04f2 v0.12.2 2017-08-24 14:53:02 +01:00
David Baker f69d5d7e3f Released js-sdk & react-sdk 2017-08-24 14:50:44 +01:00
David Baker a65196ee8c Update electron version 2017-08-23 21:17:07 +01:00
David Baker 9e57c9d78f v0.12.1 2017-08-23 15:58:50 +01:00
David Baker c900b58120 Released js-sdk & react-sdk 2017-08-23 15:57:45 +01:00
David Baker f523d93720 v0.12.1-rc.1 2017-08-22 18:57:20 +01:00
David Baker ab2a72a193 Bump version temporarily 
so we get the diff from v0.12.0-rc.2
 2017-08-22 18:55:33 +01:00
David Baker 6bdad8b5f6 Released js-sdk & react-sdk 2017-08-22 18:55:09 +01:00
Luke Barnard 064181731c v0.12.0-rc.1 2017-08-16 10:40:28 +01:00
Luke Barnard cc8518101b js-sdk 0.8.0 react-sdk 0.10.0-rc.1 2017-08-16 10:10:03 +01:00
Richard van der Hoff 06ef674597 Enable fancy karma reporters 
cargo-cult luke's stuff from react-sdk
 2017-08-08 19:05:58 +01:00
Richard van der Hoff df33d40285 Enable karma-sourcemap-loader 
This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
 2017-08-08 19:05:49 +01:00
Richard van der Hoff 10ee9f4de4 Merge pull request #4754 from vector-im/rav/fix_crypto_build 
Fix crypto on develop
 2017-08-08 10:13:06 +01:00
Richard van der Hoff 9c3c1b7608 Make webpack exit non-zero on error 
Pass `--bail` to webpack, so that if we can't find a module, we bail out rather
than deploy a broken version to /develop.

https://github.com/webpack/webpack/issues/708 is somewhat relevant.
 2017-08-08 09:50:49 +01:00
Luke Barnard 8ca2af0fe7 Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269) 2017-08-03 15:22:52 +01:00
Luke Barnard 2f99a4883f Update draft-js from 0.8.1 to 0.10.1 
Hopefully to fix #4675 and friends
 2017-08-02 11:52:47 +01:00
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