Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing/nik #4

Draft
wants to merge 154 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
4ee6d2f
POC
rodrigok Apr 25, 2024
a1c0569
Initial service worker implementation
rodrigok Apr 26, 2024
640ed9e
Start changing the upload to two calls
rodrigok Apr 27, 2024
59d99a6
Start using content property in place of e2e
rodrigok Apr 28, 2024
d84ce58
Readd e2e property
rodrigok Apr 28, 2024
e6a4330
Client side attachment generation
rodrigok Apr 28, 2024
677f0ef
Cleanup
rodrigok Apr 28, 2024
7c7eb29
Encrypt content
rodrigok Apr 28, 2024
a9add79
Fix file description
rodrigok Apr 28, 2024
69f815e
Small improvements
rodrigok Apr 28, 2024
ebbe64f
Cleanup
rodrigok Apr 28, 2024
b43f57b
Cleanup
rodrigok Apr 28, 2024
ec06eb3
Improve TS
rodrigok Apr 28, 2024
f70d2e1
Change content data structure
rodrigok Apr 30, 2024
445c528
Move attachment key info to inside encryption property
rodrigok Apr 30, 2024
6daab1a
Set encrypted file name as a hash sha-256 of the name
rodrigok Apr 30, 2024
d14a0e0
Merge remote-tracking branch 'origin/develop' into feat/encrypted-files
rodrigok Apr 30, 2024
fd5fcd2
Fix lint and TS
rodrigok Apr 30, 2024
2e1f78a
Fix regression
rodrigok Apr 30, 2024
d307519
Merge branch 'develop' into feat/encrypted-files
rodrigok May 9, 2024
1e25638
Mark uploads as temporary and confirm on send message
rodrigok May 9, 2024
574169f
Fix API test
rodrigok May 9, 2024
7154756
Implement cronjob
rodrigok May 10, 2024
222cbf3
Merge branch 'develop' into feat/encrypted-files
rodrigok May 10, 2024
aff80f3
Skip UI attachment test for now
rodrigok May 10, 2024
de5f0f2
Do not generate attachment on backend for e2ee messages
rodrigok May 10, 2024
939940d
Download through serviceworker
ggazzo May 14, 2024
7fb9618
Merge remote-tracking branch 'origin/develop' into feat/encrypted-files
rodrigok May 14, 2024
26e2eb8
👀
ggazzo May 15, 2024
3234c56
Merge branch 'develop' into feat/encrypted-files
MarcosSpessatto May 25, 2024
d894d30
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 10, 2024
aacf63d
testing with e2e
abhipatel0211 Jun 12, 2024
ee3fe8a
Move encryption of msg to inside content
rodrigok Jun 12, 2024
956316e
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 12, 2024
13566ab
Merge remote-tracking branch 'upstream/feat/encrypted-files' into fea…
abhipatel0211 Jun 13, 2024
611f91e
Merge branch 'RocketChat:develop' into feat/encrypted-file
abhipatel0211 Jun 13, 2024
48a97f7
Fix placeholder message for threads
rodrigok Jun 13, 2024
446b1a7
Unskip test
rodrigok Jun 13, 2024
35363b6
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 13, 2024
c258b21
Fix ts
rodrigok Jun 13, 2024
989c61c
Fix tests
rodrigok Jun 13, 2024
0a3cb4d
Merge remote-tracking branch 'upstream/feat/encrypted-files' into fea…
abhipatel0211 Jun 14, 2024
403ced3
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 14, 2024
ae670ff
Merge branch 'RocketChat:develop' into feat/encrypted-file
abhipatel0211 Jun 14, 2024
de94f83
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 14, 2024
9da9640
Add test for old e2ee msg format
rodrigok Jun 14, 2024
8c7310f
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 18, 2024
5228bdb
Add tests for new upload API
rodrigok Jun 18, 2024
9e83634
Save encrypted content info to the file upload
rodrigok Jun 19, 2024
8f81edd
Add dimensions to image attachments
rodrigok Jun 19, 2024
b9ff006
Fix TS
rodrigok Jun 19, 2024
9a39914
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 19, 2024
20962c4
Fix tests
rodrigok Jun 19, 2024
74cfee1
Fix image preview
rodrigok Jun 19, 2024
6508ebe
Prevent keys to be set on top of existent keys
rodrigok Jun 19, 2024
1a1788e
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 19, 2024
64a27cb
Fix API tests
rodrigok Jun 19, 2024
b5e1ba5
Fix e2ee change password
rodrigok Jun 19, 2024
f108fd4
Fix TS
rodrigok Jun 19, 2024
ae76481
Fix API tests
rodrigok Jun 19, 2024
18d0e87
Decrypt room's last message correctly
rodrigok Jun 19, 2024
e984ad2
Merge remote-tracking branch 'origin/develop' into feat/encrypted-files
rodrigok Jun 19, 2024
c251e17
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 19, 2024
a96fa61
Try to fix tests
rodrigok Jun 19, 2024
3f480b0
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 19, 2024
fa2456a
Fix tests
rodrigok Jun 20, 2024
365cef8
Fix preview of encrypted files
rodrigok Jun 20, 2024
bd90357
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 20, 2024
81dad69
Fix download button
rodrigok Jun 20, 2024
8402305
Fix download from files list
rodrigok Jun 20, 2024
503218e
Merge branch 'develop' into feat/encrypted-files
rodrigok Jun 20, 2024
09e3bb7
Force cors on SW
rodrigok Jun 20, 2024
f6162af
Merge remote-tracking branch 'upstream/feat/encrypted-files' into fea…
abhipatel0211 Jun 21, 2024
b739659
feat: multiple file sharing feature with encryption
abhipatel0211 Jun 29, 2024
a1f7848
Merge remote-tracking branch 'upstream/develop' into e2e_multiple_mer…
abhipatel0211 Jun 29, 2024
74ed1f2
fix: file name issue
abhipatel0211 Jun 29, 2024
cbb41bb
Merge branch 'develop' into feat/multiple_files_in_one_msg
rodrigok Jul 5, 2024
c93da30
multiple files shared one at a time
abhipatel0211 Jul 7, 2024
cfc177c
Change message API to handle file upload
abhipatel0211 Jul 16, 2024
2e344a1
fix: Ensure correct preview of multiple images in shared in single me…
abhipatel0211 Jul 17, 2024
7f0b615
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Jul 18, 2024
671fd31
solved merge conflict
abhipatel0211 Jul 18, 2024
8379c94
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Jul 25, 2024
9a97c3d
fix: type error of fileContent and remove extra code
abhipatel0211 Jul 25, 2024
62fbc56
added support for single file upload
abhipatel0211 Jul 31, 2024
f88cd26
UI update added cross button on hover and added the functionality of …
abhipatel0211 Jul 31, 2024
f39042b
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Aug 6, 2024
5a9f646
merge develop
abhipatel0211 Aug 6, 2024
771314e
feat: Added a file upload preview inside the messageBox
abhipatel0211 Aug 7, 2024
755c08b
Fix issue in uploads.ts causing duplicate messages on send
abhipatel0211 Aug 7, 2024
f2bd552
Cleanup: Remove unnecessary code
abhipatel0211 Aug 7, 2024
39ff2a3
removed unused space
abhipatel0211 Aug 7, 2024
23eb009
fix: lint errors
abhipatel0211 Aug 8, 2024
e786f70
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Aug 8, 2024
f4b60d5
fix: lint and TS errors
abhipatel0211 Aug 8, 2024
1c0ddde
fix: ensure file handling as array to resolve type errors in uploads
abhipatel0211 Aug 8, 2024
f5213b0
fix: lint error and TS errors
abhipatel0211 Aug 8, 2024
6f398b4
fix: lint and TS errors
abhipatel0211 Aug 8, 2024
cdc0ff5
removed unused code
abhipatel0211 Aug 8, 2024
a1faa22
fix: reorder imports to fix ESLint errors and removed unused changes
abhipatel0211 Aug 8, 2024
326a197
fix: changed the variable name with camelCase and removed unwanted ch…
abhipatel0211 Aug 8, 2024
c078083
fix: changed variable names to cameCase
abhipatel0211 Aug 8, 2024
0e4d827
fix: added toast message while uploading file
abhipatel0211 Aug 9, 2024
60a80f9
Added the files to upload in the sendMessage in the executeSendMessage
abhipatel0211 Aug 10, 2024
7ac5841
fix: Revert back as using message API
abhipatel0211 Aug 10, 2024
9f74219
Removed unused import
abhipatel0211 Aug 10, 2024
9afeee6
Remove unwanted code
abhipatel0211 Aug 10, 2024
97f743b
Added defineProperty for all the files selected
abhipatel0211 Aug 12, 2024
68f45dc
Added different function for files and encrypted files sharing
abhipatel0211 Aug 13, 2024
d7b92cc
changed uploadFiles.ts and FileUploadModal.tsx to handle single file …
abhipatel0211 Aug 13, 2024
21005c0
Merge branch 'develop' into feat/multiple_files_in_one_msg
rodrigok Aug 13, 2024
a0f6c83
Added the type check for the filesToUpload and also removed the refer…
abhipatel0211 Aug 14, 2024
de319d8
Added isUploading and removed the unnecessary changes
abhipatel0211 Aug 14, 2024
3ad5e63
Added a folder of FilePreview near the messageBox and also changed th…
abhipatel0211 Aug 15, 2024
72bc00d
feat: Enable file attachments after typing a message
abhipatel0211 Aug 16, 2024
fbd30c9
Merge remote-tracking branch 'upstream/develop' into dev_feat/multipl…
abhipatel0211 Aug 16, 2024
fe2b428
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Aug 16, 2024
b3db9fc
added title to the generic and image preview
abhipatel0211 Aug 16, 2024
3aa8c3d
fix: issue while sharing the message after file shared
abhipatel0211 Aug 17, 2024
2eb9b64
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Aug 18, 2024
11aac8e
passed uploadIdsToConfirm to the sendMessage in executeSendMessage
abhipatel0211 Aug 18, 2024
9ff1b9f
Added newe function parseMultipleFilesIntoMessageAttachments
abhipatel0211 Aug 18, 2024
2370b14
added ui changes and also added the transition
abhipatel0211 Aug 19, 2024
47b592e
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Aug 19, 2024
9722194
shifted confirm files at last after save message and attached multipl…
abhipatel0211 Aug 21, 2024
84bfcae
fix: image thumbnail display and remove extra msgData parameter
abhipatel0211 Aug 22, 2024
335e886
removed console logs
abhipatel0211 Aug 22, 2024
a5598f7
added a function for parse and also solved eslint error of reshuffling
abhipatel0211 Aug 22, 2024
7ea18d7
fix: solved lint errors messageBox and uploadfiles
abhipatel0211 Aug 23, 2024
822e2c5
fix: lint and TS errors
abhipatel0211 Aug 23, 2024
d1b6922
fix: lint error and converted description to msg
abhipatel0211 Aug 23, 2024
b13bdd2
fix: added description for TS error
abhipatel0211 Aug 23, 2024
a8cff84
Merge branch 'develop' into feat/multiple_files_in_one_msg
rodrigok Aug 23, 2024
0fe3aee
Changed the location of parsing file into attachments and also added …
abhipatel0211 Aug 24, 2024
7347447
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Aug 24, 2024
65c7be7
fix: maintain file upload order to ensure consistent fileId, fileUrl …
abhipatel0211 Aug 31, 2024
c4fb104
Added different function for file upload
abhipatel0211 Aug 31, 2024
12abfc5
removed unnecessary changes
abhipatel0211 Sep 2, 2024
ed463c0
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Sep 2, 2024
8c91c8c
added file which upload the file and return back the file IDs and fil…
abhipatel0211 Sep 3, 2024
7e5081b
fix: added condition so it will remove extra space
abhipatel0211 Sep 5, 2024
e45e376
feat: Add drag-and-drop file upload to message box
abhipatel0211 Sep 8, 2024
d21dd7f
fix: added encryption of message also
abhipatel0211 Sep 11, 2024
8508954
fix: Issue inside the thread messages
abhipatel0211 Sep 20, 2024
ea689a2
fix: multiple dispatch messages
abhipatel0211 Sep 20, 2024
ce5b7dd
Merge branch 'feat/multiple_files_in_one_msg' into dev_feat/multiple_…
abhipatel0211 Sep 21, 2024
7a2324a
Merge remote-tracking branch 'upstream/develop' into dev_feat/multipl…
abhipatel0211 Sep 21, 2024
acdf3c1
removed onFileDrop as using setFilesToUpload
abhipatel0211 Sep 21, 2024
1ccc5f8
Merge branch 'develop' into feat/multiple_files_in_one_msg
abhipatel0211 Sep 24, 2024
5f22315
fix: remove selected files when in edit mode
abhipatel0211 Oct 5, 2024
19df253
fix: diabled file sharing while editing
abhipatel0211 Oct 6, 2024
71135f1
Merge remote-tracking branch 'upstream/develop' into feat/multiple_fi…
abhipatel0211 Oct 7, 2024
bbdd7a5
Merge branch 'develop' into feat/multiple_files_in_one_msg
abhipatel0211 Oct 9, 2024
ec6a12f
fix:TS_error_resolved
abhipatel0211 Oct 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into feat/encrypted-files
  • Loading branch information
rodrigok authored May 9, 2024
commit d307519139a05b4cb7a1a4af5d049cbe3af6f4ed

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.