mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 11:01:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
9149 commits 219 branches 562 tags 474 MiB
Commit graph

9149 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Richard Lewis
9c10d243e8 Add comment. 2018-03-29 17:09:03 +01:00
Richard Lewis
f383298267 Remove duplicate event handler. 2018-03-29 17:08:07 +01:00
Richard Lewis
cafbd2904e Remove unused ref. 2018-03-29 16:57:21 +01:00
Richard Lewis
aefccb134c Ensure deleting is set to false. 2018-03-29 16:56:25 +01:00
Richard Lewis
35fcb2c9ab Catch rather than 'done' error handler. 2018-03-29 16:56:02 +01:00
Richard Lewis
23a52bdb4c Indentation. 2018-03-29 16:46:22 +01:00
Richard Lewis
a1581ad2dc Don't swallow error. 2018-03-29 16:24:03 +01:00
Richard Lewis
5fc9b8a6b8 Indentation. 2018-03-29 16:23:20 +01:00
Luke Barnard
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join 
Join this community button
 2018-03-29 15:44:46 +01:00
Luke Barnard
a92f822b04
Merge pull request #1816 from matrix-org/luke/reword-group-settings-delay-warning 
Reword group setting delay
 2018-03-29 15:43:54 +01:00
Luke Barnard
c4322892de Reword group setting delay 2018-03-29 14:33:54 +01:00
Luke Barnard
2dea5cd233 run gen-i18n 2018-03-29 12:39:21 +01:00
Luke Barnard
385211528d Implement "Join this community" button 
for groups that have truthy summary.profile.is_joinable.
 2018-03-29 12:39:09 +01:00
Richard Lewis
b4e70e30f3 Expects object, not naked ID. 2018-03-28 19:21:49 +01:00
Richard Lewis
4ac9653ab9 Refactor widget postMessage API. 2018-03-28 12:22:06 +01:00
Luke Barnard
b40b417153
Merge pull request #1814 from matrix-org/luke/track-page-change-duration 
Track duration of page changes
 2018-03-28 12:00:32 +01:00
Luke Barnard
00167fbc06 Init page change state in willMount 2018-03-28 11:25:28 +01:00
Luke Barnard
8d994f2788 Merge branch 'develop' into luke/track-page-change-duration 2018-03-28 10:56:36 +01:00
Luke Barnard
f29b58aba5 Always expect generationTimeMs 2018-03-28 10:31:03 +01:00