OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,474 Commits
210 Branches
550 Tags
429 MiB
Commit Graph

4474 Commits (6068647840cae102630b719075341b34f718b500)

Author SHA1 Message Date
David Baker 65b9086f18 Add group header button css 2017-07-17 17:20:11 +01:00
Luke Barnard 0e71ea7a5a Make some adjustments to mx_UserPill and mx_RoomPill 
So that they can appear correctly in the body of a text message.
 2017-07-17 14:52:08 +01:00
František Šindelář faa9fa8db9 Added translation using Weblate (Czech) 2017-07-15 13:26:27 +00:00
Richard Lewis f272961fbd Styling for beta testing icon. 2017-07-14 23:30:47 +01:00
Weblate ac0d29dc06 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 17:04:10 +00:00
Luke Barnard 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
Luke Barnard a1b4b9992e Use $accent-fg-color instead of #fff 2017-07-14 17:59:53 +01:00
Luke Barnard 18a6ee5a52 white -> #fff 2017-07-14 17:52:11 +01:00
Luke Barnard de0fd588b6 Add $rte-room-pill-color: #aaa 2017-07-14 17:51:25 +01:00
David Baker 54f44af494 Make editing prettier 2017-07-14 17:23:44 +01:00
Luke Barnard 38899c6011 CSS for decorated matrix.to links in the composer 2017-07-14 17:23:16 +01:00
Weblate dd77147313 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 15:43:17 +00:00
David Baker 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
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
Weblate c24b04d19b Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 14:43:00 +00: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
David Baker 8c9afc2dfd Make GroupView more consistent with RoomView 2017-07-14 15:39:46 +01:00
Weblate bd06a1c393 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 14:05:12 +00:00
Kegsay 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
Weblate 8516c9d5b5 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 13:55:25 +00:00
David Baker 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
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
Tong Hui f6f461c571 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2017-07-14 12:22:30 +00:00
Brendan Abolivier e1e7492f17 Translated using Weblate (French) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-07-14 12:15:20 +00:00
Weblate ea85a3c3d9 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 17:46:57 +00:00
Richard Lewis c0830b48d0 Merge pull request #4567 from vector-im/rxl881/widgetButtons 
Improve AppTile menu bar button styling.
 2017-07-13 18:46:53 +01:00
David Baker e60bf48134 CSS for start of group edit support 2017-07-13 18:42:14 +01:00
Weblate ea7d923d76 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 16:46:16 +00:00
Luke Barnard 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
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
Weblate c5b72f0192 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 12:33:54 +00:00
David Baker b9b0e98ccf Merge pull request #4570 from vector-im/rav/joining_test 
use flushAllExpected in joining test
 2017-07-13 13:33:50 +01:00
Richard van der Hoff 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
Weblate 76f6a19733 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 11:20:13 +00:00
Richard van der Hoff 348ec52b14 Merge pull request #4565 from vector-im/rav/bluebird 
Switch riot-web to bluebird
 2017-07-13 12:20:08 +01:00
Richard van der Hoff 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Weblate 9072ff93b9 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 10:58:24 +00:00
Luke Barnard 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
Weblate acbcde85ce Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 10:33:32 +00:00
Luke Barnard 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
Richard van der Hoff 7238c4dfac Fix overlooked `q` 2017-07-13 11:33:25 +01:00
Luke Barnard d901515059 rethemedex 2017-07-13 10:16:23 +01:00
Luke Barnard f5c4d903e6 Remove CSS for TabComplete 2017-07-13 10:11:58 +01:00
Richard Lewis e15c8e473f AppTile menu bar button styling. 2017-07-13 09:44:19 +01:00
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 4c5b5ca0ba replace `q.Promise` with `new Promise` 2017-07-13 00:50:01 +01:00
Richard van der Hoff 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
Richard van der Hoff 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
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