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

9239 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
b5c44e6b36 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 15:08:05 +00:00
Luke Barnard
5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button 
E2E "fudge-button"
 2018-03-08 15:07:58 +00:00
Luke Barnard
3a3cced905 E2E "fudge-button" 
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
 2018-03-08 14:13:33 +00:00
Richard Lewis
c59dd5b840 Add placeholders for sticker images (and fancy transitions). 2018-03-08 12:31:01 +00:00
Osoitz
e864dc97ba Translated using Weblate (Basque) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-03-08 10:16:51 +00:00
Weblate
e0798af09d Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 09:59:02 +00:00
Марко М. Костић
7f44f236e0 Translated using Weblate (Serbian) 
Currently translated at 99.8% (989 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-03-08 09:59:01 +00:00
Tirifto
d5ced62b90 Translated using Weblate (Esperanto) 
Currently translated at 97.7% (968 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-03-08 09:59:01 +00:00
Luke Barnard
441a8c722c
Merge pull request #1790 from matrix-org/dbkr/hello_trace_why_are_you_here 
Remove spurious console.trace
 2018-03-08 09:58:57 +00:00
David Baker
d919c1a41d Remove spurious console.trace 
There's no comment to say why this is here and the commit that
add it (e91e94fd4) doesn't mention it either, so it's presumably
unintentional.
 2018-03-08 09:47:42 +00:00
Richard Lewis
b2bb15beb3 Remove accidentally checked in yarn.lock 2018-03-07 11:59:44 +00:00
Richard Lewis
7f91b47598 Move sticker picker icon. 2018-03-07 11:52:42 +00:00
Weblate
4a81d1cd6b Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 20:18:07 +00:00
Matthew Hodgson
7a77da7a4c
Merge pull request #1789 from matrix-org/dbkr/presence_only_on_user_activity 
Don't reset the presence timer on every dispatch
 2018-03-06 20:18:00 +00:00
David Baker
a97e7375d5 Don't reset the presence timer on every dispatch 
Only on user activity (there's now a dispatch every time we set a
member event, ie. A LOT, hence this now being a problem)
 2018-03-06 17:48:21 +00:00
Weblate
4d76194a9d Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 12:22:19 +00:00
David Baker
d167dbcf86
Merge pull request #1788 from matrix-org/luke/fix-flair-store-potential-mem-leak 
Potentially fix a memory leak in FlairStore
 2018-03-06 12:22:14 +00:00
Luke Barnard
faf517419f Return null instead of undefined on failure 2018-03-06 12:14:41 +00:00
Luke Barnard
0fc79a4a0d Remove delay used in testing 2018-03-06 12:13:46 +00:00
Luke Barnard
afbd563810 Potentially fix a memory leak in FlairStore 
For each successful request of a group profile, we previously
emitted an `updateGroupProfile` event per caller of
`getGroupProfileCached`. This is sub-optimal because only a single
event emit is required to update the views listening.

It's possible that this was enabling some race to cause a memory
leak but this is not certain, hence the extra logging for future
debugging.
 2018-03-06 11:33:56 +00:00
Richard Lewis
b529edb5cc Linting 2018-03-06 11:02:36 +00:00
Richard Lewis
d5465cf2fa Prefix and clarify global variable naming. 2018-03-06 10:55:59 +00:00
Richard Lewis
7755a3ce90 Nest sticker image element for correct positioning of tooltips. 2018-03-06 10:48:32 +00:00
Weblate
17657aa8e2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 09:43:39 +00:00
Ralitsa Bozhkova
bd8f78526e Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-06 09:43:38 +00:00
Luke Barnard
213e25ab0f
Merge pull request #1785 from matrix-org/luke/fix-room-tile-cosmetics 
Implement transparent RoomTile for use in some places
 2018-03-06 09:43:33 +00:00
Richard Lewis
e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +00:00
Krombel
ecad9b9dd3 Translated using Weblate (German) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-03-05 16:38:43 +00:00
Luke Barnard
a95f6a9804 Implement transparent RoomTile for use in some places 
where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
 2018-03-05 12:36:02 +00:00
Szimszon
73768a7afc Translated using Weblate (Hungarian) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-03-03 08:36:20 +00:00
RainSlide
8d8d73942e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-03-02 13:18:50 +00:00
Ralitsa Bozhkova
ffcf58b144 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-02 08:53:42 +00:00
Weblate
7daf0279d6 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:56:37 +00:00
David Baker
9a7a7ea2d6
Merge pull request #1784 from matrix-org/luke/fix-group-avatar-default-colour 
Fix varying default group avatar colour for given group
 2018-03-01 15:56:33 +00:00
Luke Barnard
94c1baa25d Fix varying default group avatar colour for given group 2018-03-01 15:42:22 +00:00
Weblate
2aa15095f2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:38:16 +00:00
Luke Barnard
a62a650c5a
Merge pull request #1783 from matrix-org/luke/fix-group-avatar-update 
Fix bug where avatar change not reflected in LLP
 2018-03-01 15:38:12 +00:00
Andrey
379690bcc2 Translated using Weblate (Russian) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-01 15:36:58 +00:00
Luke Barnard
86295acba3 Merge branch 'develop' into luke/fix-group-avatar-update 2018-03-01 15:27:06 +00:00
Kévin C
25e8272d2c Translated using Weblate (French) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-03-01 15:07:44 +00:00
Luke Barnard
d5908fbc1e Fix FlairStore cache busting 2018-03-01 15:06:05 +00:00
Weblate
8499a95f18 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:51 +00:00
David Baker
e91ae6b5ac
Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness 
Workaround for atlassian/react-beautiful-dnd#273
 2018-03-01 15:05:47 +00:00
Weblate
ad2a8469a3 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:14 +00:00
Ralitsa Bozhkova
8b51ad7053 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-01 15:05:13 +00:00
David Baker
ef58f71152
Merge pull request #1781 from matrix-org/luke/feature-disable-tag-panel 
Add setting to disable TagPanel
 2018-03-01 15:05:09 +00:00
Luke Barnard
61a6f140f5 onClientSync -> _onClientSync 2018-03-01 14:43:26 +00:00
Luke Barnard
4037a22492 Fix bug where avatar change not reflected in LLP 
Fixes vector-im/riot-web#6189
 2018-03-01 14:40:03 +00:00
Luke Barnard
64332b3021 Workaround for atlassian/react-beautiful-dnd#273 
Fix two bugs in Riot due to a single bug in react-b-dnd

Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
 2018-03-01 13:48:46 +00:00
Krombel
35b42ad729 Translated using Weblate (German) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-03-01 10:33:56 +00:00