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

9951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
04996887ec Merge remote-tracking branch 'origin/develop' into develop 2018-05-17 16:05:41 +00:00
strix aluco
d9236a5848 Translated using Weblate (Ukrainian) 
Currently translated at 23.1% (271 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-05-17 16:05:41 +00:00
random
123c4d0f6c Translated using Weblate (Italian) 
Currently translated at 99.1% (1162 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-05-17 16:05:40 +00:00
David Baker
fa7f6c2c4c v0.12.5 2018-05-17 17:04:39 +01:00
David Baker
43dbf306b0 Prepare changelog for v0.12.5 2018-05-17 17:04:38 +01:00
Luke Barnard
cc87b73de2
Merge pull request #1909 from matrix-org/dbkr/fix_image_size_jump 
Fix image size jumping regression
 2018-05-17 16:56:51 +01:00
David Baker
a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker
e53497421e Fix image size jumping regression 
Fixes https://github.com/vector-im/riot-web/issues/6654
 2018-05-17 16:47:17 +01:00
Weblate
f63bef109c Merge remote-tracking branch 'origin/develop' into develop 2018-05-16 10:53:59 +00:00
Kenneth Larsson
c5c3c51cf0 Translated using Weblate (Swedish) 
Currently translated at 69.9% (820 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-16 10:53:59 +00:00
David Baker
bf0ec249b6 v0.12.4 2018-05-16 11:49:06 +01:00
David Baker
7bd9863e6a Prepare changelog for v0.12.4 2018-05-16 11:49:05 +01:00
Slavi Pantaleev
5b26a56b9a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-05-16 09:43:26 +00:00
Osoitz
05c469399d Translated using Weblate (Basque) 
Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-05-16 08:58:10 +00:00
David Baker
a0b6bd183c v0.12.4-rc.6 2018-05-15 18:03:40 +01:00
David Baker
1a3777ad0c Prepare changelog for v0.12.4-rc.6 2018-05-15 18:03:40 +01:00
Weblate
29cf079561 Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 16:40:32 +00:00
David Baker
9dd90fb63f
Merge pull request #1907 from matrix-org/dbkr/wait_for_widget_delete 
Wait for deletion of widgets as well addition
 2018-05-15 17:39:53 +01:00
David Baker
fadf264a1b Rename uses of function too 2018-05-15 17:34:02 +01:00
David Baker
e4a221e42d More helpful function name 2018-05-15 17:28:55 +01:00
David Baker
bb5ae741bc Wait for deletion of widgets as well addition 
We were previously waiting for them to appear which is silly if we
were deleting them.
 2018-05-15 17:12:59 +01:00
Weblate
e410b7a5ab Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 15:30:47 +00:00
Luke Barnard
db092c81d3 v0.12.4-rc.5 2018-05-15 15:54:15 +01:00
Luke Barnard
b64e10a095 Prepare changelog for v0.12.4-rc.5 2018-05-15 15:54:14 +01:00
David Baker
84c4bae313
Merge pull request #1905 from matrix-org/dbkr/wait_for_user_widget 
Wait for echo from server when adding user widgets
 2018-05-15 15:31:37 +01:00
David Baker
9d5ba25131 oh, sendError does support sending the error 2018-05-15 15:19:28 +01:00
Weblate
9a7c40313f Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 14:18:18 +00:00
Kenneth Larsson
f5c67229a4 Translated using Weblate (Swedish) 
Currently translated at 69.0% (811 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-15 14:18:18 +00:00
David Baker
464e093f40 log exception 2018-05-15 15:14:33 +01:00
David Baker
5b781043a5 just use the one if statement 2018-05-15 15:02:24 +01:00
David Baker
7bfe84f8be Catch errors adding widget 2018-05-15 14:53:49 +01:00
David Baker
e9336eab63 lint 2018-05-15 14:18:02 +01:00
David Baker
d0ec467c34 Oops, actually get account data event. 
Also ignore any account data events that aren;t widgets.
 2018-05-15 14:13:56 +01:00
David Baker
f4d69e26e9 PR feedback 2018-05-15 12:06:23 +01:00
David Baker
142ce4c256 better comment 2018-05-15 11:50:24 +01:00
David Baker
2956c049d6 Wait for echo from server when adding user widgets 
As hopefully all explained in comments.

Fixes https://github.com/vector-im/riot-web/issues/6727
 2018-05-15 11:41:16 +01:00
Luke Barnard
7bfc50bf42 v0.12.4-rc.4 2018-05-14 18:23:14 +01:00
Luke Barnard
aaffe2a3e1 Prepare changelog for v0.12.4-rc.4 2018-05-14 18:23:14 +01:00
Luke Barnard
b016a79d97 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:51:27 +01:00
Luke Barnard
6bfd7fca9c
Merge pull request #1904 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-05-14 17:50:43 +01:00
Luke Barnard
e596924074 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:43:40 +01:00
Weblate
deec515e97 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:40:18 +00:00
Richard Lewis
8c3a63a169
Merge pull request #1894 from turt2live/travis/fix-stickerpacks 
Correctly identify sticker picker widgets
 2018-05-14 17:40:13 +01:00
Luke Barnard
ff0254d346 Fix ContextualMenu imports for TagTile and code block copy button 2018-05-14 17:36:57 +01:00
Weblate
9c4b25817c Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:27:14 +00:00
Slavi Pantaleev
4ce6093daf Translated using Weblate (Bulgarian) 
Currently translated at 99.1% (1165 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-05-14 16:27:13 +00:00
David Baker
7588d4380c Merge branch 'release-v0.12.4' into develop 2018-05-14 17:27:01 +01:00
David Baker
ab8f0ed810
Merge pull request #1903 from matrix-org/luke/fix-sticker-picker-position 
Quick fix for sticker picker position
 2018-05-14 17:26:29 +01:00
Luke Barnard
e0236c3d3e Fix issue with sticker picker rendering off-screen 
when the RightPanel is collapsed on a small monitor
and the sticker picker is opened.
 2018-05-14 17:12:45 +01:00
Kévin C
0591963cc1 Translated using Weblate (French) 
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-05-14 15:46:17 +00:00