b45108d80d
ooooops, fix dark theme code blocks correctly
2017-07-18 15:50:28 +01:00
e7ba618bbe
fix text in code blocks on dark theme
2017-07-18 15:33:41 +01:00
cb4f57eb4a
Merge pull request #4583 from vector-im/luke/feature-rte-pills
...
CSS for decorated matrix.to links in the composer
2017-07-14 18:04:05 +01:00
a1b4b9992e
Use $accent-fg-color instead of #fff
2017-07-14 17:59:53 +01:00
18a6ee5a52
white -> #fff
2017-07-14 17:52:11 +01:00
de0fd588b6
Add $rte-room-pill-color: #aaa
2017-07-14 17:51:25 +01:00
38899c6011
CSS for decorated matrix.to links in the composer
2017-07-14 17:23:16 +01:00
1690f875ca
Merge pull request #4579 from vector-im/rav/wait_longer_for_client
...
Deflake the joining test
2017-07-14 16:43:13 +01:00
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
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
40a47f8c7a
Allow Riot to load up different configs depending on the domain ( #4575 )
...
Initially try to load `config.$domain.json` and only if that fails, load
`config.json`. Configs are not muxxed in any way, it either entirely uses
the domain config, or entirely uses `config.json`.
2017-07-14 15:05:07 +01:00
caa5751d50
Merge pull request #4577 from vector-im/rav/bump_react_versions
...
Bump react to 15.6 to fix build problems
2017-07-14 14:55:21 +01:00
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
c0830b48d0
Merge pull request #4567 from vector-im/rxl881/widgetButtons
...
Improve AppTile menu bar button styling.
2017-07-13 18:46:53 +01:00
5e259ec176
Merge pull request #4572 from vector-im/rav/async_to_bluebird
...
Transform `async` functions to bluebird promises
2017-07-13 17:46:12 +01:00
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
b9b0e98ccf
Merge pull request #4570 from vector-im/rav/joining_test
...
use flushAllExpected in joining test
2017-07-13 13:33:50 +01:00
32ef273f9d
use flushAllExpected in joining test
...
It won't do much to help with the vm stopping for 300ms, but it should make the
code and logs clearer.
2017-07-13 13:23:10 +01:00
348ec52b14
Merge pull request #4565 from vector-im/rav/bluebird
...
Switch riot-web to bluebird
2017-07-13 12:20:08 +01:00
76181f4771
Merge remote-tracking branch 'origin/develop' into rav/bluebird
2017-07-13 12:04:54 +01:00
a303e1e1b8
Merge pull request #4564 from vector-im/rav/await_login_component
...
loading tests: wait for login component
2017-07-13 11:58:21 +01:00
ba1166d0d0
Merge pull request #4568 from vector-im/luke/remove-old-composer
...
Remove CSS for the MessageComposerInputOld
2017-07-13 11:33:28 +01:00
7238c4dfac
Fix overlooked `q`
2017-07-13 11:33:25 +01:00
d901515059
rethemedex
2017-07-13 10:16:23 +01:00
f5c4d903e6
Remove CSS for TabComplete
2017-07-13 10:11:58 +01:00
e15c8e473f
AppTile menu bar button styling.
2017-07-13 09:44:19 +01:00
69eb1a49d4
Fix a broken test
...
turns out that you could call defer.resolve on q defers as an unbound function,
whereas that doesn't work with bluebird promises.
2017-07-13 00:56:13 +01:00
1d2d086a58
Replace q.allSettled()
...
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
2017-07-13 00:50:01 +01:00
4c5b5ca0ba
replace `q.Promise` with `new Promise`
2017-07-13 00:50:01 +01:00
d5b550f89a
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-13 00:50:01 +01:00
b29b4a959b
q(...) -> Promise.resolve
...
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-13 00:50:01 +01:00
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
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
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
248944a300
Merge pull request #4560 from vector-im/luke/fix-ctrl-k
...
Implement the focus_room_filter action
2017-07-12 18:29:10 +01:00
188a58e5c7
RateLimitedFunc -> rate_limited_func
2017-07-12 18:18:13 +01:00
3e1a909b1d
Just use the onKeyDown of the <input>
2017-07-12 17:46:27 +01:00
41cd238e02
Update to reflect previous implementation
...
Which was a74bbb424c
2017-07-12 17:10:43 +01:00
4fe4e10abb
Implement the focus_room_filter action
...
This is for ctrl+k room filtering and switching
2017-07-12 13:49:57 +01:00
898725082a
Remove spurious comma
...
I am messing this up - fix to 0bbce1c
2017-07-11 17:35:25 +01:00
a619001533
Merge pull request #4530 from vector-im/dbkr/groups_better_groupview
...
CSS for Rooms in Group View
2017-07-11 17:04:16 +01:00
0bbce1c140
Add missing i18n string
...
This should have been part of
https://github.com/vector-im/riot-web/pull/4557/files
2017-07-11 17:00:04 +01:00
a201f74115
Merge pull request #4557 from vector-im/rav/homepage_again
...
more HomePage tweaks
2017-07-11 16:46:43 +01:00
bc60fa81af
more HomePage tweaks
...
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
2017-07-11 14:29:47 +01:00
d25b441add
Merge pull request #4556 from vector-im/rav/homepage_unmounted_guard
...
Give HomePage an unmounted guard
2017-07-11 14:27:38 +01:00
d755903fdb
typo
2017-07-11 14:10:18 +01:00
8ac26dd19f
Give HomePage an unmounted guard
...
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
b375c71a28
fix comments on node versions
2017-07-11 13:23:15 +01:00
cefc3e6da9
Make CSS more generic
2017-07-10 19:32:25 +01:00
7a1494fc46
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-10 14:35:51 +01:00
Matthew Hodgson