OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,354 Commits
208 Branches
547 Tags
437 MiB
Commit Graph

10354 Commits (55a6a4dd8fcaadc2e0fab0b42c389bcab4328ba4)

Author SHA1 Message Date
Richard Lewis a81269cba8 Check if user widget. 2018-03-13 10:07:27 +00:00
Andrey 8ddbd09f4f Translated using Weblate (Russian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-12 19:52:49 +00:00
Weblate 502cba0be5 Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 17:54:05 +00:00
Luke Barnard 99b3922998
Merge pull request #1796 from matrix-org/luke/fix-group-invite-flow 
Show GroupMemberList after inviting a group member
 2018-03-12 17:53:59 +00:00
Luke Barnard 0a480b05aa Show GroupMemberList after inviting a group member 
because we might be looking at a member when inviting a new
member.

See https://github.com/vector-im/riot-web/pull/6303
 2018-03-12 17:23:31 +00:00
Weblate 05cdd8098b Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 15:33:08 +00:00
Slavi Pantaleev 791ef02715 Translated using Weblate (Russian) 
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-12 15:33:07 +00:00
Slavi Pantaleev 5885104c3a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-12 15:33:06 +00:00
Luke Barnard 0341b299ae
Merge pull request #1794 from matrix-org/dbkr/baseavatar_syntax 
Fix syntax fail
 2018-03-12 15:33:00 +00:00
David Baker d416b9d7d1 Copyright 2018-03-12 15:24:32 +00:00
David Baker ac85938186 Fix syntax fail 2018-03-12 15:23:22 +00:00
Richard Lewis b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. 2018-03-12 13:56:02 +00:00
Andrey 5854c5f42c Translated using Weblate (Russian) 
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-12 12:09:57 +00:00
Ralitsa Bozhkova d1961ab111 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-12 12:02:44 +00:00
Марко М. Костић 46d1328af4 Translated using Weblate (Serbian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-03-11 14:09:30 +00:00
Ralitsa Bozhkova bf41b7b91f Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-10 10:37:27 +00:00
Michael Telatynski 14f29e4740
fix the bugs Tulir found - THANKS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-09 23:37:42 +00:00
Michael Telatynski 023632e7e4
only strip reply fallbacks if the lab is enabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-09 23:12:13 +00:00
Richard Lewis 46f46ee294 Simplify request mapping. 2018-03-09 23:04:00 +00:00
Richard Lewis 7e062090de Cleanup timeout before unmount. 2018-03-09 21:12:56 +00:00
Szimszon b92e74bc60 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-03-09 19:15:05 +00:00
Nathan van Beelen d4d8ed7797 Translated using Weblate (Dutch) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2018-03-09 14:23:08 +00:00
Richard Lewis a33859326e Use getUserWidgets where possible. 2018-03-09 09:15:16 +00:00
Richard Lewis e7c19fd83b Don't render placeholder when image is visible. 2018-03-08 23:12:12 +00:00
Richard Lewis e36ae3cede Fix context menu offset. 2018-03-08 17:33:07 +00:00
Weblate 9524d1c313 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 17:30:21 +00:00
David Baker e87f8ee7b8
Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting 
Use TintableSvg for TagPanel clear filter button
 2018-03-08 17:30:17 +00:00
Richard Lewis fdec4b36c9 Hide padding if last control. 2018-03-08 17:25:28 +00:00
Richard Lewis 3ab8b1f866 Hide sticker picker delete button and show minimise button. 2018-03-08 17:20:42 +00:00
Luke Barnard 5ba55858e8 Use TintableSvg for TagPanel clear filter button 2018-03-08 17:06:48 +00:00
Kévin C 99c15be766 Translated using Weblate (French) 
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-03-08 16:57:54 +00:00
Weblate 3d34596162 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 16:47:50 +00:00
Luke Barnard a03778388d
Merge pull request #1792 from matrix-org/luke/fix-privileged-users-cosmetics 
Fix missing space between "...is a" and user ID
 2018-03-08 16:47:46 +00:00
Luke Barnard a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
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
Michael Telatynski ed8f087eb6
fix access of element [0] of array even though it sometimes does not exist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-06 15:17:57 +00:00