055224693a
Merge remote-tracking branch 'origin/develop' into develop
2017-07-20 10:02:15 +00:00
9864ce5bb2
Support multiple config.json symlinks in redeploy.py ( #4644 )
...
* Support multiple config.json symlinks in redeploy.py
* Review comments
2017-07-20 11:02:10 +01:00
238afde00a
Increase the timeout for clearing indexeddbs
...
Chrome seems to take ages (like, 1500ms regularly) to clear out the indexeddbs,
and that's causing test timeouts. Bump the timeout to hack around it.
Also: clear both dbs in parallel (can't hurt, right?) and improve diagnostics
on the process.
2017-07-20 11:01:27 +01:00
4b67900225
Translated using Weblate (German)
...
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/de/
2017-07-19 20:52:22 +00:00
fb10357dd5
Merge remote-tracking branch 'origin/develop' into develop
2017-07-19 16:26:16 +00:00
f7d282fc8e
Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills
...
Make some adjustments to mx_UserPill and mx_RoomPill
2017-07-19 17:26:13 +01:00
11ae3dd46c
Merge remote-tracking branch 'origin/develop' into develop
2017-07-19 16:16:06 +00:00
3544c2b0c8
Merge pull request #4639 from vector-im/luke/css-rte-pre
...
Apply CSS to <pre> tags to distinguish them from each other
2017-07-19 17:16:02 +01:00
edfa3c1980
Merge remote-tracking branch 'origin/develop' into develop
2017-07-19 13:27:40 +00:00
620f39c6a2
Translated using Weblate (Telugu)
...
Currently translated at 1.4% (3 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-07-19 13:27:40 +00:00
0c253e2437
Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd
...
Use `catch` instead of `fail` to handle room tag error
2017-07-19 14:27:37 +01:00
53ae42ed68
Use `catch` instead of `fail` to handle room tag error
...
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
871c9e6d3e
Add bing mention pill CSS
...
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
2017-07-19 11:02:51 +01:00
ccc30fb52e
Apply CSS to <pre> tags to distinguish them from each other
2017-07-19 09:25:53 +01:00
745b803d28
Merge remote-tracking branch 'origin/develop' into develop
2017-07-18 16:45:25 +00:00
bd693768cc
deliberately de-theme pre tags
2017-07-18 17:45:17 +01:00
6e1c40ea0f
Merge remote-tracking branch 'origin/develop' into develop
2017-07-18 14:50:34 +00:00
b45108d80d
ooooops, fix dark theme code blocks correctly
2017-07-18 15:50:28 +01:00
ec68c54644
Merge remote-tracking branch 'origin/develop' into develop
2017-07-18 14:33:48 +00:00
4e5e5dd6b3
Translated using Weblate (Italian)
...
Currently translated at 96.1% (199 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2017-07-18 14:33:48 +00:00
e7ba618bbe
fix text in code blocks on dark theme
2017-07-18 15:33:41 +01:00
fc470cd20d
Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit
2017-07-18 11:14:27 +01:00
cd418a5525
Retest
2017-07-17 18:16:50 +01:00
65b9086f18
Add group header button css
2017-07-17 17:20:11 +01:00
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
faa9fa8db9
Added translation using Weblate (Czech)
2017-07-15 13:26:27 +00:00
f272961fbd
Styling for beta testing icon.
2017-07-14 23:30:47 +01:00
ac0d29dc06
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 17:04:10 +00: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
54f44af494
Make editing prettier
2017-07-14 17:23:44 +01:00
38899c6011
CSS for decorated matrix.to links in the composer
2017-07-14 17:23:16 +01:00
dd77147313
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 15:43:17 +00: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
c24b04d19b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 14:43:00 +00: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
8c9afc2dfd
Make GroupView more consistent with RoomView
2017-07-14 15:39:46 +01:00
bd06a1c393
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 14:05:12 +00: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
8516c9d5b5
Merge remote-tracking branch 'origin/develop' into develop
2017-07-14 13:55:25 +00: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
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
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
ea85a3c3d9
Merge remote-tracking branch 'origin/develop' into develop
2017-07-13 17:46:57 +00: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
e60bf48134
CSS for start of group edit support
2017-07-13 18:42:14 +01:00
Weblate