Jaiwanth
7bad0b99d1
Fix links, header and export text
2021-08-18 08:37:10 +05:30
Jaiwanth
5dbc103486
Modify font-regex and declare json type
2021-08-14 13:01:46 +05:30
Jaiwanth
3efa699b88
Delint
2021-08-14 00:14:57 +05:30
Jaiwanth
0e3ad652af
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-08-14 00:04:30 +05:30
Jaiwanth
31c9e5962c
Move export dialog to async-components
2021-08-14 00:03:02 +05:30
Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Šimon Brandner
c79852a9f0
Left align call tiles
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-08-13 10:59:59 +02:00
Jaiwanth
c62210b07c
Merge branch 'export-conversations' of https://github.com/jaiwanth-v/matrix-react-sdk into export-conversations
2021-08-13 09:00:20 +05:30
Jaiwanth
00d5a0baa4
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-08-13 08:59:28 +05:30
Jaiwanth
dda24da204
Add copyright headers
2021-08-13 08:59:14 +05:30
Jaiwanth
edfc8af6cf
Apply PR Suggestions
2021-08-13 08:30:50 +05:30
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2021-08-12 11:28:14 +01:00
Hubert Chathi
82c34e9ed1
Update src/utils/DecryptFile.ts
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-08-10 19:37:18 -04:00
Hubert Chathi
3b9810719f
use the mimetype from the info property rather than the EncryptedFile
...
the mimetype in EncryptedFile is undocumented and redundant.
see https://github.com/matrix-org/matrix-doc/pull/2582
2021-08-10 19:27:24 -04:00
Michael Telatynski
db951b43a3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-10 09:48:22 +01:00
Jaiwanth
ecf0aba97c
Test for different types of events
2021-08-10 12:25:51 +05:30
Jaiwanth
900accd823
Add test for renderToString
2021-08-09 13:25:32 +05:30
Jaiwanth
850b5452a0
Add tests for reply regex
2021-08-09 12:36:06 +05:30
Jaiwanth
45ce352d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-09 10:44:13 +05:30
Travis Ralston
f53451df65
Merge pull request #6349 from SimonBrandner/feature/collapse-pinned-mels/17938
...
Group pinned message events with MELS
2021-08-06 09:25:08 -06:00
Michael Telatynski
64995dfae7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-06 11:39:24 +01:00
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-08-06 07:43:19 +02:00
Travis Ralston
81ddaf2efa
Properly set style attribute on shared usercontent iframe
...
Fixes https://github.com/vector-im/element-web/issues/18414
2021-08-05 11:21:22 -06:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
Jaiwanth
f00ab0460b
Delint
2021-08-04 13:06:07 +05:30
Jaiwanth
c74d6c6fff
Assign replacements
2021-08-04 12:48:32 +05:30
Jaiwanth
e29d9db2e7
Fetch exportCSS during export
2021-08-04 12:37:13 +05:30
Jaiwanth
b333612dea
Fix comparing MB -> bytes
2021-08-03 14:53:23 +05:30
Jaiwanth
4824c93707
Add a test file
2021-08-03 14:36:21 +05:30
Jaiwanth
46e2f67f54
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-03 10:03:16 +05:30
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Jaiwanth
04edf4103f
Remove unnecessary awaits
2021-07-30 11:46:55 +05:30
Travis Ralston
761fb6e1d5
Appease the linter
2021-07-29 16:01:26 -06:00
Travis Ralston
c322761abb
Improve general style per design direction
2021-07-29 15:49:23 -06:00
Travis Ralston
fb89b45c06
Unify and improve download interactions
...
With help from Palid.
This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).
The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
ed950875e7
Fix space hierarchy not updating when user mutates it
2021-07-28 19:08:59 +01:00
Michael Telatynski
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
Jaiwanth
6f8f0e8314
Change copyright year
2021-07-27 19:30:08 +05:30
Jaiwanth
371d1026fa
Add jest-raw-loader
2021-07-27 12:11:08 +05:30
Jaiwanth
57590b9a8a
Use raw-loaders to import svgs and exportJS
2021-07-27 11:37:47 +05:30
Jaiwanth
9771f4d6c4
PascalCasing for enums
2021-07-27 00:00:52 +05:30
Jaiwanth
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
Jaiwanth
41bc2b6481
Move away from streamsaver(for now)
2021-07-26 22:15:05 +05:30
Michael Telatynski
2114e854f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
Jaiwanth
a4da8f9e9e
Update exportCSS
2021-07-26 15:07:45 +05:30
Jaiwanth
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
