Commit graph

10144 commits

Author SHA1 Message Date
Michael Telatynski
846c14062a
show redacted stickers like other redacted messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
David Baker
ef1f580abb v0.12.7 2018-06-12 14:21:30 +01:00
David Baker
0ad738d510 Prepare changelog for v0.12.7 2018-06-12 14:21:30 +01:00
David Baker
334dccbdc7 Released js-sdk 2018-06-12 14:14:14 +01:00
David Baker
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone
re-run checkIfAlone if a member change occurred in the active room
2018-06-08 17:36:42 +01:00
David Baker
06321deea9
Merge pull request #1935 from turt2live/travis/persist-pinned-open
Persist pinned message open-ness between room switches
2018-06-08 16:48:40 +01:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics
Pinned message cosmetic improvements
2018-06-08 16:46:33 +01:00
David Baker
3983535536
Merge pull request #1916 from akihikodaki/sinon
Update sinon to 5.0.7
2018-06-08 16:41:11 +01:00
Michael Telatynski
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-07 22:01:27 +01:00
Travis Ralston
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
David Baker
4834816a06 v0.12.7-rc.1 2018-06-06 16:06:45 +01:00
David Baker
c8bf743506 Prepare changelog for v0.12.7-rc.1 2018-06-06 16:06:44 +01:00
David Baker
881e9a8070 js-sdk rc.1 2018-06-06 16:00:16 +01:00
David Baker
0d9ba17677
Merge pull request #1944 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-06-06 15:52:54 +01:00
Walter
03d67988e8 Translated using Weblate (Russian)
Currently translated at 99.8% (1188 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-06 14:40:42 +00:00
Weblate
8b33c13517 Merge remote-tracking branch 'origin/develop' into develop 2018-06-06 09:08:58 +00:00
Michael Telatynski
ffec32c7d9
Merge pull request #1943 from akihikodaki/react
Import react as React in src/components/views/elements/DNDTagTile.js
2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-06-06 17:59:50 +09:00
Weblate
0ca7fb4abc Merge remote-tracking branch 'origin/develop' into develop 2018-06-05 09:37:06 +00:00
David Baker
bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings
Fix click on faded left/right/middle panel -> close settings
2018-06-05 10:36:58 +01:00
Weblate
21e4ee5901 Merge remote-tracking branch 'origin/develop' into develop 2018-06-04 15:40:03 +00:00
Peter Vágner
c792ae1c6f Translated using Weblate (Slovak)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-04 15:40:03 +00:00
Nathan van Beelen
3c204f1eb8 Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-06-04 15:40:01 +00:00
Slavi Pantaleev
195d596c89 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-06-04 15:40:01 +00:00
Osoitz
8f135c650e Translated using Weblate (Basque)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-06-04 15:40:00 +00:00
David Baker
1889b5c281
Merge pull request #1942 from matrix-org/luke/fix-perf-unsupported-tor
Add null-guard to support browsers that don't support performance
2018-06-04 16:39:55 +01:00
Luke Barnard
6a317569d7 Add null-guard to support browsers that don't support performance
Like Tor.

Fixes https://github.com/vector-im/riot-web/issues/6781
2018-06-04 09:38:21 +01:00
Kenneth Larsson
f5892b8c61 Translated using Weblate (Swedish)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-06-03 22:34:19 +00:00
Luke Barnard
d30bc2dc6b
Merge pull request #1937 from turt2live/travis/no-guest
Replace "Login as guest" with "Try the app first" on login page
2018-06-01 11:58:26 +01:00
Krombel
7053302f77 Translated using Weblate (German)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-05-31 16:01:40 +00:00
Slavi Pantaleev
56541c7ea7 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-05-29 17:00:56 +00:00
Peter Vágner
577b2564c0 Translated using Weblate (Slovak)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-05-29 15:47:22 +00:00
Luke Barnard
404c071f2a Remove lie from docs 2018-05-29 13:19:56 +01:00
Luke Barnard
da9fe9917b Fix click on faded left/right/middle panel -> close settings
- implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
2018-05-29 13:16:39 +01:00
Luke Barnard
3a222e02f1
Merge pull request #1931 from matrix-org/t3chguy/webcam_light
kill stream when using gUM for permission to device labels to turn off camera
2018-05-29 12:12:52 +01:00
Michael Telatynski
05357b9f8c
improve comment 2018-05-29 12:07:56 +01:00
Weblate
bea30bceae Merge remote-tracking branch 'origin/develop' into develop 2018-05-29 09:11:27 +00:00
Kenneth Larsson
16ebef81f2 Translated using Weblate (Swedish)
Currently translated at 84.4% (1005 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-29 09:11:27 +00:00
Andrey
6467349921 Translated using Weblate (Russian)
Currently translated at 99.6% (1186 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-29 09:11:26 +00:00
random
e968ccb24c Translated using Weblate (Italian)
Currently translated at 99.4% (1183 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-05-29 09:11:26 +00:00
Sveinn í Felli
6f6d28d4ee Translated using Weblate (Icelandic)
Currently translated at 54.2% (645 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-29 09:11:26 +00:00
Szimszon
1bd8182b1a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-29 09:11:26 +00:00
Kévin C
f885def748 Translated using Weblate (French)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-29 09:11:26 +00:00
Nathan van Beelen
f23f5614c1 Translated using Weblate (Dutch)
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-05-29 09:11:25 +00:00
Richard Lewis
f55409fd39
Merge pull request #1455 from turt2live/patch-2
Support third party integration managers in AppPermission
2018-05-29 10:11:19 +01:00
Travis Ralston
254e8c358a Remove unused imports
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-28 11:38:09 -06:00
Sveinn í Felli
4a3c7bc6e4 Translated using Weblate (Icelandic)
Currently translated at 54.2% (645 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-28 15:42:49 +00:00
Sveinn í Felli
b6e2815f22 Translated using Weblate (Icelandic)
Currently translated at 43.6% (520 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/is/
2018-05-28 11:43:18 +00:00