PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
4489 commits 1 branch 0 tags 338 MiB
Commit graph

4489 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
edfa3c1980 Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 13:27:40 +00:00
Bhuvan Krishna
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
Luke Barnard
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
Luke Barnard
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
Luke Barnard
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
Luke Barnard
ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other 2017-07-19 09:25:53 +01:00
Weblate
745b803d28 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 16:45:25 +00:00
Matthew Hodgson
bd693768cc deliberately de-theme pre tags 2017-07-18 17:45:17 +01:00
Weblate
6e1c40ea0f Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:50:34 +00:00
Matthew Hodgson
b45108d80d ooooops, fix dark theme code blocks correctly 2017-07-18 15:50:28 +01:00
Weblate
ec68c54644 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:33:48 +00:00
erciccione
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
Matthew Hodgson
e7ba618bbe fix text in code blocks on dark theme 2017-07-18 15:33:41 +01:00
David Baker
fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:14:27 +01:00
David Baker
cd418a5525 Retest 2017-07-17 18:16:50 +01:00
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