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
bf0ec249b6
v0.12.4
2018-05-16 11:49:06 +01:00
7bd9863e6a
Prepare changelog for v0.12.4
2018-05-16 11:49:05 +01:00
a0b6bd183c
v0.12.4-rc.6
2018-05-15 18:03:40 +01:00
1a3777ad0c
Prepare changelog for v0.12.4-rc.6
2018-05-15 18:03:40 +01:00
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
fadf264a1b
Rename uses of function too
2018-05-15 17:34:02 +01:00
e4a221e42d
More helpful function name
2018-05-15 17:28:55 +01:00
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
db092c81d3
v0.12.4-rc.5
2018-05-15 15:54:15 +01:00
b64e10a095
Prepare changelog for v0.12.4-rc.5
2018-05-15 15:54:14 +01:00
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
9d5ba25131
oh, sendError does support sending the error
2018-05-15 15:19:28 +01:00
464e093f40
log exception
2018-05-15 15:14:33 +01:00
5b781043a5
just use the one if statement
2018-05-15 15:02:24 +01:00
7bfe84f8be
Catch errors adding widget
2018-05-15 14:53:49 +01:00
e9336eab63
lint
2018-05-15 14:18:02 +01:00
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
f4d69e26e9
PR feedback
2018-05-15 12:06:23 +01:00
142ce4c256
better comment
2018-05-15 11:50:24 +01:00
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
7bfc50bf42
v0.12.4-rc.4
2018-05-14 18:23:14 +01:00
aaffe2a3e1
Prepare changelog for v0.12.4-rc.4
2018-05-14 18:23:14 +01:00
b016a79d97
Merge branch 'develop' into release-v0.12.4
2018-05-14 17:51:27 +01:00
6bfd7fca9c
Merge pull request #1904 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-05-14 17:50:43 +01:00
e596924074
Merge branch 'develop' into release-v0.12.4
2018-05-14 17:43:40 +01:00
deec515e97
Merge remote-tracking branch 'origin/develop' into develop
2018-05-14 16:40:18 +00:00
8c3a63a169
Merge pull request #1894 from turt2live/travis/fix-stickerpacks
...
Correctly identify sticker picker widgets
2018-05-14 17:40:13 +01:00
ff0254d346
Fix ContextualMenu imports for TagTile and code block copy button
2018-05-14 17:36:57 +01:00
9c4b25817c
Merge remote-tracking branch 'origin/develop' into develop
2018-05-14 16:27:14 +00:00
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
7588d4380c
Merge branch 'release-v0.12.4' into develop
2018-05-14 17:27:01 +01:00
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
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
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
3761cd4054
When panels are shown/hidden, hide sticker picker
2018-05-14 16:35:12 +01:00
3d17bd63a2
Merge remote-tracking branch 'origin/develop' into develop
2018-05-14 13:31:29 +00:00
49a3770e92
Merge branch 'release-v0.12.4' into develop
2018-05-14 14:31:18 +01:00
dddd1c43cc
Remove redundant logging (currently shown on every render when no stickerpicker is present).
2018-05-14 14:23:26 +01:00
5a6d80b6d7
Merge remote-tracking branch 'origin/develop' into develop
2018-05-14 13:09:06 +00:00
615fc80c92
Merge pull request #1901 from matrix-org/rxl881/stickerpickerLogging
...
Remove redundant logging (currently shown on every render when no sti…
2018-05-14 14:09:00 +01:00
986fb3237d
Remove redundant logging (currently shown on every render when no stickerpicker is present).
2018-05-14 13:56:39 +01:00
3d176f7105
Merge pull request #1899 from matrix-org/dbkr/dbkr/fix_sticker_size_jumping_2
...
Fix stickers briefly being 2x the size
2018-05-14 13:53:18 +01:00
b6e317647a
Fix stickers briefly being 2x the size
...
fixupHeight was the only thing actually fixing the size of the
sticker image to be the size we want it rather than the pixel size
of the image, and this was only getting run after the image loaded,
causing a flash of 2x image.
2018-05-14 13:41:41 +01:00
f384c465fd
Translated using Weblate (Chinese (Traditional))
...
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/zh_Hant/
2018-05-14 11:51:18 +00:00
bd91f6cde3
Merge remote-tracking branch 'origin/develop' into develop
2018-05-14 11:00:44 +00:00
49c1f1b41f
Merge pull request #1891 from turt2live/travis/widget-postmessage-patches
...
Send required properties when making requests to widgets over postMessage
2018-05-14 12:00:40 +01:00
ac297d1e12
Merge pull request #1897 from matrix-org/luke/fix-room-widget-second-load-infini-spinner
...
Fix room widget second load infini spinner
2018-05-14 11:53:34 +01:00
cf8077e605
Set loading: false when iFrame finishes loading
2018-05-14 11:42:38 +01:00
6345e474f5
Remove unused conditional
2018-05-14 11:38:17 +01:00
Akihiko Odaki