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

9169 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
ce80b82ab3 Bump source-map-loader version to avoid bug /w inline base64 maps 2018-04-09 13:53:02 +01:00
David Baker
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar 
Make stickers/messages continuations of each other
 2018-04-06 17:58:26 +01:00
Luke Barnard
01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard
008572afe1 Revert "Handle non-m.room.message event types." 
This reverts commit f8d7ab10fa.
 2018-04-06 16:42:59 +01:00
Luke Barnard
666f419dfd
Merge pull request #1827 from matrix-org/luke/openly_joinable 
Update to match is_openly_joinable API
 2018-04-06 15:55:31 +01:00
Luke Barnard
1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
Luke Barnard
fb9b376cb8
Merge pull request #1826 from matrix-org/luke/fix-leaking-features-to-guests 
Fix to prevent guests from seeing features
 2018-04-06 11:24:32 +01:00
David Baker
5b8e75231d
Merge pull request #1825 from matrix-org/luke/fix-forgot-password-page 
Fix broken ForgotPassword component
 2018-04-06 11:15:01 +01:00
Luke Barnard
0306c365cc Fix to prevent guests from seeing features 2018-04-06 11:03:17 +01:00
Luke Barnard
adb78c2931 Fix broken ForgotPassword component 2018-04-06 10:27:03 +01:00
David Baker
28bf76b319
Merge pull request #1824 from matrix-org/luke/fix-wrappedRef-warning 
Fix warning "Unknown prop `wrappedRef` on <div> tag..."
 2018-04-05 17:49:35 +01:00
Luke Barnard
e20f223e78 Fix warning "Unknown prop wrappedRef on <div> tag..." 
GeminiScrollbar should not receive wrappedRef as a property,
so remove it using object destructuring.
 2018-04-05 17:39:25 +01:00
Luke Barnard
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable 
Add radio button for setting group m.join_policy
 2018-04-05 17:03:04 +01:00
David Baker
03747b8287 Update to use new join_policy API 2018-04-05 16:56:35 +01:00
David Baker
6a49197adb
Merge pull request #1823 from matrix-org/rxl881/bindingFix 
Fix widget grant / revoke permission binding
 2018-04-05 14:19:10 +01:00
Richard Lewis
a41384a994 Fix function binding. 2018-04-04 23:45:47 +01:00
Richard Lewis
6a7d4cb5e2
Merge pull request #1822 from matrix-org/rxl881/stickerPickerStyling 
Sticker picker styling
 2018-04-04 14:59:06 +01:00
Richard Lewis
da6c2c51fb Remove left and right menu padding 2018-04-04 13:38:48 +01:00
Richard Lewis
369cbdaaf6 Add missing PropType declarations. 2018-04-04 13:38:07 +01:00
Richard Lewis
702380c591 Add props to style (remaining) menu padding attributes. 2018-04-04 13:37:52 +01:00
Richard Lewis
06f1c504e7
Merge pull request #1672 from matrix-org/rxl881/snapshot 
Bi-directional widget postMessaging API (stickerpacks) [WIP]
 2018-04-03 18:37:03 +01:00
Luke Barnard
7273921706
Merge pull request #1821 from matrix-org/luke/fix-room-avatar-null-room 
Add null-guard to prevent RoomAvatar NPE when room is null
 2018-04-03 17:51:56 +01:00
Luke Barnard
8ca1243ecb Add null-guard to prevent RoomAvatar NPE when room is null 
which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
 2018-04-03 17:35:34 +01:00
Richard Lewis
f8f8bc469e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-04-03 11:34:14 +01:00
Richard Lewis
b109c9304c Put stickers behind labs flag. 2018-04-02 22:24:46 +01:00
Richard Lewis
8241afe87d Fix content references 2018-04-02 20:25:24 +01:00
Richard Lewis
49bea1a35b Move stickerpicker content out of state in to generator function. 2018-04-02 10:56:45 +01:00
Richard Lewis
d83b6f1cf8 Use AccessibleButton. 2018-04-02 10:18:35 +01:00
Richard Lewis
11915b0cdf Fix user widget event type. 
Add comments for clarity.
 2018-04-02 10:02:41 +01:00
Richard Lewis
557a45e890 Remove inline styling. 2018-03-29 22:22:57 +01:00
Richard Lewis
9cc3d3c9bb Move default sticker content into generator function. 2018-03-29 21:48:03 +01:00
Richard Lewis
ff0834ad9d Add comment. 2018-03-29 21:31:09 +01:00
Richard Lewis
003cf61388 Handle remove sticker picker errors. 2018-03-29 21:16:35 +01:00
Richard Lewis
2e6d6c83cd Add back in body 'ref' 2018-03-29 21:16:12 +01:00
Richard Lewis
93804e80b8 Return promise 2018-03-29 20:37:24 +01:00
Richard Lewis
9a3f3562e1 Wait for setAccountData to complete. 2018-03-29 20:07:26 +01:00
David Baker
a79c558763
Merge pull request #1818 from matrix-org/dbkr/dont_notify_bad_encrypted 
Don't notify for bad encrypted messages
 2018-03-29 18:33:44 +01:00
Richard Lewis
20cbc01698 Add callback handler for integration manager close. 2018-03-29 18:32:49 +01:00
David Baker
d6b3083c2f Don't notify for bad encrypted messages 
Continue to wait for decryption if the decryption process failed.
Because we weren't doing this, the first message in a megolm session
was generally failing to decrypt the first time because the keys often
arrive after the message.

Fixes https://github.com/vector-im/riot-web/issues/6284

This is is small & safe enough that we may want to consider
putting it in 0.14 if we're cutting another RC.
 2018-03-29 18:18:53 +01:00
Richard Lewis
5ba18b5ee2 Avoid redefining function parameter 2018-03-29 18:13:23 +01:00
Richard Lewis
3d9bdb90ca Consistent async / await / promises. 2018-03-29 17:56:12 +01:00
Richard Lewis
b1e7dcf216 Cleanup / simplify code. 2018-03-29 17:52:34 +01:00
Richard Lewis
6181ca642f "Stickerpack" translation. 2018-03-29 17:47:53 +01:00
Richard Lewis
c8f9586c9b Check for valid reference. 2018-03-29 17:35:21 +01:00
Luke Barnard
c9283ad988 Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable 2018-03-29 17:28:44 +01:00
Richard Lewis
67f755efcb Comment. 2018-03-29 17:26:54 +01:00
Richard Lewis
e21cc14e5b Comment. 2018-03-29 17:26:19 +01:00
Richard Lewis
38c8bc7d9a Consistent function naming. 2018-03-29 17:25:07 +01:00
Luke Barnard
2bc8d6d3a4 Use less confusing values on radio buttons 2018-03-29 17:25:06 +01:00
Richard Lewis
9c10d243e8 Add comment. 2018-03-29 17:09:03 +01:00